aboutsummaryrefslogtreecommitdiff
path: root/game
Commit message (Collapse)AuthorAgeLines
* Merge branch 'terrain-map' into minimap Hop3112023-04-09-30/+90
|\
| * Map modes + moved province index image to SIM side Hop3112023-04-08-12/+52
| |
| * Region loading and mapmode. Hop3112023-04-08-0/+9
| |
| * Fixed weird hashmap lookup crash. Hop3112023-04-08-17/+28
| |
* | Moved assets to R/art/ Hop3112023-04-09-34/+34
| |
* | Accurate minimap viewport shape Hop3112023-04-08-56/+46
| |
* | Update GameSession.tscn Gone2Daly2023-04-07-1/+48
| |
* | forgot to add emit Gone2Daly2023-04-07-0/+3
| |
* | minimap-first-try Gone2Daly2023-04-07-1/+108
|/
* Movement tweaks Hop3112023-04-07-34/+39
|
* Fixes (prov selection, index unnorming, mac print) Hop3112023-04-07-1/+1
|
* Province index and colour lookup texture Hop3112023-04-07-26/+57
|
* Custom map mesh that fixes UV issue Hop3112023-04-05-35/+21
|
* Input and province selection cleanup Hop3112023-04-05-133/+127
|
* Adding province overview panel and selection of province. Gone2Daly2023-04-05-16/+157
|
* Basic province id and shape loading and rendering. Hop3112023-04-03-23/+138
|
* Removed SubViewport and made more variables export Hop3112023-03-31-28/+17
|
* First go at terrain map implementation Hop3112023-03-30-2/+191
|
* Added Localisation (#77) Hop3112023-03-30-90/+326
| | | | | | | | | * Added Localisation * Removed `.gdignore`s. * Localisation dir path and Locale name cleanup * Incomplete entry warnings + README
* Add automated git release info retrieval on export Spartan3222023-03-29-31/+271
| | | | | | | | | | | | | | 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
* 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 #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
* | 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 #68 from OpenVic2Project/docs-architecture-and-schema ClarkeCode2023-03-22-0/+3949
|\ | | | | Docs architecture and schema
| * Moved data files according to project-file-structure.md ClarkeCode2023-03-22-0/+3949
| |
* | 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
* | 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
* / 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
* | Fix MusicConductor not loading music on exported executables Spartan3222023-03-11-1/+2
|/
* 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 #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
* 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
| |
* | Minor naming tweaks. Hop3112023-03-04-10/+10
| |
* | Credits loading sanatization. Hop3112023-03-04-46/+58
|/
* Make LobbyMenu resolution independent Spartan3222023-03-02-31/+33
| | | | Fix MacOS export directory
* Merge pull request #48 from Spartan322/fix/erroneous-theme-changes BrickPi2023-03-01-3/+233
|\ | | | | Make default_theme a text resource
| * Change default_theme.theme to default_theme.tres Spartan3222023-02-27-3/+233
| | | | | | | | | | | | | | | | Makes it a text resource Remove Button font data from default_theme Fixes erroneous theme updates Centralize Label_Checksum font_color into default_theme
* | Update Keychain SVG imports to Godot 4 RC 5 (#43) George L. Albany2023-03-01-10/+10
| |
* | add: credits.csv - req: FS4 (#16) Brendan Griffiths2023-03-01-3/+279
|/ | | | | | | | | | | | | Requirements met by this PR: SS-17 SS-29 [1] UI-32 UI-34 UIFUN-36 UI-35 UI-38 UIFUN-37 FS-4
* Refactor SFX into a SoundManager (#45) George L. Albany2023-02-27-26/+115
| | | | | | | | | | | | | * Refactor SFX into a SoundManager Add SoundManager able to play arbitrary sound streams Make SoundManager use only one AudioStreamPlayer per bus Add StyleBoxWithSound Add Kenney UI Audio click3.wav Removed sound play via pressed signals in MainMenu Make Button_MainMenu pressed style StyleBoxWithSound with click3.wav sound * Add playing mp3 files by name to the SoundManager * Fix missing quotation