diff --git a/.gitignore b/.gitignore index e0b51db7..2b039c25 100644 --- a/.gitignore +++ b/.gitignore @@ -18,4 +18,5 @@ mono_crash.*.json # System/tool-specific ignores .directory +.DS_Store *~ diff --git a/2d/platformer/assets/art/background/cloud_1.png.import b/2d/platformer/assets/art/background/cloud_1.png.import index 720169ee..d545c21b 100644 --- a/2d/platformer/assets/art/background/cloud_1.png.import +++ b/2d/platformer/assets/art/background/cloud_1.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/background/cloud_2.png.import b/2d/platformer/assets/art/background/cloud_2.png.import index 7fa52aad..d95c90b4 100644 --- a/2d/platformer/assets/art/background/cloud_2.png.import +++ b/2d/platformer/assets/art/background/cloud_2.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/background/cloud_3.png.import b/2d/platformer/assets/art/background/cloud_3.png.import index 67c7f71c..5ac175c0 100644 --- a/2d/platformer/assets/art/background/cloud_3.png.import +++ b/2d/platformer/assets/art/background/cloud_3.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/background/distant_platforms_1.png.import b/2d/platformer/assets/art/background/distant_platforms_1.png.import index 8abeb3a7..b2ddebbc 100644 --- a/2d/platformer/assets/art/background/distant_platforms_1.png.import +++ b/2d/platformer/assets/art/background/distant_platforms_1.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/background/distant_platforms_2.png.import b/2d/platformer/assets/art/background/distant_platforms_2.png.import index 35996cd4..19eedbb9 100644 --- a/2d/platformer/assets/art/background/distant_platforms_2.png.import +++ b/2d/platformer/assets/art/background/distant_platforms_2.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/background/sky.png.import b/2d/platformer/assets/art/background/sky.png.import index 883b852b..1254830e 100644 --- a/2d/platformer/assets/art/background/sky.png.import +++ b/2d/platformer/assets/art/background/sky.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/coin/coin.png.import b/2d/platformer/assets/art/coin/coin.png.import index 6efc0524..3368a92f 100644 --- a/2d/platformer/assets/art/coin/coin.png.import +++ b/2d/platformer/assets/art/coin/coin.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/enemy/enemy.png.import b/2d/platformer/assets/art/enemy/enemy.png.import index e8eb575f..33d87621 100644 --- a/2d/platformer/assets/art/enemy/enemy.png.import +++ b/2d/platformer/assets/art/enemy/enemy.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/platforms/moving_platform.png.import b/2d/platformer/assets/art/platforms/moving_platform.png.import index 950a735e..877ff8fa 100644 --- a/2d/platformer/assets/art/platforms/moving_platform.png.import +++ b/2d/platformer/assets/art/platforms/moving_platform.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/platforms/one_way_platform.png.import b/2d/platformer/assets/art/platforms/one_way_platform.png.import index a9cc95bd..3cee370d 100644 --- a/2d/platformer/assets/art/platforms/one_way_platform.png.import +++ b/2d/platformer/assets/art/platforms/one_way_platform.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/player/bullet/bullet.png.import b/2d/platformer/assets/art/player/bullet/bullet.png.import index 88e81238..3bdeecfa 100644 --- a/2d/platformer/assets/art/player/bullet/bullet.png.import +++ b/2d/platformer/assets/art/player/bullet/bullet.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/player/robot_demo.png.import b/2d/platformer/assets/art/player/robot_demo.png.import index ef857221..f17d7ff1 100644 --- a/2d/platformer/assets/art/player/robot_demo.png.import +++ b/2d/platformer/assets/art/player/robot_demo.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/tileset/tiles_demo.png.import b/2d/platformer/assets/art/tileset/tiles_demo.png.import index 690a20c4..ec71324a 100644 --- a/2d/platformer/assets/art/tileset/tiles_demo.png.import +++ b/2d/platformer/assets/art/tileset/tiles_demo.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/ui/touch_button_fire.png.import b/2d/platformer/assets/art/ui/touch_button_fire.png.import index b1faa251..685bebca 100644 --- a/2d/platformer/assets/art/ui/touch_button_fire.png.import +++ b/2d/platformer/assets/art/ui/touch_button_fire.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/ui/touch_button_jump.png.import b/2d/platformer/assets/art/ui/touch_button_jump.png.import index cd9d6659..fadfe130 100644 --- a/2d/platformer/assets/art/ui/touch_button_jump.png.import +++ b/2d/platformer/assets/art/ui/touch_button_jump.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/ui/touch_button_left.png.import b/2d/platformer/assets/art/ui/touch_button_left.png.import index 720a79db..4bcee90d 100644 --- a/2d/platformer/assets/art/ui/touch_button_left.png.import +++ b/2d/platformer/assets/art/ui/touch_button_left.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/assets/art/ui/touch_button_right.png.import b/2d/platformer/assets/art/ui/touch_button_right.png.import index 157b3001..5629f074 100644 --- a/2d/platformer/assets/art/ui/touch_button_right.png.import +++ b/2d/platformer/assets/art/ui/touch_button_right.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/icon.png.import b/2d/platformer/icon.png.import index c16cdbaf..eb3cdb60 100644 --- a/2d/platformer/icon.png.import +++ b/2d/platformer/icon.png.import @@ -28,6 +28,7 @@ process/fix_alpha_border=true process/premult_alpha=false process/HDR_as_SRGB=false process/invert_color=false +process/normal_map_invert_y=false stream=false size_limit=0 detect_3d=false diff --git a/2d/platformer/src/Actors/Player.gd b/2d/platformer/src/Actors/Player.gd index b9b2d3f3..9265adc6 100644 --- a/2d/platformer/src/Actors/Player.gd +++ b/2d/platformer/src/Actors/Player.gd @@ -22,10 +22,14 @@ func _ready(): var camera: Camera2D = $Camera if action_suffix == "_p1": camera.custom_viewport = $"../.." + yield(get_tree(), "idle_frame") + camera.make_current() elif action_suffix == "_p2": - var viewport: Viewport = $"../../../../ViewportContainer2/Viewport" + var viewport: Viewport = $"../../../../ViewportContainer2/Viewport2" viewport.world_2d = ($"../.." as Viewport).world_2d camera.custom_viewport = viewport + yield(get_tree(), "idle_frame") + camera.make_current() # Physics process is a built-in loop in Godot. diff --git a/2d/platformer/src/Main/Splitscreen.tscn b/2d/platformer/src/Main/Splitscreen.tscn index 29009127..3c7e9a41 100644 --- a/2d/platformer/src/Main/Splitscreen.tscn +++ b/2d/platformer/src/Main/Splitscreen.tscn @@ -40,7 +40,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Viewport" type="Viewport" parent="Black/SplitContainer/ViewportContainer1"] +[node name="Viewport1" type="Viewport" parent="Black/SplitContainer/ViewportContainer1"] size = Vector2( 394, 480 ) size_override_stretch = true handle_input_locally = false @@ -48,13 +48,13 @@ usage = 0 render_target_update_mode = 3 audio_listener_enable_2d = true -[node name="Level" parent="Black/SplitContainer/ViewportContainer1/Viewport" instance=ExtResource( 3 )] +[node name="Level" parent="Black/SplitContainer/ViewportContainer1/Viewport1" instance=ExtResource( 3 )] -[node name="Player1" parent="Black/SplitContainer/ViewportContainer1/Viewport/Level" instance=ExtResource( 4 )] +[node name="Player1" parent="Black/SplitContainer/ViewportContainer1/Viewport1/Level" instance=ExtResource( 4 )] position = Vector2( 90, 546 ) action_suffix = "_p1" -[node name="Player2" parent="Black/SplitContainer/ViewportContainer1/Viewport/Level" instance=ExtResource( 4 )] +[node name="Player2" parent="Black/SplitContainer/ViewportContainer1/Viewport1/Level" instance=ExtResource( 4 )] position = Vector2( 120, 546 ) action_suffix = "_p2" @@ -69,7 +69,7 @@ __meta__ = { "_edit_use_anchors_": false } -[node name="Viewport" type="Viewport" parent="Black/SplitContainer/ViewportContainer2"] +[node name="Viewport2" type="Viewport" parent="Black/SplitContainer/ViewportContainer2"] size = Vector2( 394, 480 ) size_override_stretch = true handle_input_locally = false @@ -77,4 +77,4 @@ usage = 0 render_target_update_mode = 3 audio_listener_enable_2d = true -[node name="ParallaxBackground" parent="Black/SplitContainer/ViewportContainer2/Viewport" instance=ExtResource( 5 )] +[node name="ParallaxBackground" parent="Black/SplitContainer/ViewportContainer2/Viewport2" instance=ExtResource( 5 )] diff --git a/2d/platformer/src/UserInterface/CoinsCounter.gd b/2d/platformer/src/UserInterface/CoinsCounter.gd index cff9fc47..cf3f76ab 100644 --- a/2d/platformer/src/UserInterface/CoinsCounter.gd +++ b/2d/platformer/src/UserInterface/CoinsCounter.gd @@ -12,7 +12,7 @@ func _ready(): anim_sprite.play() # Check if the game is in splitscreen mode by checking the scene root name. if get_tree().get_root().get_child(0).name == "Splitscreen": - var _level_node = get_node(@"../../../../Black/SplitContainer/ViewportContainer1/Viewport/Level") + var _level_node = get_node(@"../../../../Black/SplitContainer/ViewportContainer1/Viewport1/Level") _level_node.get_node("Player1").connect("collect_coin", self, "_collect_coin") _level_node.get_node("Player2").connect("collect_coin", self, "_collect_coin") else: diff --git a/3d/global_illumination/icon.png b/3d/global_illumination/icon.png index c98fbb60..84e29858 100644 Binary files a/3d/global_illumination/icon.png and b/3d/global_illumination/icon.png differ diff --git a/3d/kinematic_character/level.tscn b/3d/kinematic_character/level.tscn index b39cffe2..36018da5 100644 --- a/3d/kinematic_character/level.tscn +++ b/3d/kinematic_character/level.tscn @@ -79,6 +79,7 @@ input_capture_on_drag = true [node name="Mesh" type="MeshInstance" parent="Elevator1"] mesh = ExtResource( 3 ) +material/0 = null [node name="CollisionShape" type="CollisionShape" parent="Elevator1"] shape = SubResource( 1 ) @@ -93,6 +94,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -3.5, 8.5, 4.5 ) [node name="Mesh" type="MeshInstance" parent="Elevator2"] mesh = ExtResource( 3 ) +material/0 = null [node name="CollisionShape" type="CollisionShape" parent="Elevator2"] shape = SubResource( 1 )