Skip to content

Commit

Permalink
Merge pull request #1 from Woynert/feat/godot-4.3
Browse files Browse the repository at this point in the history
feat: Godot 4.3 and bug fixing
  • Loading branch information
Woynert authored Aug 17, 2024
2 parents de575ee + 1396cda commit d0ce693
Show file tree
Hide file tree
Showing 45 changed files with 387 additions and 243 deletions.
29 changes: 17 additions & 12 deletions project.godot
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ config_version=5

config/name="Globalgamejam2024"
run/main_scene="res://src/level/root.tscn"
config/features=PackedStringArray("4.2", "GL Compatibility")
config/features=PackedStringArray("4.3", "GL Compatibility")
config/icon="res://icon.png"

[autoload]
Expand All @@ -33,27 +33,27 @@ enabled=PackedStringArray("res://addons/AS2P/plugin.cfg")

game_up={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":87,"physical_keycode":0,"key_label":0,"unicode":119,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":87,"physical_keycode":0,"key_label":0,"unicode":119,"location":0,"echo":false,"script":null)
]
}
game_down={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":83,"physical_keycode":0,"key_label":0,"unicode":115,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":83,"physical_keycode":0,"key_label":0,"unicode":115,"location":0,"echo":false,"script":null)
]
}
game_left={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":65,"physical_keycode":0,"key_label":0,"unicode":97,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":65,"physical_keycode":0,"key_label":0,"unicode":97,"location":0,"echo":false,"script":null)
]
}
game_right={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":68,"physical_keycode":0,"key_label":0,"unicode":100,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":68,"physical_keycode":0,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null)
]
}
game_pickup={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":69,"physical_keycode":0,"key_label":0,"unicode":101,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":69,"physical_keycode":0,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null)
]
}
game_hand_trick_a={
Expand All @@ -68,27 +68,32 @@ game_hand_trick_b={
}
game_unmount_monocycle={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194325,"physical_keycode":0,"key_label":0,"unicode":0,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":4194325,"physical_keycode":0,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
]
}
debug_1={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"key_label":0,"unicode":49,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"key_label":0,"unicode":49,"location":0,"echo":false,"script":null)
]
}
debug_2={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":50,"key_label":0,"unicode":50,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":50,"key_label":0,"unicode":50,"location":0,"echo":false,"script":null)
]
}
debug_3={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"key_label":0,"unicode":51,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"key_label":0,"unicode":51,"location":0,"echo":false,"script":null)
]
}
debug_4={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":52,"key_label":0,"unicode":52,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":52,"key_label":0,"unicode":52,"location":0,"echo":false,"script":null)
]
}
debug_5={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":53,"key_label":0,"unicode":53,"location":0,"echo":false,"script":null)
]
}
game_mouse_left={
Expand All @@ -98,7 +103,7 @@ game_mouse_left={
}
debug_switch={
"deadzone": 0.5,
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"echo":false,"script":null)
"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194325,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null)
]
}

Expand Down
Binary file modified resource_remote/Good Ending Retirement.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 0 additions & 19 deletions resource_remote/audio/Circus Ambient 1.mp3.import

This file was deleted.

19 changes: 0 additions & 19 deletions resource_remote/audio/Escena Circus Cuerda.mp3.import

This file was deleted.

19 changes: 0 additions & 19 deletions resource_remote/audio/Escena Circus Intro.mp3.import

This file was deleted.

19 changes: 0 additions & 19 deletions resource_remote/audio/Escena Circus Playful.mp3.import

This file was deleted.

19 changes: 0 additions & 19 deletions resource_remote/audio/Escena Circus Tiburones.mp3.import

This file was deleted.

19 changes: 0 additions & 19 deletions resource_remote/audio/Escena Trompeta Circus.mp3.import

This file was deleted.

19 changes: 0 additions & 19 deletions resource_remote/audio/Final Cambio Profesion.mp3.import

This file was deleted.

19 changes: 0 additions & 19 deletions resource_remote/audio/Final Triste Pobreza.mp3.import

This file was deleted.

19 changes: 0 additions & 19 deletions resource_remote/audio/Final Willy Boat completo.mp3.import

This file was deleted.

File renamed without changes.
19 changes: 19 additions & 0 deletions resource_remote/audio/music/Circus Ambient 1.mp3.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://7cm0hrscaws8"
path="res://.godot/imported/Circus Ambient 1.mp3-ee506d3e478f914e9b0c853e2c4658aa.mp3str"

[deps]

source_file="res://resource_remote/audio/music/Circus Ambient 1.mp3"
dest_files=["res://.godot/imported/Circus Ambient 1.mp3-ee506d3e478f914e9b0c853e2c4658aa.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 19 additions & 0 deletions resource_remote/audio/music/Escena Circus Cuerda.mp3.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://brwpnbbn6tpew"
path="res://.godot/imported/Escena Circus Cuerda.mp3-429f7e09ad15ab85b9f4f6bd5fff9892.mp3str"

[deps]

source_file="res://resource_remote/audio/music/Escena Circus Cuerda.mp3"
dest_files=["res://.godot/imported/Escena Circus Cuerda.mp3-429f7e09ad15ab85b9f4f6bd5fff9892.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 19 additions & 0 deletions resource_remote/audio/music/Escena Circus Intro.mp3.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://dk4snv3qu8phc"
path="res://.godot/imported/Escena Circus Intro.mp3-60c3989e5c2cea74b5dd3f69bfd12bc6.mp3str"

[deps]

source_file="res://resource_remote/audio/music/Escena Circus Intro.mp3"
dest_files=["res://.godot/imported/Escena Circus Intro.mp3-60c3989e5c2cea74b5dd3f69bfd12bc6.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 19 additions & 0 deletions resource_remote/audio/music/Escena Circus Playful.mp3.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://ce53es5dop87"
path="res://.godot/imported/Escena Circus Playful.mp3-0908dff9b3b8c504cf313560374065a3.mp3str"

[deps]

source_file="res://resource_remote/audio/music/Escena Circus Playful.mp3"
dest_files=["res://.godot/imported/Escena Circus Playful.mp3-0908dff9b3b8c504cf313560374065a3.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 19 additions & 0 deletions resource_remote/audio/music/Escena Circus Tiburones.mp3.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://f7w4jyj7qtwg"
path="res://.godot/imported/Escena Circus Tiburones.mp3-449c1910f500faebdf539a68be77d2d3.mp3str"

[deps]

source_file="res://resource_remote/audio/music/Escena Circus Tiburones.mp3"
dest_files=["res://.godot/imported/Escena Circus Tiburones.mp3-449c1910f500faebdf539a68be77d2d3.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
19 changes: 19 additions & 0 deletions resource_remote/audio/music/Escena Trompeta Circus.mp3.import
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[remap]

importer="mp3"
type="AudioStreamMP3"
uid="uid://bp41xb28lqvc3"
path="res://.godot/imported/Escena Trompeta Circus.mp3-c2ae8c3641fd2009f96e183c66b2f4da.mp3str"

[deps]

source_file="res://resource_remote/audio/music/Escena Trompeta Circus.mp3"
dest_files=["res://.godot/imported/Escena Trompeta Circus.mp3-c2ae8c3641fd2009f96e183c66b2f4da.mp3str"]

[params]

loop=false
loop_offset=0
bpm=0
beat_count=0
bar_beats=4
Loading

0 comments on commit d0ce693

Please sign in to comment.