aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
...
| * | 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
* | | Merge pull request #58 from Orwellian-225/sim/data Brendan Griffiths2023-03-09-0/+227
|\ \ \ | |/ / |/| / | |/ Added Data modelling Documentation - Ideology & Pops - JC and Vanilla
| * add: Data modelling Documentation - JC and Vanilla Orwellian-2252023-03-09-0/+227
|/ | | | | | add: ideology documentation add: goods documentation add: sim doc format
* Merge pull request #51 from Spartan322/tweak/credits George L. Albany2023-03-08-124/+27
|\
| * Fix Credits to use theme type variants over LabelSettings Spartan3222023-03-07-124/+27
| | | | | | | | | | | | | | - Enables reliable theme application Remove LabelSettings resources from Credits Moved theme load from MainMenu to GameMenu scene Removed Button references from default_theme resource
* | Add Music Player (#49) ClarkeCode2023-03-06-0/+232
|/ | | | | | | | | | | | | | | * Adding MusicConductor * Added selectable songs and player visibility toggle * Refinements to the music system * SongInfo compatability with various audio formats * Moved UI reqs to editor description; flipped conditions to exclude music .import files * Made selection of the first music track extension-agnostic * Fixed visual bug with play/pause button when interacting with progress slider
* Modify Project Structure Documentation (#14) Brendan Griffiths2023-03-04-9/+124
| | | | | | | | | | | | | | | | | | | | | | | * add: Asset and Data file structure add: Naming Conventions add: Clarification on asset file exporting * change: More relevant file structure examples Co-authored-by: ClarkeCode <33846391+ClarkeCode@users.noreply.github.com> * apply: Directory Naming Convention Changes Co-authored-by: ClarkeCode <33846391+ClarkeCode@users.noreply.github.com> * apply: Remove Prefixes for asset names Co-authored-by: ClarkeCode <33846391+ClarkeCode@users.noreply.github.com> * apply: Directory Naming Convention Changes to example --------- Co-authored-by: ClarkeCode <33846391+ClarkeCode@users.noreply.github.com>
* Merge pull request #55 from Hop311/req-comments ClarkeCode2023-03-04-9/+79
|\ | | | | Comments marking implemented requirements
| * Comments marking implemeneted requirements Hop3112023-03-04-9/+79
| |
* | Merge pull request #53 from Hop311/credits-sanatization ClarkeCode2023-03-04-46/+58
|\ \ | |/ |/| Credits loading sanatization
| * Minor naming tweaks. Hop3112023-03-04-10/+10
| |
| * Credits loading sanatization. Hop3112023-03-04-46/+58
|/
* Merge pull request #52 from Spartan322/enhance/lobby-and-macos George L. Albany2023-03-03-31/+33
|\
| * Make LobbyMenu resolution independent Spartan3222023-03-02-31/+33
|/ | | | Fix MacOS export directory
* Merge pull request #50 from Spartan322/update/godot4-stable George L. Albany2023-03-01-4/+4
|\
| * Update to Godot 4.0 Stable Release Spartan3222023-03-01-4/+4
|/
* Merge pull request #48 from Spartan322/fix/erroneous-theme-changes BrickPi2023-03-01-3/+233
|\ | | | | Make default_theme a text resource
generated by our cgit fork (git 2.39.0) at 2024-01-23 02:24:14 +0100