Commit message (Collapse) | Author | Age | Lines | |
---|---|---|---|---|
* | Merge pull request #240 from OpenVicProject/format-cleanup | Hop311 | 2024-07-19 | -15/+15 |
|\ | | | | | Update openvic-simulation to OpenVicProject/OpenVic-Simulation@d1f3a96 | |||
| * | Update openvic-simulation to OpenVicProject/OpenVic-Simulation@d1f3a96format-cleanup | hop311 | 2024-07-19 | -15/+15 |
|/ | ||||
* | Merge pull request #239 from OpenVicProject/indexed-map | Hop311 | 2024-07-17 | -28/+67 |
|\ | | | | | Use IndexedMap + helper function support | |||
| * | Use IndexedMap + helper function support | hop311 | 2024-07-17 | -28/+67 |
|/ | ||||
* | Merge pull request #237 from OpenVicProject/scrolling-textures | Hop311 | 2024-07-11 | -45/+139 |
|\ | | | | | Scrolling model materials (tank tracks and smoke) | |||
| * | Scrolling model materials (tank tracks and smoke)scrolling-textures | hop311 | 2024-07-10 | -45/+139 |
|/ | ||||
* | Merge pull request #238 from OpenVicProject/force-scons-4.7.0 | Hop311 | 2024-07-10 | -1/+1 |
|\ | | | | | Update/Fix for SCons 4.8.0 | |||
| * | Update openvic-simulation to OpenVicProject/OpenVic-Simulation@9479a87force-scons-4.7.0 | hop311 | 2024-07-10 | -0/+0 |
| | | | | | | | | Update scripts to OpenVicProject/scripts@77fc5f9 | |||
| * | Force Github Actions to use SCons 4.7.0 | hop311 | 2024-07-10 | -1/+1 |
|/ | ||||
* | Merge pull request #236 from OpenVicProject/country-definition | Hop311 | 2024-07-04 | -25/+33 |
|\ | | | | | Use CountryDefinition and CountryInstance | |||
| * | Use CountryDefinition and CountryInstancecountry-definition | hop311 | 2024-07-04 | -25/+33 |
| | | ||||
* | | Merge pull request #235 from OpenVicProject/instance-definition-managers | Hop311 | 2024-07-04 | -114/+217 |
|\| | | | | | Update to use SIM Instance and Definition Managers | |||
| * | Updated SIM to use separate Instance and Definition Managersinstance-definition-managers | hop311 | 2024-06-13 | -114/+217 |
| | | ||||
* | | Merge pull request #234 from OpenVicProject/good-instance | Hop311 | 2024-06-18 | -1/+1 |
|\| | | | | | Update to use GoodInstance | |||
| * | Update to use GoodInstancegood-instance | hop311 | 2024-06-13 | -1/+1 |
| | | ||||
* | | Merge pull request #233 from OpenVicProject/map-instance | Hop311 | 2024-06-18 | -37/+39 |
|\| | | | | | Update to use Map instance | |||
| * | Use separate MapDefinition and MapInstancemap-instance | hop311 | 2024-06-13 | -37/+39 |
|/ | ||||
* | Merge pull request #232 from OpenVicProject/province-const-mutable | Hop311 | 2024-06-08 | -46/+101 |
|\ | | | | | Province const/mutable + proper State names | |||
| * | Province const/mutable + proper State namesprovince-const-mutable | hop311 | 2024-06-06 | -46/+101 |
|/ | ||||
* | Merge pull request #231 from Spartan322/fix/map-behavior | George L. Albany | 2024-05-19 | -5/+28 |
|\ | | | | | Fix Minimap click doing nothing | |||
| * | Fix Minimap click doing nothing | Spartan322 | 2024-05-19 | -5/+28 |
| | | | | | | | | | | | | | | | | Add MapView queue_province_hover_update Makes province hover much more reliable Fix edge scrolling continuing when mouse leaves window Add province hover reset when mouse leaves the window Change _edge_move_threshold to 0.025 | |||
* | | Merge pull request #230 from OpenVicProject/misc | Hop311 | 2024-05-16 | -110/+133 |
|\ \ | |/ |/| | Misc UI code changes | |||
| * | Misc UI code changesmisc | hop311 | 2024-05-14 | -110/+133 |
|/ | ||||
* | Merge pull request #227 from OpenVicProject/models | Hop311 | 2024-05-12 | -2/+2506 |
|\ | | | | | Models | |||
| * | Generate building modelsmodels | hop311 | 2024-05-08 | -0/+122 |
| | | ||||
| * | Generate army and navy models | hop311 | 2024-05-08 | -2/+567 |
| | | ||||
| * | Add GDScript XAC and XSM loaders | hop311 | 2024-05-07 | -0/+1817 |
| | | ||||
* | | Merge pull request #228 from OpenVicProject/menu-tweaks | Hop311 | 2024-05-09 | -65/+529 |
|\ \ | | | | | | | Topbar display data + Population menu rebel icons | |||
| * | | Topbar display data wiring (GDScript level)menu-tweaks | hop311 | 2024-05-08 | -22/+391 |
| | | | ||||
| * | | Population menu rebel icons | hop311 | 2024-05-08 | -16/+77 |
| | | | ||||
| * | | Updated number formatting functions | hop311 | 2024-05-08 | -27/+61 |
| |/ | ||||
* | | Merge pull request #229 from Spartan322/add/right-click-diplo | George L. Albany | 2024-05-09 | -0/+10 |
|\ \ | |/ |/| | Add right click map for diplomacy window | |||
| * | Add right click map for diplomacy window | Spartan322 | 2024-05-08 | -0/+10 |
|/ | ||||
* | Merge pull request #226 from Spartan322/click-mask-guinodes | George L. Albany | 2024-05-07 | -79/+282 |
|\ | | | | | Improve map view and game panel user experience | |||
| * | Improve map view and game panel user experience | Spartan322 | 2024-05-07 | -79/+282 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Minimizes panel mouse obstruction to scripted panel images Prevents map view from hovering inside UI elements Unsets province hover when not over provinces Add `GUINode.click_mask` Prevents mouse interactions not within click_mask Add `GUINode.set_click_mask_from_nodepaths` Generates click_mask from paths relating to GUINode textures Sets nodepaths to MOUSE_FILTER_IGNORE Add CanvasLayer parent to GameSession UI nodes Set mouse_force_pass_scroll_events to GameSession UI nodes Set MapControlPanel mouse_filter to default (MOUSE_FILTER_STOP) Move MapView mouse viewport changes to _input Move MapView _action_drag released check to _input Move MapView processing to _process Remove viewport and window notifications Disable if window is not focused or input is handled: MapView mouse interactions (including edge scrolling and drag panning) MapView province hover Set mouse_filter to MOUSE_FILTER_IGNORE for ProvinceOverviewPanel province_view panel Set ProvinceOverviewPanel click_mask path to `province_view/background` Set mouse_filter to MOUSE_FILTER_IGNORE for Topbar topbar panel Set Topbar click_mask path to `topbar/topbar_bg` and `topbar/topbar_paper` | |||
* | | Merge pull request #225 from Spartan322/update/keychain | George L. Albany | 2024-05-04 | -203/+177 |
|\ \ | |/ |/| | Update Keychain to Orama-Interactive/Keychain@5031af5 | |||
| * | Update Keychain to ↵ | Spartan322 | 2024-05-04 | -203/+177 |
|/ | | | | Orama-Interactive/Keychain@5031af557efcff4eb1ae77550e91868ab57cb1c0 | |||
* | Merge pull request #224 from Spartan322/update/godot4.2.2-stable | George L. Albany | 2024-05-04 | -11/+28 |
|\ | | | | | Update to Godot 4.2.2 Stable Release | |||
| * | Update to Godot 4.2.2 Stable Release | Spartan322 | 2024-05-04 | -11/+28 |
|/ | | | | | | Fix UITools.cpp float conversion warning Add `OpenVic::Utilities::to_real_t(std::floating_point)` Add _real user defined literal for real_t | |||
* | Merge pull request #223 from OpenVicProject/budget-tab-gui | Arturo | 2024-04-28 | -15/+199 |
|\ | | | | | Preparation of the Budget Menu for the simulation data | |||
| * | Preparation of the Budget Menu for the simulation databudget-tab-gui | Arturo | 2024-04-28 | -15/+199 |
| | | ||||
* | | Merge pull request #222 from OpenVicProject/province-namesrivers | Hop311 | 2024-04-24 | -6/+133 |
|\ \ | | | | | | | Add province names and improve zooming | |||
| * | | Add province names and improve zooming | hop311 | 2024-04-24 | -6/+133 |
|/ / | ||||
* | | Merge pull request #221 from OpenVicProject/province-edge-blending | Hop311 | 2024-04-23 | -49/+100 |
|\ \ | | | | | | | Smooth province edges and zoom tweaks | |||
| * | | Smooth province edges and zoom tweaksprovince-edge-blending | hop311 | 2024-04-22 | -49/+100 |
|/ / | ||||
* | | Merge pull request #220 from OpenVicProject/flag-sheet | Hop311 | 2024-04-22 | -38/+138 |
|\ \ | | | | | | | Switch to using a single flag sheet image/texture | |||
| * | | Switch to using a single flag sheet image/textureflag-sheet | hop311 | 2024-04-21 | -38/+138 |
| | | | ||||
* | | | Merge pull request #219 from OpenVicProject/asset-manager-load-flags | Hop311 | 2024-04-22 | -52/+147 |
|\| | | | | | | | | Add AssetManager LoadFlags | |||
| * | | Add AssetManager LoadFlagsasset-manager-load-flags | hop311 | 2024-04-21 | -52/+147 |
| | | | ||||
* | | | Merge pull request #218 from OpenVicProject/array-dict-tweaks | Hop311 | 2024-04-22 | -64/+98 |
|\| | | | | | | | | Pre-allocate and use std::move for Godot Arrays and Dictionaries |