oier/gymkhana-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Added sound management in savegames and load games. (#337)

Browse Source 
Fixes #300
Fix crash on loading game when the saved position was a float while teleport_pos command needs integers.
Fix pause menu missing in simplemouse-ui, causing a crash when calling pause menu.
Co-authored-by: StraToN <StraToN@users.noreply.github.com>
This commit is contained in:
Julian Murgia
2021-07-29 14:22:42 +02:00
committed by GitHub
parent 2c8107964c
commit f2991c30c7
10 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
addons/escoria-ui-simplemouse/game.gd
View File

@@ -123,15 +123,32 @@ func open_inventory():
func close_inventory():
$ui/inventory_layer/inventory_ui/inventory_button.close_inventory()
func mousewheel_action(direction: int):
$ui/verbs_layer/verbs_menu.iterate_actions_cursor(direction)
func hide_ui():
$ui/inventory_layer/inventory_ui.hide()
func show_ui():
$ui/inventory_layer/inventory_ui.show()
func _on_event_done(event_name: String):
escoria.action_manager.clear_current_action()
$ui/verbs_layer/verbs_menu.clear_tool_texture()
func pause_game():
if $ui/pause_menu.visible:
$ui/pause_menu.hide()
escoria.main.current_scene.game.get_node("camera").current = true
escoria.main.current_scene.game.show_ui()
escoria.main.current_scene.show()
else:
$ui/pause_menu.show()
escoria.main.current_scene.game.get_node("camera").current = false
escoria.main.current_scene.game.hide_ui()
escoria.main.current_scene.hide()

6
addons/escoria-ui-simplemouse/game.tscn
View File

@@ -1,4 +1,4 @@
[gd_scene load_steps=8 format=2]
[gd_scene load_steps=9 format=2]
[ext_resource path="res://addons/escoria-ui-simplemouse/inventory/inventory_ui.tscn" type="PackedScene" id=1]
[ext_resource path="res://addons/escoria-core/game/scenes/dialogs/dialog_player.tscn" type="PackedScene" id=2]
@@ -7,6 +7,7 @@
[ext_resource path="res://addons/escoria-ui-simplemouse/game.gd" type="Script" id=5]
[ext_resource path="res://addons/escoria-ui-simplemouse/tooltip/target_tooltip.tscn" type="PackedScene" id=6]
[ext_resource path="res://game/ui/commons/room_select.tscn" type="PackedScene" id=7]
[ext_resource path="res://game/ui/commons/pause_menu/pause_menu.tscn" type="PackedScene" id=8]
[node name="game" type="Node2D"]
script = ExtResource( 5 )
@@ -51,4 +52,7 @@ margin_top = 751.323
margin_right = 138.51
margin_bottom = 791.324
[node name="pause_menu" parent="ui" instance=ExtResource( 8 )]
visible = false
[node name="camera" parent="." instance=ExtResource( 3 )]