aboutsummaryrefslogtreecommitdiff
path: root/game
Commit message (Collapse)AuthorAgeLines
...
* | | Merge pull request #99 from Spartan322/conform-license-for-godot George L. Albany2023-05-02-1/+139
|\ \ \ | |_|/ |/| |
| * | Add some license conformance for Godot Spartan3222023-04-28-1/+139
| |/ | | | | | | | | | | Add License Attribution for OpenVic2, Godot, FreeType, ENet, and mbed TLS in credits with redirect links to licenses Add contributor and donor list for Godot to credits Add link button for Godot, redirects to https://godotengine.org
* | Hashmaps instead of linear + better province hover Hop3112023-05-01-0/+1
| |
* | Highlight selected province on minimap Hop3112023-04-30-3/+29
| |
* | Terrain textures + province colour alpha channel Hop3112023-04-29-30/+190
| |
* | Merge branch 'main' into goods Hop3112023-04-29-157/+108
|\ \
| * | Terrain channel for provinces + generated minimap Hop3112023-04-28-164/+108
| | |
| * | Vertical subdivision + calculation for both dims Hop3112023-04-26-3/+10
| |/
* / Fix typo ClarkeCode2023-04-27-2/+2
|/
* Divide map texture to fit in 16384 GPU dim limit Hop3112023-04-26-18/+17
|
* Further cleanup + reset on return to main menu Hop3112023-04-25-2/+2
|
* Req comments + cleanup + c++ registry refactoring Hop3112023-04-25-2/+17
|
* Refurbish UI elements Spartan3222023-04-24-155/+317
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move GameSession MusicPlayer to below OptionsMenu Ensures the MusicPlayer appears above the OptionsMenu Add Save and Quit/Resign to GameSessionMenu resign/quit popup To allow the player to save and resign/quit more quicker Remove GameSessionMenu hide on OptionsMenu open Renamed many UI elements to better reflect their purpose Add SessionButton theme_type_variation to GameSession buttons Add SessionButton style similar to TitleButton Disable 3D for dialog windows Change _play_pause_display_button pause text to "⏸ " Change IncreaseSpeedButton text to + Change DecreaseSpeedButton text to - Change Minimap NinePatch frame to function like a nine patch Rename actions map_zoomin and map_zoomout to map_zoom_in and map_zoom_out Change ProvinceOverviewPanel to a PanelContainer Reorganize ProvinceOverviewPanel to better use container functionality Optimize MusicPlayer Enables one line support for MusicPlayer Add warning to StyleBoxWithSound to avoid UI elements with toggle functionality
* C++ refactoring + simulation prototype Hop3112023-04-23-242/+320
|
* Added basic outlines of Canadian provinces + territories ClarkeCode2023-04-20-3/+33
|
* Double-click a start date to automatically start a game session ClarkeCode2023-04-18-0/+6
|
* Added music player control to GameSession ClarkeCode2023-04-18-1/+13
|
* Added game speed panel to GameSession ClarkeCode2023-04-18-1/+76
|
* Merge pull request #88 from OpenVic2Project/map-drawing Hop3112023-04-18-95/+748
|\ | | | | Further Map Stuff
| * Better province image + terrain + some buttons Hop3112023-04-18-95/+748
| |
* | Removing TestSingleton ClarkeCode2023-04-17-2/+0
|/ | | | Extracted game advancement behaviour to separate class
* Add minimap for terrain map Gone2Daly2023-04-14-68/+386
| | | | | | | | | | With accurate viewport shape display on minimap With Mapmode management With Region mapmode With Province mapmode With Index mapmode With Minimap single-click movement With Minimap drag-click movement
* Add terrain map Hop3112023-04-14-12/+462
| | | | | | | | | | | | With Directional movement using WASD With Directional movement using arrow keys With Click-Drag movement using middle mouse button With Province identifiers With Province shape loading With Province rendering With Province selection With Province overview panel With Color lookup texture
* Logo on Mainmenu + icon imports + whitespace cleanup (#82) Hop3112023-04-07-11/+3239
| | | | | | | * Whitespace cleanup * Icon import files * Logo on main menu.
* 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
|
* 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
generated by our cgit fork (git 2.39.0) at 2024-01-23 02:24:14 +0100