aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
...
* | Merge pull request #116 from DiarmaidMckeagney/main Hop3112023-05-17-16/+16
|\ \ | | | | | | Changing "OpenVic2" to "OpenVic" in documentation
| * | Changing "OpenVic2" to "OpenVic" DiarmaidMckeagney2023-05-16-16/+16
| | | | | | | | | | | | Changing instances of the term "OpenVic2" to just "OpenVic" within the documentation.
* | | Merge pull request #115 from Spartan322/fix/sound-and-music-player George L. Albany2023-05-16-2/+5
|\ \ \ | |/ / |/| |
| * | Fix SettingHSlider not loading properly on default values Spartan3222023-05-16-2/+5
|/ / | | | | | | | | | | Fixes volume sliders being ignored when loaded at zero Fix MusicConductor ignoring MUSIC_BUS
* | Merge pull request #114 from OpenVicProject/project-rename Hop3112023-05-16-2/+2
|\ \ | | | | | | Update README to reflect project name change.
| * | Update README.md YouriRombouts2023-05-15-2/+2
| |/
* | Merge pull request #112 from Spartan322/update/save-load-req-documentation Hop3112023-05-16-2/+11
|\ \ | |/ |/| Fix incomplete #110 requirement documentation
| * Fix incomplete #110 requirement documentation Spartan3222023-05-14-2/+11
|/ | | | | | | | | | Fix incorrect reference to UIFUN-83 as UIFUNC-83 Also fulfills: SS-18 UI-39, UI-40, UI-41, UI-86, UI-93 UIFUN-77, UIFUN-78 FS-8
* Merge pull request #110 from Spartan322/add/save-and-load George L. Albany2023-05-13-23/+892
|\
| * Add SaveManager autoload singleton Spartan3222023-05-12-23/+892
|/ | | | | | | | | | | | | | | | | | | | | Globally handles save finding, creation, removal, changes, naming, and flushing Globally handles the session tags for the active save Add SaveLoadMenu to GameSession Add Start Date Panel and Save Panel loading to LobbyMenu Includes session tag filter Add LobbyPanelButton and SavePanelButton scene and scripts Add SaveResource to handle saving and loading individual save files Add localization for SaveLoadMenu Expand localization for additions to LobbyMenu Add ButtonContainer variation type to default theme Fulfill: UI-82, UI-83, UI-84, UI-85, UI-87, UI-89, UI-90, UI-91, UI-92, UI-94 UIFUN-82, UIFUN-83, UIFUN-84, UIFUN-86, UIFUN-87, UIFUN-89 FS-28
* Merge pull request #111 from OpenVic2Project/goods Hop3112023-05-12-5947/+786
|\ | | | | Added Goods loading + mapmode
| * Fix building buttons and terrain texture imports Hop3112023-05-11-275/+147
| |
| * Added Goods loading + mapmode Hop3112023-05-11-5692/+659
| |
* | Merge pull request #108 from OpenVic2Project/artistic-license-clarification ClarkeCode2023-05-12-0/+7
|\ \ | |/ |/| Add clarification on licensing of artistic works
| * Add clarification on licensing of artistic works ClarkeCode2023-05-09-0/+7
| |
* | Merge pull request #109 from Nemrav/gui-scaling Hop3112023-05-10-9/+157
|\ \ | |/ |/| Add UI scaling through menu option
| * GUI scale tweaks Hop3112023-05-10-34/+32
| |
| * Add UI scaling through menu option Nemrav2023-05-10-2/+152
|/
* adding text to fix mermaid render error Isaiah2023-05-08-2/+2
|
* Merge pull request #106 from OpenVic2Project/simulation-submodule Hop3112023-05-04-1594/+29
|\ | | | | Moved simulation code to separate submodule
| * Moved simulation code to separate submodule Hop3112023-05-03-1594/+29
|/
* Merge pull request #105 from OpenVic2Project/fix-canadian-name-display Hop3112023-05-02-40/+40
|\ | | | | Fix display names for North American provinces
| * Fix display names for North American provinces ClarkeCode2023-05-02-40/+40
|/ | | | Fix display names for Canadian provinces
* Merge pull request #104 from OpenVic2Project/map-hover-tweaks George L. Albany2023-05-02-4/+15
|\
| * Better province highlight on selection/hover. Hop3112023-05-01-4/+15
| |
* | Merge pull request #97 from Spartan322/update/clang-format George L. Albany2023-05-02-133/+233
|\ \
| * | Support features up to clang-format 14 Spartan3222023-05-02-133/+233
| |/ | | | | | | | | Add .editorconfig Update C++ files within `extension/src` to follow .clang-format
* | Merge pull request #102 from Spartan322/refine/argument-parsing George L. Albany2023-05-02-1/+348
|\ \
| * | Add ArgumentParser Spartan3222023-05-02-1/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Streamlines parsing of commandline arguments Arguments reside in ProjectSettings as `openvic2/data/arguments` as a dictionary The dictionary's key is the option name The dictionary is set with default values This enables project setting overrides for arguments (user specified arguments take priority) Add help commandline option Prepare for removal of GameDebug.gd Add game project description
* | | Merge pull request #99 from Spartan322/conform-license-for-godot George L. Albany2023-05-02-1/+139
|\ \ \ | |_|/ |/| |
| * | Add some license conformance for Godot Spartan3222023-04-28-1/+139
| |/ | | | | | | | | | | Add License Attribution for OpenVic2, Godot, FreeType, ENet, and mbed TLS in credits with redirect links to licenses Add contributor and donor list for Godot to credits Add link button for Godot, redirects to https://godotengine.org
* | Merge pull request #103 from OpenVic2Project/terrain Hop3112023-05-01-177/+496
|\ \ | | | | | | Cosmetic terrain + Hashmaps
| * | Hashmaps instead of linear + better province hover Hop3112023-05-01-31/+28
| | |
| * | Highlight selected province on minimap Hop3112023-04-30-3/+29
| | |
| * | Terrain textures + province colour alpha channel Hop3112023-04-29-146/+442
|/ /
* | Merge pull request #100 from OpenVic2Project/goods ClarkeCode2023-04-29-80/+145
|\ \ | | | | | | Addition of goods struct
| * | Resolving merge conflicts ClarkeCode2023-04-29-1/+1
| | |
| * | Merge branch 'main' into goods Hop3112023-04-29-226/+215
| |\ \ | |/ / |/| |
* | | Merge pull request #101 from OpenVic2Project/more-image-processing Hop3112023-04-29-228/+216
|\ \ \ | |_|/ |/| | Dynamic minimap + vertical map subdivision
| * | Terrain channel for provinces + generated minimap Hop3112023-04-28-210/+179
| | |
| * | Vertical subdivision + calculation for both dims Hop3112023-04-26-43/+62
|/ /
| * Moved several type aliases to Types.hpp; Added HasColour class for items ↵ ClarkeCode2023-04-28-85/+123
| | | | | | | | which need associated colours
| * Struct tweaks ClarkeCode2023-04-28-28/+10
| |
| * Temporarily removed; will be re-added after C++ code moved to submodule ClarkeCode2023-04-28-103/+0
| |
| * Fix typo ClarkeCode2023-04-27-2/+2
| |
| * Merge branch 'main' of github.com:OpenVic2Project/OpenVic2 into goods ClarkeCode2023-04-27-292/+7377
| |\ | |/ |/|
* | Merge pull request #98 from OpenVic2Project/some-cleanup Hop3112023-04-26-195/+302
|\ \ | | | | | | Req comments + cleanup + c++ registry refactoring
| * | Divide map texture to fit in 16384 GPU dim limit Hop3112023-04-26-34/+49
| | |
| * | Further cleanup + reset on return to main menu Hop3112023-04-25-50/+121
| | |
| * | Req comments + cleanup + c++ registry refactoring Hop3112023-04-25-144/+165
|/ /
generated by our cgit fork (git 2.39.0) at 2024-01-23 02:24:14 +0100