Merged
Conversation
There was a problem hiding this comment.
Pull Request Overview
This PR introduces a basic modal system for displaying error messages in the game client, particularly when connection to the authoritative server fails. The changes include creating reusable modal UI components and integrating them into the authentication flow.
Key Changes:
- Created a reusable modal UI system with a basic text modal template
- Integrated a "couldn't connect" modal that displays when authentication fails
- Updated the main menu to use Control instead of Node2D for proper UI layout
Reviewed Changes
Copilot reviewed 14 out of 14 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| game/scripts/menus/mainmenu.gd | Changed base type from Node2D to Control for proper UI handling |
| game/scripts/authoritative/AuthoritativeServerConnection.cs | Added modal instantiation and display logic on authentication failure |
| game/scenes/modal/specialised/couldnt_connect_modal.tscn | Created specialized modal scene for connection errors |
| game/scenes/modal/basic_text_modal.tscn | Created reusable modal template with header, content, and dismiss button |
| game/scenes/modal/basic_text_modal.gd | Implemented dismiss functionality for modal |
| game/scenes/modal/header_theme.tres | Created theme resource for modal headers |
| game/scenes/connecting_menu/content_theme.tres | Created theme resource for modal content |
| game/scenes/connecting_menu/connecting_menu.tscn | Updated to use Control type and adjusted layout properties |
| game/project.godot | Fixed path to main scene file |
| game/models/player/eform_0.png.import | Removed etc2 texture format from import settings |
| game/models/player/eform_1.png.import | Removed etc2 texture format from import settings |
| README.md | Added license notice and improved formatting |
| LICENSE | Added comprehensive proprietary license terms |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.