aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeLines
* 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
| * 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/+281
|/ | | | | | | | | | | | | 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
* Add MacOS template (#3) Andres Villagra2023-02-27-1/+111
| | | Co-authored-by: Andres V <andres@avillagra.net>
* Use uint64_t rather than size_t (#47) BrickPi2023-02-27-4/+4
| | | Fix https://github.com/OpenVic2Project/OpenVic2/pull/3#issuecomment-1446571846
* Update to Godot 4 Release Candidate 6 (#46) George L. Albany2023-02-27-4/+4
|
* Add skeleton for Game Lobby Menu (#26) nuruvilu2023-02-27-2/+132
|
* Add Main Menu Version and Checksum Labels (#44) BrickPi2023-02-27-2/+97
|
* Add Setting Sanatization (#21) Hop3112023-02-26-126/+215
|
* Add Sound Effect Manager (#25) BrickPi2023-02-26-0/+45
|
* Merge pull request #24 from Spartan322/update/godot4-rc5 CptAlanSmith2023-02-26-4/+4
|\ | | | | Update to Godot 4 Release Candidate 5
| * Update to Godot 4 Release Candidate 5 Spartan3222023-02-26-4/+4
|/
* Update to Godot 4 Release Candidate 4 (#20) George L. Albany2023-02-25-4/+4
|
* Added contributor quickstart guide (#19) ClarkeCode2023-02-23-1/+123
|
* Delete Simulation singleton correctly. (#17) Hop3112023-02-22-1/+1
|
* Add Keychain plugin for Controls tab (#15) George L. Albany2023-02-21-200/+2240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add modified Keychain plugin for future Controls tab See https://github.com/Orama-Interactive/Keychain/tree/4.x Added Events autoload singleton for global eventing namespace Added Events.Options for global options functionality * Add Controls tab via Keychain plugin Use Events.Options for save, load, and reset of settings Separate OptionMenu tabs into scene files Add locale saving and loading Refactor SettingNodes scripts for more generalized use Remove random prints Remove useless spinbox signal connection Make Resolution consistently use Vector2i * Implement Godot project overrides for resolution and window mode Overrides are necessary as Godot does not load resolution or window mode on startup, so an override is necessary to ensure this happens. Add null checks to SettingHSlider and SettingOptionButton * Fix incorrect resolution value in ResolutionSelector * Correct project settings override behavior in editor Godot normally tries to overwrite the project settings in the editor, a template feature tag must be used to prevent the editor from overwriting the project.godot settings. * Fix Orama-Interactive/Keychain#8
* Add stylized theme to MainMenu (#12) George L. Albany2023-02-21-77/+412
| | | | | | | | | | | | | | | | | | | | * Add stylized theme to MainMenu Increase message queue memory size by 4 Add default_theme.theme Refactor SampleGame.gd to better account for refactoring via @export nodes Properly aligne SampleGame scene Reorganize MainMenu into its own directory Add main_menu_border_paper.png Add main_menu_button.png * Add background image to theme Implement StyleBoxCombinedTexture Allows drawing an array of textures all at once Make MainMenu Panel a PanelContainer for consistency * Implement MainMenu button press, hover, and focus styles Improve MainMenu button disabled style * Add Godot's latest documentation to the README.md
* Merge pull request #13 from Orwellian-225/ProjectStructure Justin Nolan2023-02-20-0/+93
|\ | | | | Project File Structure
| * add: Project File Structure doc Orwellian-2252023-02-20-0/+93
| |
* | Merge pull request #11 from Spartan322/update/godot4-rc2 ClarkeCode2023-02-19-4/+4
|\ \ | |/ |/| Update to Godot 4 Release Candidate 2
| * Update to Godot 4 Release Candidate 2 Spartan3222023-02-18-4/+4
|/
* Merge pull request #9 from OpenVic2Project/docs-wip ClarkeCode2023-02-15-0/+323
|\ | | | | Introduction of C++ styleguide
| * Update of C++ styleguide Robert Clarke2023-02-14-38/+300
| |
| * Update docs readme Justin Nolan2023-02-10-6/+1
| |
| * Remove Latex files Justin Nolan2023-02-10-110/+0
| |
| * Revert "Remove latex files" Justin Nolan2023-02-10-0/+68
| | | | | | | | This reverts commit 180a7c5a6dff21f319a80780376450a46080ca28.
| * Remove latex files Justin Nolan2023-02-10-68/+0
| |
| * Fix table of contents #2 Justin Nolan2023-02-10-4/+4
| |
| * Fix table of contents Justin Nolan2023-02-10-0/+4
| |
generated by our cgit fork (git 2.39.0) at 2024-01-23 02:24:14 +0100