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

merge fix

Browse Source
This commit is contained in:
Oier Bravo
2025-01-24 01:06:21 +01:00
parent 42bae89496
commit 95b7a8aa2a
5 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
addons/escoria-core
View File

@@ -1 +1 @@
../../escoria-demo-game/addons/escoria-core
../../escoria-demo-game-new-interpreter-and-savegames/addons/escoria-core

12
addons/escoria-ui-return-monkey-island-dialog-simple/theme.tres
View File

@@ -1,11 +1,11 @@
[gd_resource type="Theme" load_steps=3 format=2]
[gd_resource type="Theme" load_steps=3 format=3 uid="uid://dvwfrnya2nhxu"]
[ext_resource path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres" type="FontFile" id=1]
[ext_resource type="FontFile" path="res://addons/escoria-ui-return-monkey-island/fonts/caslonantique.tres" id="1"]
[sub_resource type="StyleBoxFlat" id=1]
[sub_resource type="StyleBoxFlat" id="1"]
content_margin_left = 5.0
content_margin_right = 5.0
content_margin_top = 5.0
content_margin_right = 5.0
content_margin_bottom = 5.0
bg_color = Color(0, 0, 0, 0.815686)
corner_radius_top_left = 8
@@ -14,6 +14,6 @@ corner_radius_bottom_right = 8
corner_radius_bottom_left = 8
[resource]
default_font = ExtResource( 1 )
RichTextLabel/styles/normal = SubResource( 1 )
default_font = ExtResource("1")
RichTextLabel/styles/normal = SubResource("1")
VBoxContainer/constants/separation = 1

1
addons/escoria-ui-return-monkey-island/esc_player_with_tooltip.gd
View File

@@ -16,6 +16,7 @@ func _init():
# Ready function
func _ready():
super._ready()
if selectable:
super._ready()
else:

8
addons/escoria-ui-return-monkey-island/overrides/esc_object_manager.gd
View File

@@ -460,10 +460,10 @@ func save_game(p_savegame: ESCSaveGame) -> void:
func get_start_location() -> ESCLocation:
if _room_exists(current_room_key):
for object in _get_room_objects_objects(current_room_key).values():
if is_instance_valid(object.node):
var loc := object.node as ESCLocation
if loc and loc.is_start_location:
return loc
if is_instance_valid(object.node) \
and object.node is ESCLocation \
and object.node.is_start_location:
return object.node
escoria.logger.warn(
self,

6
default_env.tres
View File

@@ -1,7 +1,7 @@
[gd_resource type="Environment" load_steps=2 format=2]
[gd_resource type="Environment" load_steps=2 format=3 uid="uid://b826eo66vqyyg"]
[sub_resource type="Sky" id=1]
[sub_resource type="Sky" id="1"]
[resource]
background_mode = 2
background_sky = SubResource( 1 )
sky = SubResource("1")