aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
...
* | 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
|/ /
* | Merge pull request #93 from Spartan322/some-refurbishing George L. Albany2023-04-24-155/+317
|\ \
| * | Refurbish UI elements Spartan3222023-04-24-155/+317
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move GameSession MusicPlayer to below OptionsMenu Ensures the MusicPlayer appears above the OptionsMenu Add Save and Quit/Resign to GameSessionMenu resign/quit popup To allow the player to save and resign/quit more quicker Remove GameSessionMenu hide on OptionsMenu open Renamed many UI elements to better reflect their purpose Add SessionButton theme_type_variation to GameSession buttons Add SessionButton style similar to TitleButton Disable 3D for dialog windows Change _play_pause_display_button pause text to "⏸ " Change IncreaseSpeedButton text to + Change DecreaseSpeedButton text to - Change Minimap NinePatch frame to function like a nine patch Rename actions map_zoomin and map_zoomout to map_zoom_in and map_zoom_out Change ProvinceOverviewPanel to a PanelContainer Reorganize ProvinceOverviewPanel to better use container functionality Optimize MusicPlayer Enables one line support for MusicPlayer Add warning to StyleBoxWithSound to avoid UI elements with toggle functionality
* | 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
| * | Altering .clang-format to make compliant with clang-format 10.0.0; formerly ↵ ClarkeCode2023-04-24-17/+4
|/ / | | | | | | 16.0.1 compliant
* | Merge pull request #95 from OpenVic2Project/clang-format ClarkeCode2023-04-23-0/+48
|\ \ | | | | | | Added a .clang-format file for formatting use
| * | 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
|\ \ \ | |/ / |/| | Province buildings
| * | 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
| * | 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
|\ \ | | | | | | Minor map UI
| * | 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
|\ \ | | | | | | Further Map Stuff
| * | Better province image + terrain + some buttons Hop3112023-04-18-335/+1146
| | |
* | | Merge pull request #89 from OpenVic2Project/spring-cleaning ClarkeCode2023-04-17-213/+109
|\ \ \ | |/ / |/| | Spring Cleaning
| * | Removing TestSingleton ClarkeCode2023-04-17-213/+109
|/ / | | | | | | Extracted game advancement behaviour to separate class
* | Merge pull request #73 from OpenVic2Project/in-game-date ClarkeCode2023-04-14-5/+283
|\ \ | | | | | | Added in-game date
| * | Add Date to extension markomitos2023-04-14-5/+283
|/ / | | | | | | | | | | | | | | | | | | | | | | | | For absolute simulation dates Add TimeSpan to extension For relative simulation time Add Simulation Speed Management to extension Add Visual Studio directory to .gitignore Co-authored-by: ClarkeCode <clarke.john.robert@gmail.com> Co-authored-by: Hop311 <hop3114@gmail.com>
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With accurate viewport shape display on minimap With Mapmode management With Region mapmode With Province mapmode With Index mapmode With Minimap single-click movement With Minimap drag-click movement
| * | Add terrain map Hop3112023-04-14-30/+1098
|/ / | | | | | | | | | | | | | | | | | | | | | | With Directional movement using WASD With Directional movement using arrow keys With Click-Drag movement using middle mouse button With Province identifiers With Province shape loading With Province rendering With Province selection With Province overview panel With Color lookup texture
* | 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
|/ / | | | | | | Remove specific Godot version references for non-links in README.md
* | Logo on Mainmenu + icon imports + whitespace cleanup (#82) Hop3112023-04-07-27/+3255
| | | | | | | | | | | | | | * Whitespace cleanup * Icon import files * Logo on main menu.
| * Changed type of cost in Good.hpp/.cpp + codestyle Wolfgang Aigner2023-04-06-14/+17
| |
generated by our cgit fork (git 2.39.0) at 2024-01-23 02:24:14 +0100