aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* 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
|\ | | | | Icons and Army Tech
| * 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
|/ | | | Add warning and fix for no tags on user repos
* Added Localisation (#77) Hop3112023-03-30-90/+475
| | | | | | | | | * Added Localisation * Removed `.gdignore`s. * Localisation dir path and Locale name cleanup * Incomplete entry warnings + README
* 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
|/ | | | | | | | | | | | | | Makes debug easier to see and handle Add commit hash label to MainMenu Add click-copyable tag, commit hash, and checksum to main menu Rename VersionChecksumBox to ReleaseInfoBox Move ReleaseInfoBox to separate scene and script Add GIT_INFO.gd for generic project running Add openvic2-plugin addon for handling export plugin Replaces GIT_INFO.gd on export Setup build workflow to retrieve commit hash, tag, and release
* 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
|/ | | | | Make main_menu_button_normal a text resource Easier to manage with Git
* 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
| | | | | | | | | | | | | | | | | | Add pck debug check and artifact Update CI workflow with release archives Update CI workflow for all pushes Remove initial compile of godot-cpp from workflow Appears to be unnecessary, extension compile should handle it
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove default_theme as theme for GameMenu Usable as a result of Godot 4.0.1 update Move theme resources to theme directory Move theme_assets to theme/assets For better theme organization Remove scene/node specific theme overrides Use theme_type_variation for nodes in MainMenu, OptionsMenu, CreditsMenu Decreases coupling of theme values in scenes and the scene tree Assign theme resources to MainMenu, OptionsMenu, and CreditsMenu Separates general default theme values and scene specific theme values Reduces the specificity and verbosity of theme type variation names Rename MainMenu/Panel/VBox/Margin2 to BottomMargin For better clarity of Margin's purpose Add newline to end of CreditsMenu.gd
* | | Merge pull request #74 from Spartan322/fix/export-issues George L. Albany2023-03-24-20/+6
|\ \ \ | | |/ | |/|
| * | Fix MacOS OpenVic2.dmg export_path to OpenVic2.app Spartan3222023-03-24-20/+6
|/ / | | | | | | | | | | | | | | | | | | | | | | | | Godot cannot output a dmg file Rename macOS export preset to MacOS To make export platform names consistent Add `common/*` to include_filter So exports will include everything in the common directory Make credits.csv not translation file but to keep the file on import Prevents replacement of the file as a translation
* | Merge pull request #71 from Spartan322/update/godot4.0.1-stable BrickPi2023-03-23-4/+4
|\| | | | | Update to Godot 4.0.1 Stable Release
| * Update to Godot 4.0.1 Stable Release Spartan3222023-03-23-4/+4
|/
* Merge pull request #68 from OpenVic2Project/docs-architecture-and-schema ClarkeCode2023-03-22-30/+4142
|\ | | | | Docs architecture and schema
| * Fix spelling ClarkeCode2023-03-22-1/+1
| | | | | | Co-authored-by: Hop311 <Hop3114@gmail.com>
| * Moved data files according to project-file-structure.md ClarkeCode2023-03-22-0/+0
| |
| * Creating data files according to schema in docs/simulation/provinces.md ClarkeCode2023-03-15-0/+3844
| |
| * Re-evaluated approach for dataloading ClarkeCode2023-03-15-14/+60
| |
| * Update to reflect recent additions ClarkeCode2023-03-12-1/+7
| |
| * Beginning of architecture file ClarkeCode2023-03-12-0/+52
| |
| * Initial description of Province schema ClarkeCode2023-03-12-0/+58
| |
| * Creating data files according to tables in goods.md ClarkeCode2023-03-12-0/+105
| |
| * Minor tweaks Robert Clarke2023-03-12-29/+30
| |
* | Basic Game Session skeleton (#67) Hop3112023-03-22-125/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | * Fixed grab_focus error on not is_inside_tree * Moved SampleGame to GameSession/GameSession * Basic GameSession and GameSessionMenu/Escape Menu * Map Control Panel skeleton * Added requirement comments * Removed unnecessary CenterContainer
* | Merge pull request #70 from orwellian225/sim/data Brendan Griffiths2023-03-22-2/+2
|\ \ | | | | | | fix: Spelling mistake
| * | fix: Spelling mistake Orwellian-2252023-03-13-2/+2
| | |
* | | Merge pull request #65 from Spartan322/refactor/game-menuv0.01_Primum_Mobile BrickPi2023-03-14-13/+22
|\ \ \ | | | | | | | | Refactor GameMenu to rely on export variables
| * | | Refactor GameMenu to rely on export variables Spartan3222023-03-13-13/+22
|/ / /
* | | Merge pull request #64 from BrickPi/credits-rename BrickPi2023-03-12-9/+7
|\ \ \ | | | | | | | | Refactor Credits -> CreditsMenu
| * | | Refactor Credits -> CreditsMenu Joel Machens2023-03-12-9/+7
| | | |
* | | | Merge pull request #59 from Spartan322/feature/splash-opener George L. Albany2023-03-12-1/+158
|\ \ \ \ | |/ / / |/| | |
| * | | Add splash opener functionality Spartan3222023-03-11-1/+158
| | |/ | |/| | | | | | | | | | Add boot splash screen Implement splash skip on interaction
* | | Merge pull request #54 from BrickPi/settings-menu-upgrade George L. Albany2023-03-12-75/+232
|\ \ \ | |/ / |/| |
| * | Added General Tab htmlJoel2023-03-12-75/+232
|/ / | | | | | | | | | | Fix OptionsMenu scaling Options UI extended Connected escape for back
* | Merge pull request #60 from Spartan322/feature/debug-mode George L. Albany2023-03-11-0/+21
|\ \
| * | Add debug mode Spartan3222023-03-11-0/+21
| | | | | | | | | | | | Fulfills requirement SS-56
* | | Merge pull request #61 from Spartan322/fix/pr-ci George L. Albany2023-03-11-1/+1
|\ \ \
| * | | Make PR Continuous Integration work Spartan3222023-03-11-1/+1
| |/ /
* | | Merge pull request #62 from Spartan322/fix/music-for-export George L. Albany2023-03-11-1/+2
|\ \ \ | |/ / |/| |
| * | Fix MusicConductor not loading music on exported executables Spartan3222023-03-11-1/+2
|/ /
* | Merge pull request #57 from Spartan322/fixup/music-player George L. Albany2023-03-09-184/+247
|\ \
| * | Fix up MusicPlayer for future work Spartan3222023-03-09-184/+247
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add music import files Rename MusicUIController to MusicPlayer Adjust MusicPlayer node position, offset, and anchors Adjust MusicConductor, MusicPlayer, and SongInfo style to conform with other GDScript files Correct capability for MusicPlayer to desync from the MusicConductor Adjusted MusicPlayer button text to use media player unicode symbols Adjust MusicPlayer to correct mouse filter problems Adjust MusicPlayer to appear more consistent Correct lack of path_join use in SongInfo Correct mouse filter problems in OptionsMenu
generated by our cgit fork (git 2.39.0) at 2024-01-23 02:24:14 +0100