aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeLines
...
* Merge pull request #111 from OpenVic2Project/goods Hop3112023-05-12-5947/+786
|\
| * 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 ClarkeCode2023-05-09-0/+7
* | Merge pull request #109 from Nemrav/gui-scaling Hop3112023-05-10-9/+157
|\ \ | |/ |/|
| * 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 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 ClarkeCode2023-05-02-40/+40
|/
* 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
| |/
* | Merge pull request #102 from Spartan322/refine/argument-parsing George L. Albany2023-05-02-1/+348
|\ \
| * | Add ArgumentParser Spartan3222023-05-02-1/+348
* | | 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
| |/
* | Merge pull request #103 from OpenVic2Project/terrain Hop3112023-05-01-177/+496
|\ \
| * | 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
|\ \
| * | 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
|\ \ \ | |_|/ |/| |
| * | 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 whic... ClarkeCode2023-04-28-85/+123
| * 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
|\ \
| * | 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
|/ /