fish-cannard/border-wars
fish-cannard/border-wars
5
3
Fork 0
generated from tipragot/rust
Code Issues 10 Pull requests 3 Actions Packages Projects Releases Wiki Activity

Change of file structure for scenes #38

Merged
tipragot merged 11 commits from restruct-menus into main 2024-02-10 17:26:09 +00:00
Conversation 0 Commits 11 Files changed 4 +30 -16
CoCo_Sol commented 2024-02-10 16:11:40 +00:00
Owner
Copy link
No description provided.
CoCo_Sol added this to the Gameplay milestone 2024-02-10 16:11:40 +00:00
CoCo_Sol added the
Kind/Enhancement
 label 2024-02-10 16:11:40 +00:00
CoCo_Sol self-assigned this 2024-02-10 16:11:40 +00:00
CoCo_Sol added 1 commit 2024-02-10 16:11:41 +00:00
Change structure of files
Some checks failed
Rust Checks / checks (push) Failing after 9s
Details
Rust Checks / checks (pull_request) Failing after 6s
Details
b69672356a
CoCo_Sol requested review from tipragot 2024-02-10 16:12:05 +00:00
CoCo_Sol added 1 commit 2024-02-10 16:14:06 +00:00
change doc
Some checks failed
Rust Checks / checks (push) Failing after 5s
Details
Rust Checks / checks (pull_request) Failing after 5s
Details
2b6e96c3d3
CoCo_Sol added 1 commit 2024-02-10 16:18:53 +00:00
Fix fmt
All checks were successful
Rust Checks / checks (push) Successful in 1m7s
Details
Rust Checks / checks (pull_request) Successful in 1m3s
Details
c0bcf1ad70
tipragot requested changes 2024-02-10 16:48:08 +00:00
crates/border-wars/src/lib.rs Outdated
@ -3,3 +3,3 @@
use bevy::prelude::*;
pub mod menu;
pub mod menus;
tipragot commented 2024-02-10 16:48:06 +00:00
Contributor
Copy link

I think we should call them scenes.

I think we should call them scenes.
CoCo_Sol marked this conversation as resolved
CoCo_Sol added 1 commit 2024-02-10 16:54:28 +00:00
Change naming menus to scenes
All checks were successful
Rust Checks / checks (push) Successful in 1m3s
Details
Rust Checks / checks (pull_request) Successful in 1m2s
Details
54bd32b266
tipragot changed title from Change of file structure for menus to Change of file structure for scenes 2024-02-10 16:55:20 +00:00
tipragot requested changes 2024-02-10 16:56:32 +00:00
crates/border-wars/src/scenes/mod.rs Outdated
@ -0,0 +6,4 @@
pub mod menu;
/// The plugin for all menus.
pub struct MenusPlugin;
tipragot commented 2024-02-10 16:56:29 +00:00
Contributor
Copy link

Rename this to ScenePlugin

