aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeLines
* 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
| |\
| | * 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
| |/
| * Merge pull request #93 from Spartan322/some-refurbishing George L. Albany2023-04-24-155/+317
| |\
| | * Refurbish UI elements Spartan3222023-04-24-155/+317
| |/
| * Merge pull request #96 from OpenVic2Project/clang-format ClarkeCode2023-04-24-17/+4
| |\
| | * Altering .clang-format to make compliant with clang-format 10.0.0; formerly 1... ClarkeCode2023-04-24-17/+4
| |/
| * Merge pull request #95 from OpenVic2Project/clang-format ClarkeCode2023-04-23-0/+48
| |\
| | * Added a .clang-format for formatting use ClarkeCode2023-04-23-0/+48
| * | Merge pull request #94 from OpenVic2Project/province-buildings Hop3112023-04-23-735/+1353
| |\ \ | | |/ | |/|
| | * C++ refactoring + simulation prototype Hop3112023-04-23-735/+1353
| * | Merge pull request #92 from OpenVic2Project/map-canadian-blocking ClarkeCode2023-04-23-3/+33
| |\|
| | * Added basic outlines of Canadian provinces + territories ClarkeCode2023-04-20-3/+33
| |/
| * Merge pull request #91 from OpenVic2Project/minor-map-ui ClarkeCode2023-04-18-1/+94
| |\
| | * Double-click a start date to automatically start a game session ClarkeCode2023-04-18-0/+6
| | * Added music player control to GameSession ClarkeCode2023-04-18-1/+13
| | * Added game speed panel to GameSession ClarkeCode2023-04-18-1/+76
| |/
| * Merge pull request #88 from OpenVic2Project/map-drawing Hop3112023-04-18-335/+1146
| |\
| | * Better province image + terrain + some buttons Hop3112023-04-18-335/+1146
| * | Merge pull request #89 from OpenVic2Project/spring-cleaning ClarkeCode2023-04-17-213/+109
| |\ \ | | |/ | |/|
| | * Removing TestSingleton ClarkeCode2023-04-17-213/+109
| |/
| * Merge pull request #73 from OpenVic2Project/in-game-date ClarkeCode2023-04-14-5/+283
| |\
| | * Add Date to extension markomitos2023-04-14-5/+283
| |/
| * Merge pull request #84 from OpenVic2Project/terrain-map George L. Albany2023-04-14-55/+1882
| |\
| | * Add minimap for terrain map Gone2Daly2023-04-14-269/+1028
| | * Add terrain map Hop3112023-04-14-30/+1098
| |/
| * Merge pull request #86 from Spartan322/update/godot4.0.2-stable George L. Albany2023-04-13-8/+8
| |\
| | * Update to Godot 4.0.2 Stable Release Spartan3222023-04-11-8/+8
| |/
| * Logo on Mainmenu + icon imports + whitespace cleanup (#82) Hop3112023-04-07-27/+3255
* | Changed type of cost in Good.hpp/.cpp + codestyle Wolfgang Aigner2023-04-06-14/+17
* | Basic loading of goods defined in goods.json Wolfgang Aigner2023-04-06-0/+144
|/
* Merge pull request #81 from OpenVic2Project/icons-and-tech ClarkeCode2023-04-05-0/+0
|\
| * Added unit icons; unfinished icons given placeholder ClarkeCode2023-04-01-0/+0
| * Added images for Army technologies ClarkeCode2023-04-01-0/+0
| * Adding icon files; unfinished icons given placeholder ClarkeCode2023-04-01-0/+0
|/
* Merge pull request #80 from Spartan322/fix/workflow-wine-failure George L. Albany2023-03-31-4/+11
|\
| * Add fix-missing argument to apt install wine64 George L. Albany2023-03-31-4/+11
|/
* Added Localisation (#77) Hop3112023-03-30-90/+475
* Merge pull request #79 from Spartan322/general-release-info George L. Albany2023-03-29-32/+309
|\
| * Add automated git release info retrieval on export Spartan3222023-03-29-32/+309
|/
* Merge pull request #76 from Spartan322/fix/button-export George L. Albany2023-03-24-9/+16
|\
| * Make main_menu_button.png a Texture2D Spartan3222023-03-24-9/+16
|/
* Merge pull request #75 from Spartan322/add/ci-push-and-release George L. Albany2023-03-24-12/+111
|\
| * Add release integration Spartan3222023-03-24-12/+111
* | Merge pull request #72 from Spartan322/enhance/theming George L. Albany2023-03-24-149/+229
|\ \
| * | Make default_theme.tres the project theme Spartan3222023-03-23-149/+229