Skip to content

Commit

Permalink
Merge pull request OpenVicProject#166 from OpenVicProject/gui
Browse files Browse the repository at this point in the history
GUI elements -> Godot UI nodes generator
  • Loading branch information
Hop311 authored Nov 17, 2023
2 parents 72d893d + aefc61a commit 9165f59
Show file tree
Hide file tree
Showing 29 changed files with 1,348 additions and 519 deletions.
2 changes: 1 addition & 1 deletion extension/deps/openvic-simulation
Submodule openvic-simulation updated 64 files
+20 −0 .vscode/launch.json
+103 −57 src/openvic-simulation/GameManager.cpp
+8 −4 src/openvic-simulation/GameManager.hpp
+1 −1 src/openvic-simulation/country/Country.hpp
+79 −0 src/openvic-simulation/country/CountryInstance.cpp
+39 −0 src/openvic-simulation/country/CountryInstance.hpp
+138 −42 src/openvic-simulation/dataloader/Dataloader.cpp
+14 −5 src/openvic-simulation/dataloader/Dataloader.hpp
+20 −8 src/openvic-simulation/dataloader/NodeTools.cpp
+7 −6 src/openvic-simulation/dataloader/NodeTools.hpp
+0 −170 src/openvic-simulation/economy/Building.hpp
+52 −0 src/openvic-simulation/economy/BuildingInstance.cpp
+33 −0 src/openvic-simulation/economy/BuildingInstance.hpp
+17 −215 src/openvic-simulation/economy/BuildingType.cpp
+89 −0 src/openvic-simulation/economy/BuildingType.hpp
+1 −1 src/openvic-simulation/economy/EconomyManager.hpp
+4 −10 src/openvic-simulation/economy/Good.cpp
+2 −2 src/openvic-simulation/economy/Good.hpp
+2 −2 src/openvic-simulation/economy/ProductionType.cpp
+1 −1 src/openvic-simulation/economy/ProductionType.hpp
+1 −1 src/openvic-simulation/history/CountryHistory.hpp
+1 −1 src/openvic-simulation/history/DiplomaticHistory.cpp
+3 −2 src/openvic-simulation/history/DiplomaticHistory.hpp
+0 −4 src/openvic-simulation/history/HistoryManager.hpp
+9 −6 src/openvic-simulation/history/HistoryMap.hpp
+8 −8 src/openvic-simulation/history/ProvinceHistory.cpp
+4 −5 src/openvic-simulation/history/ProvinceHistory.hpp
+99 −0 src/openvic-simulation/interface/GFX.cpp
+138 −0 src/openvic-simulation/interface/GFX.hpp
+182 −0 src/openvic-simulation/interface/GUI.cpp
+235 −0 src/openvic-simulation/interface/GUI.hpp
+82 −0 src/openvic-simulation/interface/LoadBase.hpp
+92 −0 src/openvic-simulation/interface/UI.cpp
+27 −0 src/openvic-simulation/interface/UI.hpp
+37 −15 src/openvic-simulation/map/Map.cpp
+14 −4 src/openvic-simulation/map/Map.hpp
+87 −74 src/openvic-simulation/map/Province.cpp
+35 −42 src/openvic-simulation/map/Province.hpp
+5 −8 src/openvic-simulation/map/Region.cpp
+1 −2 src/openvic-simulation/map/Region.hpp
+3 −1 src/openvic-simulation/map/TerrainType.cpp
+1 −1 src/openvic-simulation/map/TerrainType.hpp
+1 −1 src/openvic-simulation/military/LeaderTrait.hpp
+50 −117 src/openvic-simulation/military/Wargoal.cpp
+19 −31 src/openvic-simulation/military/Wargoal.hpp
+13 −12 src/openvic-simulation/misc/Define.cpp
+4 −3 src/openvic-simulation/misc/Define.hpp
+41 −5 src/openvic-simulation/misc/Modifier.cpp
+9 −4 src/openvic-simulation/misc/Modifier.hpp
+118 −0 src/openvic-simulation/politics/NationalFocus.cpp
+76 −0 src/openvic-simulation/politics/NationalFocus.hpp
+1 −1 src/openvic-simulation/politics/NationalValue.hpp
+6 −0 src/openvic-simulation/politics/PoliticsManager.hpp
+5 −10 src/openvic-simulation/pop/Culture.cpp
+3 −3 src/openvic-simulation/pop/Culture.hpp
+1 −1 src/openvic-simulation/pop/Pop.hpp
+4 −10 src/openvic-simulation/pop/Religion.cpp
+1 −1 src/openvic-simulation/pop/Religion.hpp
+1 −1 src/openvic-simulation/types/Colour.hpp
+4 −0 src/openvic-simulation/types/Date.cpp
+2 −0 src/openvic-simulation/types/Date.hpp
+29 −34 src/openvic-simulation/types/IdentifierRegistry.hpp
+48 −0 src/openvic-simulation/types/fixed_point/FixedPointMap.hpp
+42 −3 src/openvic-simulation/utility/Getters.hpp
Loading

0 comments on commit 9165f59

Please sign in to comment.