Compare commits

..

No commits in common. '0cdaa09dc811c9c2cc8344d124acd319befdc243' and 'a92c5112e7f3fcd8d751b2d6f2d28eb3447cc874' have entirely different histories.

3
.gitignore vendored

@ -43,6 +43,3 @@ AppRun
*.zip *.zip
*.tar.gz *.tar.gz
.DirIcon .DirIcon
# Windows build files
*.exe

@ -1,6 +1,6 @@
[Desktop Entry] [Desktop Entry]
Name=MartianChess Name=MartianChess
Exec=MartianChess Exec=martian-chess
Icon=MartianChess Icon=martian-chess
Type=Application Type=Application
Categories=Game;BoardGame; Categories=Game;BoardGame;

@ -1,3 +1,3 @@
#!/usr/bin/env bash #!/usr/bin/env bash
cp media/MartianChess.png platforms/linux/MartianChess.AppDir/MartianChess.png cp media/MartianChess.png platforms/linux/MartianChess.AppDir/martian-chess.png

@ -1,11 +1,9 @@
cargo build --release cargo build --release
Copy-Item -Force "./target/release/martian-chess.exe" "./target/release/MartianChess.exe"
$compress = @{ $compress = @{
Path = "./target/release/MartianChess.exe", "./fmod_vc.lib", "./fmodstudio_vc.lib", "fmodstudio.dll", "fmod.dll", "./assets" Path = "./target/release/martian-chess.exe", "./fmod_vc.lib", "./fmodstudio_vc.lib", "fmodstudio.dll", "fmod.dll", "./assets"
CompressionLevel = "Optimal" CompressionLevel = "Optimal"
DestinationPath = "./packages/MartianChess-windows.zip" DestinationPath = "./martian-chess-beta.zip"
} }
Compress-Archive @compress Compress-Archive @compress

@ -173,7 +173,7 @@ impl Plugin for Display3dPlugin {
fade_title.run_if(any_with_component::<Fading>), fade_title.run_if(any_with_component::<Fading>),
continue_title continue_title
.run_if(in_state(GameState::Title)) .run_if(in_state(GameState::Title))
.run_if(can_continue_title) .run_if(not(any_with_component::<Fading>))
.run_if(just_pressed(KeyCode::Enter).or_else(just_pressed(MouseButton::Left))), .run_if(just_pressed(KeyCode::Enter).or_else(just_pressed(MouseButton::Left))),
), ),
); );
@ -1231,22 +1231,6 @@ fn monitor_animations(
}); });
} }
fn can_continue_title(
query: Query<&Fading>,
) -> bool {
if query.is_empty() {
true
} else {
query.iter().all(|fading| {
match fading {
Fading::In(s) | Fading::Out(s) => {
*s >= 1.0
}
}
})
}
}
fn continue_title(mut next_state: ResMut<NextState<GameState>>) { fn continue_title(mut next_state: ResMut<NextState<GameState>>) {
next_state.set(GameState::Play) next_state.set(GameState::Play)
} }

Loading…
Cancel
Save