Rename this to ScenePlugin
CoCo_Sol marked this conversation as resolved
CoCo_Sol added 1 commit 2024-02-10 16:58:10 +00:00
Change name of plugin
All checks were successful
Rust Checks / checks (push) Successful in 1m4s
Details
Rust Checks / checks (pull_request) Successful in 1m3s
Details
c8a1902d4c
CoCo_Sol requested review from tipragot 2024-02-10 17:00:32 +00:00
tipragot requested changes 2024-02-10 17:03:18 +00:00
crates/border-wars/src/scenes/menu.rs Outdated
@ -0,0 +12,4 @@
fn build(&self, app: &mut App) {
app.add_systems(
Update,
menu_ui.run_if(state_exists_and_equals(GameState::Menu)),
tipragot commented 2024-02-10 17:03:16 +00:00
Contributor
Copy link

Change GameState to CurrentScene or Scene

Change GameState to CurrentScene or Scene
CoCo_Sol marked this conversation as resolved
CoCo_Sol added 1 commit 2024-02-10 17:04:31 +00:00
Change naming of state enum
All checks were successful
Rust Checks / checks (push) Successful in 1m2s
Details
Rust Checks / checks (pull_request) Successful in 1m3s
Details
e31a420bab
CoCo_Sol requested review from tipragot 2024-02-10 17:05:53 +00:00
tipragot requested changes 2024-02-10 17:07:37 +00:00
crates/border-wars/src/scenes/mod.rs Outdated
@ -0,0 +1,15 @@
//! The file containing all menu programs.
tipragot commented 2024-02-10 17:07:35 +00:00
Contributor
Copy link

scenes not menu

scenes not menu
CoCo_Sol marked this conversation as resolved
CoCo_Sol added 1 commit 2024-02-10 17:08:34 +00:00
change doc
All checks were successful
Rust Checks / checks (push) Successful in 1m2s
Details
Rust Checks / checks (pull_request) Successful in 1m2s
Details
17119af643
CoCo_Sol requested review from tipragot 2024-02-10 17:08:41 +00:00
tipragot requested changes 2024-02-10 17:09:03 +00:00
crates/border-wars/src/lib.rs Outdated
@ -5,3 +5,3 @@
pub mod menu;
pub mod scenes;
/// The state of the game.
tipragot commented 2024-02-10 17:09:02 +00:00
Contributor
Copy link

Rename

Rename
CoCo_Sol marked this conversation as resolved
CoCo_Sol added 1 commit 2024-02-10 17:10:31 +00:00
Change naming
All checks were successful
Rust Checks / checks (push) Successful in 1m2s
Details
Rust Checks / checks (pull_request) Successful in 1m3s
Details
55440c9700
CoCo_Sol requested review from tipragot 2024-02-10 17:10:34 +00:00
tipragot requested changes 2024-02-10 17:13:25 +00:00
crates/border-wars/src/main.rs Outdated
@ -9,3 +9,2 @@
.add_plugins(DefaultPlugins)
.add_state::<GameState>()
.add_plugins(MenuPlugin)
.add_state::<CurrentScene>()
tipragot commented 2024-02-10 17:13:23 +00:00
Contributor
Copy link

Add it in the ScenesPlugin instead.

Add it in the ScenesPlugin instead.
CoCo_Sol marked this conversation as resolved
crates/border-wars/src/scenes/menu.rs Outdated
tipragot commented 2024-02-10 17:12:28 +00:00
Contributor
Copy link

If the resource is always initialized, there is no need to check for existence. Use in_state instead.

If the resource is always initialized, there is no need to check for existence. Use in_state instead.
CoCo_Sol marked this conversation as resolved
CoCo_Sol added 1 commit 2024-02-10 17:17:35 +00:00
Change init of state ressource
All checks were successful
Rust Checks / checks (push) Successful in 1m1s
Details
Rust Checks / checks (pull_request) Successful in 1m0s
Details
b025b6d9d3
CoCo_Sol requested review from tipragot 2024-02-10 17:17:57 +00:00
tipragot requested changes 2024-02-10 17:20:03 +00:00
crates/border-wars/src/scenes/menu.rs Outdated
@ -0,0 +17,4 @@
fn menu_ui(
mut ctx: EguiContexts,
mut connection_string: Local<String>,
mut next_state: ResMut<NextState<CurrentScene>>,
tipragot commented 2024-02-10 17:20:01 +00:00
Contributor
Copy link

next_scene

next_scene
CoCo_Sol marked this conversation as resolved
CoCo_Sol added 1 commit 2024-02-10 17:21:23 +00:00
Change name
All checks were successful
Rust Checks / checks (push) Successful in 1m3s
Details
Rust Checks / checks (pull_request) Successful in 1m1s
Details
601490023b
CoCo_Sol requested review from tipragot 2024-02-10 17:21:25 +00:00
CoCo_Sol added 1 commit 2024-02-10 17:23:27 +00:00
change doc
All checks were successful
Rust Checks / checks (push) Successful in 1m0s
Details
Rust Checks / checks (pull_request) Successful in 1m2s
Details
d7d4473298
tipragot approved these changes 2024-02-10 17:24:29 +00:00
tipragot approved these changes 2024-02-10 17:25:29 +00:00
tipragot merged commit 12ada59b8c into main 2024-02-10 17:26:09 +00:00
tipragot deleted branch restruct-menus 2024-02-10 17:26:15 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
tipragot
Labels
Clear labels   
Kind/Breaking

Breaking change that won't be backward compatible

  
Kind/Bug

Something is not working

  
Kind/Documentation

Documentation changes

  
Kind/Enhancement

Improve existing functionality

  
Kind/Feature

New functionality

  
Kind/Fix

Fix an issue

  
Kind/Security

This is security issue

  
Kind/Testing

Issue or pull request related to testing

No labels
Kind/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Fix
Kind/Security
Kind/Testing
Milestone
Clear milestone
No items
No milestone
Gameplay
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
CoCo_Sol
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: fish-cannard/border-wars#38
No description provided.
Delete branch "restruct-menus"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?