Merge pull request #40 from miketvo/dev

[p0ng-bugfix] Game Over UI menu not working properly
miketvo · Aug 7, 2024 · ba78ec2 · ba78ec2
2 parents d31d985 + 70bccf7
commit ba78ec2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/.github/workflows/export-debug.yml b/.github/workflows/export-debug.yml
@@ -7,6 +7,9 @@ on:
       - synchronize
     branches:
       - dev
+  push:
+    tags:
+      - '*'
 
 env:
   GODOT_VERSION: 4.2.2

diff --git a/.github/workflows/export-release.yml b/.github/workflows/export-release.yml
@@ -7,6 +7,10 @@ on:
       - synchronize
     branches:
       - main
+      - dev
+  push:
+    tags:
+      - '*'
 
 env:
   GODOT_VERSION: 4.2.2

diff --git a/p0ng/project.godot b/p0ng/project.godot
@@ -11,7 +11,7 @@ config_version=5
 [application]
 
 config/name="p0ng"
-config/version="1.1.3"
+config/version="1.1.4"
 run/main_scene="res://scenes/main.tscn"
 config/use_custom_user_dir=true
 config/custom_user_dir_name="ambientlamp/p0ng"

diff --git a/p0ng/scripts/scenes/game/game.gd b/p0ng/scripts/scenes/game/game.gd
@@ -53,10 +53,8 @@ func _ready() -> void:
 
 
 func _process(_delta: float) -> void:
-    _game_hud.update_score_labels(left_score, right_score, _game_point_state)
-    if _game_over:
-        _game_ui.game_over(winner)
-        pause()
+    if not _game_over:
+        _game_hud.update_score_labels(left_score, right_score, _game_point_state)
 
 
 func _physics_process(delta: float) -> void:
@@ -333,6 +331,8 @@ func _win_round(winning_side: int) -> void:
 func _win_game(winning_side: int) -> void:
     winner = winning_side
     _sfx_controller.play_sound("GameEndSfx")
+    _game_ui.game_over(winner)
     _game_over = true
+    pause()
 #endregion
 # ============================================================================ #
diff --git a/p0ng/scripts/scenes/game/game_ui.gd b/p0ng/scripts/scenes/game/game_ui.gd
@@ -57,6 +57,7 @@ func _ready() -> void:
         child.connect("pressed", _on_ui_scene_changer_button_pressed)
 
     _endgame_dialog.modulate = Color(1.0, 1.0, 1.0, 0.0)
+    _endgame_dialog.visible = false
     _win_label[Global.SIDE_LEFT].hide()
     _win_label[Global.SIDE_RIGHT].hide()
     _lose_label[Global.SIDE_LEFT].hide()
@@ -103,6 +104,7 @@ func game_over(winning_side: int) -> void:
         _:
             assert(false, "Unrecognized side")
 
+    _endgame_dialog.visible = true
     _endgame_dialog.get_node("MenuContainer/VBoxContainer/RestartButton").grab_focus()
     tween_transition_fade_appear_container(
             _endgame_dialog,
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,9 @@ on: @@
           - synchronize
         branches:
           - dev
+      push:
+        tags:
+          - '*'
     env:
       GODOT_VERSION: 4.2.2
@@ Expand Down @@