Browse Source

Merge pull request #328 from t-karcher/patch-1

More projects converted to and tested with Godot 3.1
Rémi Verschelde 6 years ago
parent
commit
61c03933e4
82 changed files with 543 additions and 2388 deletions
  1. 1 1
      2d/role_playing_game/Game.gd
  2. 6 37
      2d/role_playing_game/Game.tscn
  3. 0 86
      2d/role_playing_game/default_env.tres
  4. 3 3
      2d/role_playing_game/grid_movement/grid/Grid.gd
  5. 1 1
      2d/role_playing_game/grid_movement/pawns/Pawn.gd
  6. 5 0
      2d/role_playing_game/grid_movement/pawns/character.png.import
  7. 5 0
      2d/role_playing_game/grid_movement/pawns/sprite.png.import
  8. 5 0
      2d/role_playing_game/grid_movement/tilesets/grid/actor.png.import
  9. 5 0
      2d/role_playing_game/grid_movement/tilesets/grid/object.png.import
  10. 5 0
      2d/role_playing_game/grid_movement/tilesets/grid/obstacle.png.import
  11. 5 0
      2d/role_playing_game/grid_movement/tilesets/grid_lines/grid_lines.png.import
  12. 5 0
      2d/role_playing_game/icon.png.import
  13. 5 0
      2d/role_playing_game/icon.svg.import
  14. 6 1
      2d/role_playing_game/project.godot
  15. 5 0
      2d/role_playing_game/screens/combat/actors/sprites/blue.png.import
  16. 5 0
      2d/role_playing_game/screens/combat/actors/sprites/green.png.import
  17. 5 0
      2d/role_playing_game/screens/combat/actors/sprites/shadow.png.import
  18. 1 16
      2d/role_playing_game/screens/exploration/Exploration.tscn
  19. 5 0
      2d/role_playing_game/theme/button/button_rect.png.import
  20. 5 0
      2d/role_playing_game/theme/button/button_rect_pressed.png.import
  21. 5 0
      2d/role_playing_game/theme/panel/panel_rect.png.import
  22. 5 0
      2d/role_playing_game/theme/progressbar/background.png.import
  23. 5 0
      2d/role_playing_game/theme/progressbar/foreground_blue.png.import
  24. 5 0
      2d/role_playing_game/theme/progressbar/foreground_red.png.import
  25. 0 68
      2d/role_playing_game/theme/theme.tres
  26. 5 0
      2d/role_playing_game/turn_combat/combatants/sprites/blue.png.import
  27. 5 0
      2d/role_playing_game/turn_combat/combatants/sprites/green.png.import
  28. 5 0
      2d/role_playing_game/turn_combat/combatants/sprites/shadow.png.import
  29. 0 1
      2d/role_playing_game/turn_combat/turn_queue/TurnQueue.gd
  30. 6 3
      3d/ik/addons/sade/editor_gizmo_texture.png.import
  31. 5 3
      3d/ik/addons/sade/ik_fabrik.png.import
  32. 1 2
      3d/ik/addons/sade/ik_look_at.gd
  33. 5 3
      3d/ik/addons/sade/ik_look_at.png.import
  34. 0 86
      3d/ik/default_env.tres
  35. 38 434
      3d/ik/fabrik_ik.tscn
  36. 102 981
      3d/ik/fps_example.tscn
  37. 0 3
      3d/ik/godot_battle_bot.dae.import
  38. 6 3
      3d/ik/godot_battle_bot_colors.png.import
  39. 6 3
      3d/ik/godot_battle_bot_emission.png.import
  40. 6 3
      3d/ik/gun_textures.png.import
  41. 5 3
      3d/ik/icon.png.import
  42. 13 276
      3d/ik/look_at_ik.tscn
  43. 6 1
      3d/ik/project.godot
  44. 12 97
      3d/ik/simple_bullet.tscn
  45. 0 3
      3d/ik/weapon_pistol.dae.import
  46. 7 5
      3d/navmesh/icon.png.import
  47. BIN
      3d/navmesh/navmesh.scn
  48. 11 0
      3d/navmesh/particle.png.import
  49. 6 1
      3d/navmesh/project.godot
  50. 5 3
      3d/platformer/cutout.png.import
  51. 0 15
      3d/platformer/default_bus_layout.tres
  52. 2 0
      3d/platformer/enemy.gd
  53. 5 3
      3d/platformer/icon.png.import
  54. 5 3
      3d/platformer/osb_down.png.import
  55. 5 3
      3d/platformer/osb_fire.png.import
  56. 5 3
      3d/platformer/osb_jump.png.import
  57. 5 3
      3d/platformer/osb_left.png.import
  58. 5 3
      3d/platformer/osb_right.png.import
  59. 5 3
      3d/platformer/osb_up.png.import
  60. 5 3
      3d/platformer/panorama.png.import
  61. 1 1
      3d/platformer/player.gd
  62. 82 26
      3d/platformer/project.godot
  63. 0 3
      3d/platformer/robot_walk.wav.import
  64. 6 3
      3d/platformer/shine.png.import
  65. 0 3
      3d/platformer/sound_coin.wav.import
  66. 0 3
      3d/platformer/sound_explode.wav.import
  67. 0 3
      3d/platformer/sound_hit.wav.import
  68. 0 3
      3d/platformer/sound_jump.wav.import
  69. 0 3
      3d/platformer/sound_shoot.wav.import
  70. BIN
      3d/platformer/stage.scn
  71. 5 3
      3d/platformer/texture.png.import
  72. 6 3
      3d/platformer/texturemr.png.import
  73. 6 3
      3d/truck_town/Images/cement.png.import
  74. 5 3
      3d/truck_town/Images/choose_tow.png.import
  75. 5 3
      3d/truck_town/Images/choose_trailer.png.import
  76. 5 3
      3d/truck_town/Images/choose_van.png.import
  77. 6 3
      3d/truck_town/Images/grass.png.import
  78. 4 62
      3d/truck_town/car_select.tscn
  79. 0 86
      3d/truck_town/default_env.tres
  80. 5 3
      3d/truck_town/icon.png.import
  81. 6 1
      3d/truck_town/project.godot
  82. 1 1
      README.md

+ 1 - 1
2d/role_playing_game/Game.gd

@@ -11,7 +11,7 @@ func _ready():
 	combat_screen = get_node(combat_screen)
 	combat_screen.connect("combat_finished", self, "_on_combat_finished")
 	for n in $Exploration/Grid.get_children():
-		if not n.type == n.ACTOR:
+		if not n.type == n.CELL_TYPES.ACTOR:
 			continue
 		if not n.has_node("DialoguePlayer"):
 			continue

+ 6 - 37
2d/role_playing_game/Game.tscn

@@ -5,10 +5,7 @@
 [ext_resource path="res://screens/exploration/Exploration.tscn" type="PackedScene" id=3]
 
 [sub_resource type="Animation" id=1]
-
 length = 0.5
-loop = false
-step = 0.1
 tracks/0/type = "value"
 tracks/0/path = NodePath("Transition/ColorRect:color")
 tracks/0/interp = 1
@@ -22,52 +19,24 @@ tracks/0/keys = {
 "values": [ Color( 0.0703125, 0.0703125, 0.0703125, 0 ), Color( 0.0703125, 0.0703125, 0.0703125, 1 ) ]
 }
 
-[node name="Game" type="Node" index="0"]
-
+[node name="Game" type="Node"]
 script = ExtResource( 1 )
-_sections_unfolded = [ "Pause" ]
 combat_screen = NodePath("Combat")
 exploration_screen = NodePath("Exploration")
 
-[node name="AnimationPlayer" type="AnimationPlayer" parent="." index="0"]
-
-root_node = NodePath("..")
-autoplay = ""
-playback_process_mode = 1
-playback_default_blend_time = 0.0
-playback_speed = 1.0
+[node name="AnimationPlayer" type="AnimationPlayer" parent="."]
 anims/fade = SubResource( 1 )
-blend_times = [  ]
-
-[node name="Transition" type="CanvasLayer" parent="." index="1"]
 
-layer = 1
-offset = Vector2( 0, 0 )
-rotation = 0.0
-scale = Vector2( 1, 1 )
-transform = Transform2D( 1, 0, 0, 1, 0, 0 )
+[node name="Transition" type="CanvasLayer" parent="."]
 
-[node name="ColorRect" type="ColorRect" parent="Transition" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="ColorRect" type="ColorRect" parent="Transition"]
 margin_right = 1280.0
 margin_bottom = 720.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
 mouse_filter = 1
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
 color = Color( 0.0703125, 0.0703125, 0.0703125, 0 )
-_sections_unfolded = [ "Focus", "Mouse", "Visibility" ]
-
-[node name="Combat" parent="." index="2" instance=ExtResource( 2 )]
 
+[node name="Combat" parent="." instance=ExtResource( 2 )]
 visible = false
 
-[node name="Exploration" parent="." index="3" instance=ExtResource( 3 )]
-
+[node name="Exploration" parent="." instance=ExtResource( 3 )]
 

+ 0 - 86
2d/role_playing_game/default_env.tres

@@ -1,101 +1,15 @@
 [gd_resource type="Environment" load_steps=2 format=2]
 
 [sub_resource type="ProceduralSky" id=1]
-
-radiance_size = 4
 sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
 sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
 sky_curve = 0.25
-sky_energy = 1.0
 ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
 ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
 ground_curve = 0.01
-ground_energy = 1.0
-sun_color = Color( 1, 1, 1, 1 )
-sun_latitude = 35.0
-sun_longitude = 0.0
-sun_angle_min = 1.0
-sun_angle_max = 100.0
-sun_curve = 0.05
 sun_energy = 16.0
-texture_size = 2
 
 [resource]
-
 background_mode = 2
 background_sky = SubResource( 1 )
-background_sky_custom_fov = 0.0
-background_color = Color( 0, 0, 0, 1 )
-background_energy = 1.0
-background_canvas_max_layer = 0
-ambient_light_color = Color( 0, 0, 0, 1 )
-ambient_light_energy = 1.0
-ambient_light_sky_contribution = 1.0
-fog_enabled = false
-fog_color = Color( 0.5, 0.6, 0.7, 1 )
-fog_sun_color = Color( 1, 0.9, 0.7, 1 )
-fog_sun_amount = 0.0
-fog_depth_enabled = true
-fog_depth_begin = 10.0
-fog_depth_curve = 1.0
-fog_transmit_enabled = false
-fog_transmit_curve = 1.0
-fog_height_enabled = false
-fog_height_min = 0.0
-fog_height_max = 100.0
-fog_height_curve = 1.0
-tonemap_mode = 0
-tonemap_exposure = 1.0
-tonemap_white = 1.0
-auto_exposure_enabled = false
-auto_exposure_scale = 0.4
-auto_exposure_min_luma = 0.05
-auto_exposure_max_luma = 8.0
-auto_exposure_speed = 0.5
-ss_reflections_enabled = false
-ss_reflections_max_steps = 64
-ss_reflections_fade_in = 0.15
-ss_reflections_fade_out = 2.0
-ss_reflections_depth_tolerance = 0.2
-ss_reflections_roughness = true
-ssao_enabled = false
-ssao_radius = 1.0
-ssao_intensity = 1.0
-ssao_radius2 = 0.0
-ssao_intensity2 = 1.0
-ssao_bias = 0.01
-ssao_light_affect = 0.0
-ssao_color = Color( 0, 0, 0, 1 )
-ssao_quality = 0
-ssao_blur = 3
-ssao_edge_sharpness = 4.0
-dof_blur_far_enabled = false
-dof_blur_far_distance = 10.0
-dof_blur_far_transition = 5.0
-dof_blur_far_amount = 0.1
-dof_blur_far_quality = 1
-dof_blur_near_enabled = false
-dof_blur_near_distance = 2.0
-dof_blur_near_transition = 1.0
-dof_blur_near_amount = 0.1
-dof_blur_near_quality = 1
-glow_enabled = false
-glow_levels/1 = false
-glow_levels/2 = false
-glow_levels/3 = true
-glow_levels/4 = false
-glow_levels/5 = true
-glow_levels/6 = false
-glow_levels/7 = false
-glow_intensity = 0.8
-glow_strength = 1.0
-glow_bloom = 0.0
-glow_blend_mode = 2
-glow_hdr_threshold = 1.0
-glow_hdr_scale = 2.0
-glow_bicubic_upscale = false
-adjustment_enabled = false
-adjustment_brightness = 1.0
-adjustment_contrast = 1.0
-adjustment_saturation = 1.0
 

+ 3 - 3
2d/role_playing_game/grid_movement/grid/Grid.gd

@@ -8,7 +8,7 @@ func _ready():
 		set_cellv(world_to_map(child.position), child.type)
 
 
-func get_cell_pawn(cell, type = ACTOR):
+func get_cell_pawn(cell, type = CELL_TYPES.ACTOR):
 	for node in get_children():
 		if node.type != type:
 			continue
@@ -23,10 +23,10 @@ func request_move(pawn, direction):
 	var cell_tile_id = get_cellv(cell_target)
 	match cell_tile_id:
 		-1:
-			set_cellv(cell_target, ACTOR)
+			set_cellv(cell_target, CELL_TYPES.ACTOR)
 			set_cellv(cell_start, -1)
 			return map_to_world(cell_target) + cell_size / 2
-		OBJECT, ACTOR:
+		CELL_TYPES.OBJECT, CELL_TYPES.ACTOR:
 			var target_pawn = get_cell_pawn(cell_target, cell_tile_id)
 			print("Cell %s contains %s" % [cell_target, target_pawn.name])
 			

+ 1 - 1
2d/role_playing_game/grid_movement/pawns/Pawn.gd

@@ -1,7 +1,7 @@
 extends Node2D
 
 enum CELL_TYPES { ACTOR, OBSTACLE, OBJECT }
-export(CELL_TYPES) var type = ACTOR
+export(CELL_TYPES) var type = CELL_TYPES.ACTOR
 
 var active = true setget set_active
 

+ 5 - 0
2d/role_playing_game/grid_movement/pawns/character.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/character.png-5e19af0401d52b4620fb84d898126e01.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/character.png-5e19af0401d52b4620fb84d898126e01.stex"
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/grid_movement/pawns/sprite.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/sprite.png-e28cedc69371816a3468e6325b327ece.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/sprite.png-e28cedc69371816a3468e6325b327ece.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/grid_movement/tilesets/grid/actor.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/actor.png-147dff690f83be8a2c66a5bfa83da49f.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/actor.png-147dff690f83be8a2c66a5bfa83da49f.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/grid_movement/tilesets/grid/object.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/object.png-f9ec4c5540ae154e2e73d50438312f26.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/object.png-f9ec4c5540ae154e2e73d50438312f26.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/grid_movement/tilesets/grid/obstacle.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/obstacle.png-303025fbfb0bdc414a247e8ee1624a90.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/obstacle.png-303025fbfb0bdc414a247e8ee1624a90.stex"
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/grid_movement/tilesets/grid_lines/grid_lines.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/grid_lines.png-151c8a0e38dd3f92e569d4b4f869a28e.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/grid_lines.png-151c8a0e38dd3f92e569d4b4f869a28e.stex
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/icon.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/icon.svg.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/icon.svg-218a8f2b3041327d8a5756f3a245f83b.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/icon.svg-218a8f2b3041327d8a5756f3a245f83b.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 6 - 1
2d/role_playing_game/project.godot

@@ -6,7 +6,12 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=3
+config_version=4
+
+_global_script_classes=[  ]
+_global_script_class_icons={
+
+}
 
 [application]
 

+ 5 - 0
2d/role_playing_game/screens/combat/actors/sprites/blue.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/blue.png-127e2b8d7aa8f4a7572c4923c2b20228.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/blue.png-127e2b8d7aa8f4a7572c4923c2b20228.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/screens/combat/actors/sprites/green.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/green.png-7937ec3931675b5dd0f218cbb8ae006a.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/green.png-7937ec3931675b5dd0f218cbb8ae006a.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/screens/combat/actors/sprites/shadow.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/shadow.png-3c36ca984d4b9e8eba8c422537f5ca42.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/shadow.png-3c36ca984d4b9e8eba8c422537f5ca42.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

File diff suppressed because it is too large
+ 1 - 16
2d/role_playing_game/screens/exploration/Exploration.tscn


+ 5 - 0
2d/role_playing_game/theme/button/button_rect.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/button_rect.png-50631b7139a07837e9f4856772433e8e.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/button_rect.png-50631b7139a07837e9f4856772433e8e.ste
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/theme/button/button_rect_pressed.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/button_rect_pressed.png-e5e25d3b6005d4ba5edf4354beb6dc06.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/button_rect_pressed.png-e5e25d3b6005d4ba5edf4354beb6
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/theme/panel/panel_rect.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/panel_rect.png-52b8de43da3f3ba3a0682eb789a33286.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/panel_rect.png-52b8de43da3f3ba3a0682eb789a33286.stex
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/theme/progressbar/background.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/background.png-db91f961480760b8bfa082076dc72dbd.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/background.png-db91f961480760b8bfa082076dc72dbd.stex
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/theme/progressbar/foreground_blue.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/foreground_blue.png-1208ba20a94923d82a7b0eacc6914552.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/foreground_blue.png-1208ba20a94923d82a7b0eacc6914552
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/theme/progressbar/foreground_red.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/foreground_red.png-60d00de182b78bd324a56c9f03008a15.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/foreground_red.png-60d00de182b78bd324a56c9f03008a15.
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 0 - 68
2d/role_playing_game/theme/theme.tres

@@ -9,116 +9,49 @@
 [ext_resource path="res://theme/progressbar/foreground_stylebox_red.tres" type="StyleBox" id=7]
 
 [sub_resource type="StyleBoxEmpty" id=1]
-
 resource_name = "button_focus_style"
-content_margin_left = -1.0
-content_margin_right = -1.0
-content_margin_top = -1.0
-content_margin_bottom = -1.0
-_sections_unfolded = [ "Resource" ]
 
 [sub_resource type="StyleBoxTexture" id=2]
-
-content_margin_left = -1.0
-content_margin_right = -1.0
-content_margin_top = -1.0
-content_margin_bottom = -1.0
 texture = ExtResource( 2 )
 region_rect = Rect2( 0, 0, 128, 142 )
 margin_left = 32.0
 margin_right = 32.0
 margin_top = 36.0
 margin_bottom = 43.0
-expand_margin_left = 0.0
-expand_margin_right = 0.0
-expand_margin_top = 0.0
-expand_margin_bottom = 0.0
-modulate_color = Color( 1, 1, 1, 1 )
-draw_center = true
-_sections_unfolded = [ "Axis Stretch", "Margin", "Modulate", "Resource" ]
 
 [sub_resource type="StyleBoxTexture" id=3]
-
-content_margin_left = -1.0
-content_margin_right = -1.0
-content_margin_top = -1.0
-content_margin_bottom = -1.0
 texture = ExtResource( 2 )
 region_rect = Rect2( 0, 0, 128, 142 )
 margin_left = 32.0
 margin_right = 32.0
 margin_top = 36.0
 margin_bottom = 43.0
-expand_margin_left = 0.0
-expand_margin_right = 0.0
-expand_margin_top = 0.0
-expand_margin_bottom = 0.0
-modulate_color = Color( 1, 1, 1, 1 )
-draw_center = true
-_sections_unfolded = [ "Axis Stretch", "Margin", "Modulate", "Resource" ]
 
 [sub_resource type="StyleBoxTexture" id=4]
-
-content_margin_left = -1.0
-content_margin_right = -1.0
-content_margin_top = -1.0
-content_margin_bottom = -1.0
 texture = ExtResource( 3 )
 region_rect = Rect2( 0, 0, 128, 142 )
 margin_left = 32.0
 margin_right = 32.0
 margin_top = 40.0
 margin_bottom = 32.0
-expand_margin_left = 0.0
-expand_margin_right = 0.0
-expand_margin_top = 0.0
-expand_margin_bottom = 0.0
-modulate_color = Color( 1, 1, 1, 1 )
-draw_center = true
-_sections_unfolded = [ "Axis Stretch", "Margin", "Resource" ]
 
 [sub_resource type="StyleBoxTexture" id=5]
-
-content_margin_left = -1.0
-content_margin_right = -1.0
-content_margin_top = -1.0
-content_margin_bottom = -1.0
 texture = ExtResource( 5 )
 region_rect = Rect2( 0, 0, 128, 141 )
 margin_left = 90.0
 margin_right = 90.0
 margin_top = 35.0
 margin_bottom = 45.0
-expand_margin_left = 0.0
-expand_margin_right = 0.0
-expand_margin_top = 0.0
-expand_margin_bottom = 0.0
-modulate_color = Color( 1, 1, 1, 1 )
-draw_center = true
-_sections_unfolded = [ "Axis Stretch", "Resource" ]
 
 [sub_resource type="StyleBoxTexture" id=6]
-
-content_margin_left = -1.0
-content_margin_right = -1.0
-content_margin_top = -1.0
-content_margin_bottom = -1.0
 texture = ExtResource( 6 )
 region_rect = Rect2( 0, 0, 64, 64 )
 margin_left = 20.0
 margin_right = 20.0
 margin_top = 20.0
 margin_bottom = 20.0
-expand_margin_left = 0.0
-expand_margin_right = 0.0
-expand_margin_top = 0.0
-expand_margin_bottom = 0.0
-modulate_color = Color( 1, 1, 1, 1 )
-draw_center = true
-_sections_unfolded = [ "Margin", "Resource" ]
 
 [resource]
-
 default_font = ExtResource( 4 )
 Button/colors/font_color = Color( 0.686275, 0.741176, 0.768627, 1 )
 Button/colors/font_color_disabled = Color( 0.686275, 0.741176, 0.768627, 1 )
@@ -148,5 +81,4 @@ ProgressBar/colors/font_color_shadow = Color( 0, 0, 0, 1 )
 ProgressBar/fonts/font = ExtResource( 4 )
 ProgressBar/styles/bg = SubResource( 6 )
 ProgressBar/styles/fg = ExtResource( 7 )
-_sections_unfolded = [ "Button", "Button/colors", "Label", "Panel/styles", "PanelContainer/styles", "ProgressBar", "ProgressBar/styles" ]
 

+ 5 - 0
2d/role_playing_game/turn_combat/combatants/sprites/blue.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/blue.png-1646430371c0817627bfbad8bb1bf0ab.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/blue.png-1646430371c0817627bfbad8bb1bf0ab.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/turn_combat/combatants/sprites/green.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/green.png-0c539b10234a7340c6135a5edb21b0e1.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/green.png-0c539b10234a7340c6135a5edb21b0e1.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 0
2d/role_playing_game/turn_combat/combatants/sprites/shadow.png.import

@@ -3,6 +3,9 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/shadow.png-0d089e013d2449a666ec492b25e627fe.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
@@ -14,6 +17,7 @@ dest_files=[ "res://.import/shadow.png-0d089e013d2449a666ec492b25e627fe.stex" ]
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -23,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 0 - 1
2d/role_playing_game/turn_combat/turn_queue/TurnQueue.gd

@@ -37,7 +37,6 @@ func remove(combatant):
 
 func set_queue(new_queue):
 	queue.clear()
-	var names = []
 	for node in new_queue:
 		if not node is combatant:
 			continue

+ 6 - 3
3d/ik/addons/sade/editor_gizmo_texture.png.import

@@ -4,20 +4,22 @@ importer="texture"
 type="StreamTexture"
 path.s3tc="res://.import/editor_gizmo_texture.png-be14d96c2d7829c8511766ceb15d5a7f.s3tc.stex"
 path.etc2="res://.import/editor_gizmo_texture.png-be14d96c2d7829c8511766ceb15d5a7f.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
 
 [deps]
 
 source_file="res://addons/sade/editor_gizmo_texture.png"
-source_md5="14289d2a3712e442d3d3adf307a54241"
-
 dest_files=[ "res://.import/editor_gizmo_texture.png-be14d96c2d7829c8511766ceb15d5a7f.s3tc.stex", "res://.import/editor_gizmo_texture.png-be14d96c2d7829c8511766ceb15d5a7f.etc2.stex" ]
-dest_md5="3279a3a982c66d6f404c81517b218531"
 
 [params]
 
 compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=true
 flags/filter=false
@@ -27,6 +29,7 @@ flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=false

+ 5 - 3
3d/ik/addons/sade/ik_fabrik.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/ik_fabrik.png-c99ad3d889def35eb72d4107e9571c00.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://addons/sade/ik_fabrik.png"
-source_md5="2909090602f64d38ce0bb7314ec7b39d"
-
 dest_files=[ "res://.import/ik_fabrik.png-c99ad3d889def35eb72d4107e9571c00.stex" ]
-dest_md5="80bbb72f55f6ea1f119b08dc61b9526e"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 1 - 2
3d/ik/addons/sade/ik_look_at.gd

@@ -146,9 +146,8 @@ func update_skeleton():
 			print (name, " - IK_LookAt: No bone in skeleton found with name [", bone_name, "]!")
 		return
 	
-	# get the bone's rest position, and our position
+	# get the bone's rest position
 	var rest = skeleton_to_use.get_bone_global_pose(bone)
-	var our_position = global_transform.origin
 	
 	# Convert our position relative to the skeleton's transform
 	var target_pos = skeleton_to_use.global_transform.xform_inv(global_transform.origin)

+ 5 - 3
3d/ik/addons/sade/ik_look_at.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/ik_look_at.png-9127e12c7a59faf98e66142c84e0d5b7.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://addons/sade/ik_look_at.png"
-source_md5="49fed7fb3ba1856215d1f334ed8bc583"
-
 dest_files=[ "res://.import/ik_look_at.png-9127e12c7a59faf98e66142c84e0d5b7.stex" ]
-dest_md5="690d9e1323d33b31eefd4014776d78d4"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 0 - 86
3d/ik/default_env.tres

@@ -1,101 +1,15 @@
 [gd_resource type="Environment" load_steps=2 format=2]
 
 [sub_resource type="ProceduralSky" id=1]
-
-radiance_size = 4
 sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
 sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
 sky_curve = 0.25
-sky_energy = 1.0
 ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
 ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
 ground_curve = 0.01
-ground_energy = 1.0
-sun_color = Color( 1, 1, 1, 1 )
-sun_latitude = 35.0
-sun_longitude = 0.0
-sun_angle_min = 1.0
-sun_angle_max = 100.0
-sun_curve = 0.05
 sun_energy = 16.0
-texture_size = 2
 
 [resource]
-
 background_mode = 2
 background_sky = SubResource( 1 )
-background_sky_custom_fov = 0.0
-background_color = Color( 0, 0, 0, 1 )
-background_energy = 1.0
-background_canvas_max_layer = 0
-ambient_light_color = Color( 0, 0, 0, 1 )
-ambient_light_energy = 1.0
-ambient_light_sky_contribution = 1.0
-fog_enabled = false
-fog_color = Color( 0.5, 0.6, 0.7, 1 )
-fog_sun_color = Color( 1, 0.9, 0.7, 1 )
-fog_sun_amount = 0.0
-fog_depth_enabled = true
-fog_depth_begin = 10.0
-fog_depth_curve = 1.0
-fog_transmit_enabled = false
-fog_transmit_curve = 1.0
-fog_height_enabled = false
-fog_height_min = 0.0
-fog_height_max = 100.0
-fog_height_curve = 1.0
-tonemap_mode = 0
-tonemap_exposure = 1.0
-tonemap_white = 1.0
-auto_exposure_enabled = false
-auto_exposure_scale = 0.4
-auto_exposure_min_luma = 0.05
-auto_exposure_max_luma = 8.0
-auto_exposure_speed = 0.5
-ss_reflections_enabled = false
-ss_reflections_max_steps = 64
-ss_reflections_fade_in = 0.15
-ss_reflections_fade_out = 2.0
-ss_reflections_depth_tolerance = 0.2
-ss_reflections_roughness = true
-ssao_enabled = false
-ssao_radius = 1.0
-ssao_intensity = 1.0
-ssao_radius2 = 0.0
-ssao_intensity2 = 1.0
-ssao_bias = 0.01
-ssao_light_affect = 0.0
-ssao_color = Color( 0, 0, 0, 1 )
-ssao_quality = 0
-ssao_blur = 3
-ssao_edge_sharpness = 4.0
-dof_blur_far_enabled = false
-dof_blur_far_distance = 10.0
-dof_blur_far_transition = 5.0
-dof_blur_far_amount = 0.1
-dof_blur_far_quality = 1
-dof_blur_near_enabled = false
-dof_blur_near_distance = 2.0
-dof_blur_near_transition = 1.0
-dof_blur_near_amount = 0.1
-dof_blur_near_quality = 1
-glow_enabled = false
-glow_levels/1 = false
-glow_levels/2 = false
-glow_levels/3 = true
-glow_levels/4 = false
-glow_levels/5 = true
-glow_levels/6 = false
-glow_levels/7 = false
-glow_intensity = 0.8
-glow_strength = 1.0
-glow_bloom = 0.0
-glow_blend_mode = 2
-glow_hdr_threshold = 1.0
-glow_hdr_scale = 2.0
-glow_bicubic_upscale = false
-adjustment_enabled = false
-adjustment_brightness = 1.0
-adjustment_contrast = 1.0
-adjustment_saturation = 1.0
 

+ 38 - 434
3d/ik/fabrik_ik.tscn

@@ -12,324 +12,81 @@
 [ext_resource path="res://button_change_scene.gd" type="Script" id=10]
 
 [sub_resource type="PlaneMesh" id=1]
-
 size = Vector2( 40, 40 )
-subdivide_width = 0
-subdivide_depth = 0
 
 [sub_resource type="SpatialMaterial" id=2]
-
-render_priority = 0
-flags_transparent = false
-flags_unshaded = false
-flags_vertex_lighting = false
-flags_no_depth_test = false
-flags_use_point_size = false
-flags_world_triplanar = false
-flags_fixed_size = false
-flags_albedo_tex_force_srgb = false
-vertex_color_use_as_albedo = false
-vertex_color_is_srgb = false
-params_diffuse_mode = 0
-params_specular_mode = 0
-params_blend_mode = 0
-params_cull_mode = 0
-params_depth_draw_mode = 0
-params_line_width = 1.0
-params_point_size = 1.0
-params_billboard_mode = 0
-params_grow = false
-params_use_alpha_scissor = false
-albedo_color = Color( 1, 1, 1, 1 )
 albedo_texture = ExtResource( 1 )
-metallic = 0.0
-metallic_specular = 0.5
-metallic_texture_channel = 0
 roughness = 0.2
-roughness_texture_channel = 0
-emission_enabled = false
-normal_enabled = false
-rim_enabled = false
-clearcoat_enabled = false
-anisotropy_enabled = false
-ao_enabled = false
-depth_enabled = false
-subsurf_scatter_enabled = false
-transmission_enabled = false
-refraction_enabled = false
-detail_enabled = false
 uv1_scale = Vector3( 0.25, 0.25, 0.25 )
-uv1_offset = Vector3( 0, 0, 0 )
 uv1_triplanar = true
-uv1_triplanar_sharpness = 1.0
-uv2_scale = Vector3( 1, 1, 1 )
-uv2_offset = Vector3( 0, 0, 0 )
-uv2_triplanar = false
-uv2_triplanar_sharpness = 1.0
-proximity_fade_enable = false
-distance_fade_enable = false
-_sections_unfolded = [ "UV1" ]
 
 [sub_resource type="ProceduralSky" id=3]
-
-radiance_size = 4
 sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
 sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
 sky_curve = 0.25
-sky_energy = 1.0
 ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
 ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
 ground_curve = 0.01
-ground_energy = 1.0
-sun_color = Color( 1, 1, 1, 1 )
-sun_latitude = 35.0
-sun_longitude = 0.0
-sun_angle_min = 1.0
-sun_angle_max = 100.0
-sun_curve = 0.05
 sun_energy = 16.0
-texture_size = 2
 
 [sub_resource type="Environment" id=4]
-
 background_mode = 2
 background_sky = SubResource( 3 )
-background_sky_custom_fov = 0.0
-background_color = Color( 0, 0, 0, 1 )
-background_energy = 1.0
-background_canvas_max_layer = 0
-ambient_light_color = Color( 0, 0, 0, 1 )
-ambient_light_energy = 1.0
-ambient_light_sky_contribution = 1.0
-fog_enabled = false
-fog_color = Color( 0.5, 0.6, 0.7, 1 )
-fog_sun_color = Color( 1, 0.9, 0.7, 1 )
-fog_sun_amount = 0.0
-fog_depth_enabled = true
-fog_depth_begin = 10.0
-fog_depth_curve = 1.0
-fog_transmit_enabled = false
-fog_transmit_curve = 1.0
-fog_height_enabled = false
-fog_height_min = 0.0
-fog_height_max = 100.0
-fog_height_curve = 1.0
 tonemap_mode = 3
-tonemap_exposure = 1.0
-tonemap_white = 1.0
-auto_exposure_enabled = false
-auto_exposure_scale = 0.4
-auto_exposure_min_luma = 0.05
-auto_exposure_max_luma = 8.0
-auto_exposure_speed = 0.5
-ss_reflections_enabled = false
-ss_reflections_max_steps = 64
-ss_reflections_fade_in = 0.15
-ss_reflections_fade_out = 2.0
-ss_reflections_depth_tolerance = 0.2
-ss_reflections_roughness = true
-ssao_enabled = false
-ssao_radius = 1.0
-ssao_intensity = 1.0
-ssao_radius2 = 0.0
-ssao_intensity2 = 1.0
-ssao_bias = 0.01
-ssao_light_affect = 0.0
-ssao_color = Color( 0, 0, 0, 1 )
-ssao_quality = 0
-ssao_blur = 3
-ssao_edge_sharpness = 4.0
-dof_blur_far_enabled = false
-dof_blur_far_distance = 10.0
-dof_blur_far_transition = 5.0
-dof_blur_far_amount = 0.1
-dof_blur_far_quality = 1
-dof_blur_near_enabled = false
-dof_blur_near_distance = 2.0
-dof_blur_near_transition = 1.0
-dof_blur_near_amount = 0.1
-dof_blur_near_quality = 1
 glow_enabled = true
 glow_levels/1 = true
 glow_levels/2 = true
-glow_levels/3 = true
-glow_levels/4 = false
 glow_levels/5 = false
-glow_levels/6 = false
-glow_levels/7 = false
 glow_intensity = 0.2
-glow_strength = 1.0
 glow_bloom = 0.03
 glow_blend_mode = 0
-glow_hdr_threshold = 1.0
-glow_hdr_scale = 2.0
-glow_bicubic_upscale = false
-adjustment_enabled = false
-adjustment_brightness = 1.0
-adjustment_contrast = 1.0
-adjustment_saturation = 1.0
-_sections_unfolded = [ "Glow", "Glow/levels" ]
 
 [sub_resource type="CubeMesh" id=5]
-
 size = Vector3( 1, 1, 1 )
-subdivide_width = 0
-subdivide_height = 0
-subdivide_depth = 0
 
 [sub_resource type="SpatialMaterial" id=6]
-
-render_priority = 0
-flags_transparent = false
-flags_unshaded = false
-flags_vertex_lighting = false
-flags_no_depth_test = false
-flags_use_point_size = false
-flags_world_triplanar = false
-flags_fixed_size = false
-flags_albedo_tex_force_srgb = false
-vertex_color_use_as_albedo = false
-vertex_color_is_srgb = false
-params_diffuse_mode = 0
-params_specular_mode = 0
-params_blend_mode = 0
-params_cull_mode = 0
-params_depth_draw_mode = 0
-params_line_width = 1.0
-params_point_size = 1.0
-params_billboard_mode = 0
-params_grow = false
-params_use_alpha_scissor = false
 albedo_color = Color( 0, 0.191406, 0.765625, 1 )
-metallic = 0.0
-metallic_specular = 0.5
-metallic_texture_channel = 0
 roughness = 0.0
-roughness_texture_channel = 0
-emission_enabled = false
-normal_enabled = false
-rim_enabled = false
-clearcoat_enabled = false
-anisotropy_enabled = false
-ao_enabled = false
-depth_enabled = false
-subsurf_scatter_enabled = false
-transmission_enabled = false
-refraction_enabled = false
-detail_enabled = false
-uv1_scale = Vector3( 1, 1, 1 )
-uv1_offset = Vector3( 0, 0, 0 )
-uv1_triplanar = false
-uv1_triplanar_sharpness = 1.0
-uv2_scale = Vector3( 1, 1, 1 )
-uv2_offset = Vector3( 0, 0, 0 )
-uv2_triplanar = false
-uv2_triplanar_sharpness = 1.0
-proximity_fade_enable = false
-distance_fade_enable = false
-_sections_unfolded = [ "Albedo" ]
-
-[node name="FABRIK_IK" type="Spatial" index="0"]
-
-[node name="Floor_plane" type="MeshInstance" parent="." index="0"]
-
-layers = 1
-material_override = null
-cast_shadow = 1
-extra_cull_margin = 0.0
-use_in_baked_light = false
-lod_min_distance = 0.0
-lod_min_hysteresis = 0.0
-lod_max_distance = 0.0
-lod_max_hysteresis = 0.0
+
+[node name="FABRIK_IK" type="Spatial"]
+
+[node name="Floor_plane" type="MeshInstance" parent="."]
 mesh = SubResource( 1 )
-skeleton = NodePath("..")
 material/0 = SubResource( 2 )
-_sections_unfolded = [ "material" ]
-
-[node name="DirectionalLight" type="DirectionalLight" parent="." index="1"]
 
+[node name="DirectionalLight" type="DirectionalLight" parent="."]
 transform = Transform( 0.56827, 0.673454, -0.472789, 0, 0.574581, 0.818448, 0.822842, -0.465099, 0.326517, -9.77531, 11.5204, 11.766 )
-layers = 1
-light_color = Color( 1, 1, 1, 1 )
-light_energy = 1.0
-light_indirect_energy = 1.0
-light_negative = false
-light_specular = 0.5
-light_bake_mode = 1
-light_cull_mask = -1
-shadow_enabled = false
-shadow_color = Color( 0, 0, 0, 1 )
-shadow_bias = 0.1
-shadow_contact = 0.0
-shadow_reverse_cull_face = false
-editor_only = false
-directional_shadow_mode = 2
-directional_shadow_split_1 = 0.1
-directional_shadow_split_2 = 0.2
-directional_shadow_split_3 = 0.5
-directional_shadow_blend_splits = false
-directional_shadow_normal_bias = 0.8
-directional_shadow_bias_split_scale = 0.25
-directional_shadow_depth_range = 0
-directional_shadow_max_distance = 200.0
-
-[node name="WorldEnvironment" type="WorldEnvironment" parent="." index="2"]
 
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource( 4 )
 
-[node name="BattleBot" parent="." index="3" instance=ExtResource( 2 )]
+[node name="BattleBot" parent="." instance=ExtResource( 2 )]
 
 [node name="godot_battle_bot" parent="BattleBot/Armature/Skeleton" index="0"]
-
 material/0 = ExtResource( 3 )
 material/1 = ExtResource( 4 )
-_sections_unfolded = [ "material" ]
-
-[node name="Camera" type="Camera" parent="." index="4"]
 
+[node name="Camera" type="Camera" parent="."]
 editor/display_folded = true
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.5014, 8.81922 )
-keep_aspect = 1
-cull_mask = 1048575
-environment = null
-h_offset = 0.0
-v_offset = 0.0
-doppler_tracking = 0
-projection = 0
-current = false
 fov = 74.0
-size = 1.0
-near = 0.05
-far = 100.0
 script = ExtResource( 5 )
 MOVEMENT_SPEED = -6.0
 flip_axis = true
 
-[node name="targets" type="Spatial" parent="Camera" index="0"]
-
+[node name="targets" type="Spatial" parent="Camera"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -5.41814 )
 
-[node name="IK_LookAt_Head" type="Spatial" parent="Camera/targets" index="0"]
-
+[node name="IK_LookAt_Head" type="Spatial" parent="Camera/targets"]
 script = ExtResource( 6 )
-_sections_unfolded = [ "Transform" ]
 __meta__ = {
 "_editor_icon": ExtResource( 7 )
 }
 skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton")
 bone_name = "Head"
-update_mode = 0
-look_at_axis = 1
-use_our_rotation_x = false
-use_our_rotation_y = false
-use_our_rotation_z = false
-use_negative_our_rot = false
 additional_rotation = Vector3( 90, 0, 0 )
-debug_messages = false
-
-[node name="IK_FABRIK_Left_Arm" type="Spatial" parent="Camera/targets" index="1"]
 
+[node name="IK_FABRIK_Left_Arm" type="Spatial" parent="Camera/targets"]
 editor/display_folded = true
 script = ExtResource( 8 )
 __meta__ = {
@@ -344,13 +101,11 @@ limit_chain_iterations = false
 reset_iterations_on_update = false
 use_middle_joint_target = true
 
-[node name="target" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm" index="0"]
-
+[node name="target" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm"]
 editor/display_folded = true
 transform = Transform( 0.518503, 0, -0.855076, 0, 1, 0, 0.855076, 0, 0.518503, 1.13159, 0, -0.155596 )
 
-[node name="IK_LookAt_LH" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm/target" index="0"]
-
+[node name="IK_LookAt_LH" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm/target"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.343393, -0.133381, 0.836605 )
 script = ExtResource( 6 )
 __meta__ = {
@@ -358,29 +113,18 @@ __meta__ = {
 }
 skeleton_path = NodePath("../../../../../BattleBot/Armature/Skeleton")
 bone_name = "Left_Hand"
-update_mode = 0
-look_at_axis = 1
-use_our_rotation_x = false
-use_our_rotation_y = false
-use_our_rotation_z = false
-use_negative_our_rot = false
 additional_rotation = Vector3( 0, 0, 90 )
-debug_messages = false
-
-[node name="middle_joint_target" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm" index="1"]
 
+[node name="middle_joint_target" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 7.16849, 0, -5.31922 )
 
-[node name="Left_UpperArm" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm" index="2"]
-
-transform = Transform( -0.664762, 0.077136, -0.743062, -2.23517e-08, 0.994655, 0.103253, 0.747055, 0.068639, -0.661209, 1.53443, 0.300478, -3.63529 )
+[node name="Left_UpperArm" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm"]
+transform = Transform( -0.66477, 0.0771345, -0.743055, -2.23517e-008, 0.994655, 0.103252, 0.747048, 0.0686391, -0.661217, 1.53444, 0.300478, -3.63533 )
 
-[node name="Left_LowerArm" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm" index="3"]
-
-transform = Transform( -0.773622, -0.022882, 0.633234, 1.49012e-08, 0.999348, 0.0361116, -0.633648, 0.0279367, -0.773117, 2.94998, 0.103698, -2.37567 )
-
-[node name="IK_FABRIK_Right_Arm" type="Spatial" parent="Camera/targets" index="2"]
+[node name="Left_LowerArm" type="Spatial" parent="Camera/targets/IK_FABRIK_Left_Arm"]
+transform = Transform( -0.773624, -0.0228999, 0.633231, 2.98023e-008, 0.999347, 0.03614, -0.633645, 0.0279588, -0.773119, 2.94998, 0.10378, -2.37569 )
 
+[node name="IK_FABRIK_Right_Arm" type="Spatial" parent="Camera/targets"]
 editor/display_folded = true
 script = ExtResource( 8 )
 __meta__ = {
@@ -395,13 +139,11 @@ limit_chain_iterations = false
 reset_iterations_on_update = false
 use_middle_joint_target = true
 
-[node name="target" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm" index="0"]
-
+[node name="target" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm"]
 editor/display_folded = true
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -0.229958, 0, 0.929313 )
 
-[node name="IK_LookAt_RH" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm/target" index="0"]
-
+[node name="IK_LookAt_RH" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm/target"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0544824, -0.133381, 0.332403 )
 script = ExtResource( 6 )
 __meta__ = {
@@ -409,226 +151,88 @@ __meta__ = {
 }
 skeleton_path = NodePath("../../../../../BattleBot/Armature/Skeleton")
 bone_name = "Right_Hand"
-update_mode = 0
-look_at_axis = 1
-use_our_rotation_x = false
-use_our_rotation_y = false
-use_our_rotation_z = false
-use_negative_our_rot = false
 additional_rotation = Vector3( 0, 0, 90 )
-debug_messages = false
-
-[node name="middle_joint_target" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm" index="1"]
 
+[node name="middle_joint_target" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm"]
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, -6.34515, 0, -3.7843 )
 
-[node name="Right_UpperArm" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm" index="2"]
-
-transform = Transform( -0.694976, -0.0753919, 0.715069, 5.96046e-08, 0.994488, 0.104852, -0.719033, 0.0728695, -0.691145, -1.5334, 0.300478, -3.63531 )
-
-[node name="Right_LowerArm" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm" index="3"]
-
-transform = Transform( -0.792023, 0.0165762, -0.610266, 0, 0.999631, 0.0271522, 0.610491, 0.0215051, -0.791731, -2.89562, 0.100769, -2.31865 )
-
-[node name="Right_Hand" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm" index="4"]
+[node name="Right_UpperArm" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm"]
+transform = Transform( -0.694982, -0.0753926, 0.715064, -7.45058e-009, 0.994488, 0.104854, -0.719028, 0.0728714, -0.691151, -1.53339, 0.300478, -3.63533 )
 
-transform = Transform( -0.678334, 0.00700453, -0.73472, 1.39698e-09, 0.999955, 0.00953316, 0.734753, 0.00646667, -0.678303, -1.07909, 0.0201073, 0.0379558 )
+[node name="Right_LowerArm" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm"]
+transform = Transform( -0.792023, 0.0165711, -0.610266, -1.49012e-008, 0.999631, 0.0271438, 0.610491, 0.0214986, -0.791732, -2.89561, 0.100755, -2.31866 )
 
-[node name="MeshInstance" type="MeshInstance" parent="Camera/targets" index="3"]
+[node name="Right_Hand" type="Spatial" parent="Camera/targets/IK_FABRIK_Right_Arm"]
+transform = Transform( -0.678336, 0.00698721, -0.734719, -2.32831e-009, 0.999955, 0.00950961, 0.734752, 0.00645071, -0.678305, -1.07914, 0.020072, 0.03791 )
 
-layers = 1
-material_override = null
-cast_shadow = 1
-extra_cull_margin = 0.0
-use_in_baked_light = false
-lod_min_distance = 0.0
-lod_min_hysteresis = 0.0
-lod_max_distance = 0.0
-lod_max_hysteresis = 0.0
+[node name="MeshInstance" type="MeshInstance" parent="Camera/targets"]
 mesh = SubResource( 5 )
-skeleton = NodePath("..")
 material/0 = SubResource( 6 )
-_sections_unfolded = [ "material" ]
 
-[node name="Control" type="Control" parent="." index="5"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Control" type="Control" parent="."]
 margin_right = 40.0
 margin_bottom = 40.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-
-[node name="Panel" type="Panel" parent="Control" index="0"]
 
+[node name="Panel" type="Panel" parent="Control"]
 modulate = Color( 1, 1, 1, 0.784314 )
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
 margin_left = -2.0
 margin_top = 530.0
 margin_right = 1028.0
 margin_bottom = 600.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-_sections_unfolded = [ "Visibility" ]
-
-[node name="Label" type="Label" parent="Control/Panel" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+
+[node name="Label" type="Label" parent="Control/Panel"]
 margin_left = 12.0
 margin_top = 10.0
 margin_right = 1012.0
 margin_bottom = 41.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
 text = "F.A.B.R.I.K IK
 Move mouse to move IK targets
 (Using 3 bones in the right hand, only 2 in the left. 3+ recommended)"
 align = 1
 valign = 1
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
 
-[node name="Label_extra" type="Label" parent="Control/Panel" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Label_extra" type="Label" parent="Control/Panel"]
 margin_left = 12.0
 margin_top = 80.0
 margin_right = 1012.0
 margin_bottom = 128.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
 text = "NOTE: You will get a few errors when saving with FABRIK IK nodes in your scene
 This is a known bug. Please ignore the errors for now, as they do not do anything
 (They're just annoying. If you find a fix, please add it to the demo repository!)"
 align = 1
 valign = 1
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-
-[node name="Label_left" type="Label" parent="Control/Panel" index="2"]
 
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Label_left" type="Label" parent="Control/Panel"]
 margin_left = 782.0
 margin_top = 4.0
 margin_right = 895.0
 margin_bottom = 18.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
 text = "Left Hand"
 align = 1
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
 
-[node name="Label_right" type="Label" parent="Control/Panel" index="3"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Label_right" type="Label" parent="Control/Panel"]
 margin_left = 136.0
 margin_top = 5.0
 margin_right = 249.0
 margin_bottom = 19.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
 text = "Right Hand"
 align = 1
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
-
-[node name="Button_Next" type="Button" parent="Control" index="1"]
 
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Button_Next" type="Button" parent="Control"]
 margin_left = 900.0
 margin_top = 540.0
 margin_right = 1019.0
 margin_bottom = 590.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
 text = "Next scene"
-flat = false
-align = 1
 script = ExtResource( 10 )
 scene_to_change_to = "res://fps_example.tscn"
 
-[node name="Button_Previous" type="Button" parent="Control" index="2"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Button_Previous" type="Button" parent="Control"]
 margin_left = 10.0
 margin_top = 540.0
 margin_right = 129.0
 margin_bottom = 590.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
 text = "Previous scene"
-flat = false
-align = 1
 script = ExtResource( 10 )
 scene_to_change_to = "res://look_at_ik.tscn"
 

File diff suppressed because it is too large
+ 102 - 981
3d/ik/fps_example.tscn


+ 0 - 3
3d/ik/godot_battle_bot.dae.import

@@ -7,10 +7,7 @@ path="res://.import/godot_battle_bot.dae-eca9fb346b160636fd03ddf258af136e.scn"
 [deps]
 
 source_file="res://godot_battle_bot.dae"
-source_md5="6921b921d8668c6bb39ab8c5745b70fa"
-
 dest_files=[ "res://.import/godot_battle_bot.dae-eca9fb346b160636fd03ddf258af136e.scn" ]
-dest_md5="6b801deb70bc8b910f2dacf8ff26eb26"
 
 [params]
 

+ 6 - 3
3d/ik/godot_battle_bot_colors.png.import

@@ -4,20 +4,22 @@ importer="texture"
 type="StreamTexture"
 path.s3tc="res://.import/godot_battle_bot_colors.png-e31963bb1727b598c8ab928a0383fa54.s3tc.stex"
 path.etc2="res://.import/godot_battle_bot_colors.png-e31963bb1727b598c8ab928a0383fa54.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
 
 [deps]
 
 source_file="res://godot_battle_bot_colors.png"
-source_md5="12a4d2c319a38483b2aa8d504f39b777"
-
 dest_files=[ "res://.import/godot_battle_bot_colors.png-e31963bb1727b598c8ab928a0383fa54.s3tc.stex", "res://.import/godot_battle_bot_colors.png-e31963bb1727b598c8ab928a0383fa54.etc2.stex" ]
-dest_md5="8fcf2a1031ed729de0ec7489bbbfff50"
 
 [params]
 
 compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=true
 flags/filter=true
@@ -27,6 +29,7 @@ flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=false

+ 6 - 3
3d/ik/godot_battle_bot_emission.png.import

@@ -4,20 +4,22 @@ importer="texture"
 type="StreamTexture"
 path.s3tc="res://.import/godot_battle_bot_emission.png-c363ccbe8ada8fe822cd5528b54fc924.s3tc.stex"
 path.etc2="res://.import/godot_battle_bot_emission.png-c363ccbe8ada8fe822cd5528b54fc924.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
 
 [deps]
 
 source_file="res://godot_battle_bot_emission.png"
-source_md5="a9187c4786e7b546dee3dc4fd41f08b2"
-
 dest_files=[ "res://.import/godot_battle_bot_emission.png-c363ccbe8ada8fe822cd5528b54fc924.s3tc.stex", "res://.import/godot_battle_bot_emission.png-c363ccbe8ada8fe822cd5528b54fc924.etc2.stex" ]
-dest_md5="34ef476c1425bc7191891768528bbdce"
 
 [params]
 
 compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=true
 flags/filter=true
@@ -27,6 +29,7 @@ flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=false

+ 6 - 3
3d/ik/gun_textures.png.import

@@ -4,20 +4,22 @@ importer="texture"
 type="StreamTexture"
 path.s3tc="res://.import/gun_textures.png-d86dd13f7bab751a3c0100e83b6188ac.s3tc.stex"
 path.etc2="res://.import/gun_textures.png-d86dd13f7bab751a3c0100e83b6188ac.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
 
 [deps]
 
 source_file="res://gun_textures.png"
-source_md5="9e2cc48fd22430732940901b58005fef"
-
 dest_files=[ "res://.import/gun_textures.png-d86dd13f7bab751a3c0100e83b6188ac.s3tc.stex", "res://.import/gun_textures.png-d86dd13f7bab751a3c0100e83b6188ac.etc2.stex" ]
-dest_md5="7a556ab1eb4119f7a6a81568409d7291"
 
 [params]
 
 compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=true
 flags/filter=true
@@ -27,6 +29,7 @@ flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=false

+ 5 - 3
3d/ik/icon.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://icon.png"
-source_md5="654257205f0755621b814b013fac6039"
-
 dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
-dest_md5="09cf0e9e88dbe274951c3d78af897ef4"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 13 - 276
3d/ik/look_at_ik.tscn

@@ -10,379 +10,116 @@
 [ext_resource path="res://button_change_scene.gd" type="Script" id=8]
 
 [sub_resource type="PlaneMesh" id=1]
-
 size = Vector2( 40, 40 )
-subdivide_width = 0
-subdivide_depth = 0
 
 [sub_resource type="SpatialMaterial" id=2]
-
-render_priority = 0
-flags_transparent = false
-flags_unshaded = false
-flags_vertex_lighting = false
-flags_no_depth_test = false
-flags_use_point_size = false
-flags_world_triplanar = false
-flags_fixed_size = false
-flags_albedo_tex_force_srgb = false
-vertex_color_use_as_albedo = false
-vertex_color_is_srgb = false
-params_diffuse_mode = 0
-params_specular_mode = 0
-params_blend_mode = 0
-params_cull_mode = 0
-params_depth_draw_mode = 0
-params_line_width = 1.0
-params_point_size = 1.0
-params_billboard_mode = 0
-params_grow = false
-params_use_alpha_scissor = false
-albedo_color = Color( 1, 1, 1, 1 )
 albedo_texture = ExtResource( 1 )
-metallic = 0.0
-metallic_specular = 0.5
-metallic_texture_channel = 0
 roughness = 0.2
-roughness_texture_channel = 0
-emission_enabled = false
-normal_enabled = false
-rim_enabled = false
-clearcoat_enabled = false
-anisotropy_enabled = false
-ao_enabled = false
-depth_enabled = false
-subsurf_scatter_enabled = false
-transmission_enabled = false
-refraction_enabled = false
-detail_enabled = false
 uv1_scale = Vector3( 0.25, 0.25, 0.25 )
-uv1_offset = Vector3( 0, 0, 0 )
 uv1_triplanar = true
-uv1_triplanar_sharpness = 1.0
-uv2_scale = Vector3( 1, 1, 1 )
-uv2_offset = Vector3( 0, 0, 0 )
-uv2_triplanar = false
-uv2_triplanar_sharpness = 1.0
-proximity_fade_enable = false
-distance_fade_enable = false
-_sections_unfolded = [ "UV1" ]
 
 [sub_resource type="ProceduralSky" id=3]
-
-radiance_size = 4
 sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
 sky_horizon_color = Color( 0.556863, 0.823529, 0.909804, 1 )
 sky_curve = 0.25
-sky_energy = 1.0
 ground_bottom_color = Color( 0.101961, 0.145098, 0.188235, 1 )
 ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
 ground_curve = 0.01
-ground_energy = 1.0
-sun_color = Color( 1, 1, 1, 1 )
-sun_latitude = 35.0
-sun_longitude = 0.0
-sun_angle_min = 1.0
-sun_angle_max = 100.0
-sun_curve = 0.05
 sun_energy = 16.0
-texture_size = 2
 
 [sub_resource type="Environment" id=4]
-
 background_mode = 2
 background_sky = SubResource( 3 )
-background_sky_custom_fov = 0.0
-background_color = Color( 0, 0, 0, 1 )
-background_energy = 1.0
-background_canvas_max_layer = 0
-ambient_light_color = Color( 0, 0, 0, 1 )
-ambient_light_energy = 1.0
-ambient_light_sky_contribution = 1.0
-fog_enabled = false
-fog_color = Color( 0.5, 0.6, 0.7, 1 )
-fog_sun_color = Color( 1, 0.9, 0.7, 1 )
-fog_sun_amount = 0.0
-fog_depth_enabled = true
-fog_depth_begin = 10.0
-fog_depth_curve = 1.0
-fog_transmit_enabled = false
-fog_transmit_curve = 1.0
-fog_height_enabled = false
-fog_height_min = 0.0
-fog_height_max = 100.0
-fog_height_curve = 1.0
 tonemap_mode = 3
-tonemap_exposure = 1.0
-tonemap_white = 1.0
-auto_exposure_enabled = false
-auto_exposure_scale = 0.4
-auto_exposure_min_luma = 0.05
-auto_exposure_max_luma = 8.0
-auto_exposure_speed = 0.5
-ss_reflections_enabled = false
-ss_reflections_max_steps = 64
-ss_reflections_fade_in = 0.15
-ss_reflections_fade_out = 2.0
-ss_reflections_depth_tolerance = 0.2
-ss_reflections_roughness = true
-ssao_enabled = false
-ssao_radius = 1.0
-ssao_intensity = 1.0
-ssao_radius2 = 0.0
-ssao_intensity2 = 1.0
-ssao_bias = 0.01
-ssao_light_affect = 0.0
-ssao_color = Color( 0, 0, 0, 1 )
-ssao_quality = 0
-ssao_blur = 3
-ssao_edge_sharpness = 4.0
-dof_blur_far_enabled = false
-dof_blur_far_distance = 10.0
-dof_blur_far_transition = 5.0
-dof_blur_far_amount = 0.1
-dof_blur_far_quality = 1
-dof_blur_near_enabled = false
-dof_blur_near_distance = 2.0
-dof_blur_near_transition = 1.0
-dof_blur_near_amount = 0.1
-dof_blur_near_quality = 1
 glow_enabled = true
 glow_levels/1 = true
 glow_levels/2 = true
-glow_levels/3 = true
-glow_levels/4 = false
 glow_levels/5 = false
-glow_levels/6 = false
-glow_levels/7 = false
 glow_intensity = 0.2
-glow_strength = 1.0
 glow_bloom = 0.03
 glow_blend_mode = 0
-glow_hdr_threshold = 1.0
-glow_hdr_scale = 2.0
-glow_bicubic_upscale = false
-adjustment_enabled = false
-adjustment_brightness = 1.0
-adjustment_contrast = 1.0
-adjustment_saturation = 1.0
-_sections_unfolded = [ "Glow", "Glow/levels" ]
 
 [node name="LookAt_IK" type="Spatial"]
 
-[node name="Floor_plane" type="MeshInstance" parent="." index="0"]
-
-layers = 1
-material_override = null
-cast_shadow = 1
-extra_cull_margin = 0.0
-use_in_baked_light = false
-lod_min_distance = 0.0
-lod_min_hysteresis = 0.0
-lod_max_distance = 0.0
-lod_max_hysteresis = 0.0
+[node name="Floor_plane" type="MeshInstance" parent="."]
 mesh = SubResource( 1 )
-skeleton = NodePath("..")
 material/0 = SubResource( 2 )
-_sections_unfolded = [ "material" ]
-
-[node name="DirectionalLight" type="DirectionalLight" parent="." index="1"]
 
+[node name="DirectionalLight" type="DirectionalLight" parent="."]
 transform = Transform( 0.56827, 0.673454, -0.472789, 0, 0.574581, 0.818448, 0.822842, -0.465099, 0.326517, -9.77531, 11.5204, 11.766 )
-layers = 1
-light_color = Color( 1, 1, 1, 1 )
-light_energy = 1.0
-light_indirect_energy = 1.0
-light_negative = false
-light_specular = 0.5
-light_bake_mode = 1
-light_cull_mask = -1
-shadow_enabled = false
-shadow_color = Color( 0, 0, 0, 1 )
-shadow_bias = 0.1
-shadow_contact = 0.0
-shadow_reverse_cull_face = false
-editor_only = false
-directional_shadow_mode = 2
-directional_shadow_split_1 = 0.1
-directional_shadow_split_2 = 0.2
-directional_shadow_split_3 = 0.5
-directional_shadow_blend_splits = false
-directional_shadow_normal_bias = 0.8
-directional_shadow_bias_split_scale = 0.25
-directional_shadow_depth_range = 0
-directional_shadow_max_distance = 200.0
-
-[node name="WorldEnvironment" type="WorldEnvironment" parent="." index="2"]
 
+[node name="WorldEnvironment" type="WorldEnvironment" parent="."]
 environment = SubResource( 4 )
 
-[node name="BattleBot" parent="." index="3" instance=ExtResource( 2 )]
+[node name="BattleBot" parent="." instance=ExtResource( 2 )]
 
 [node name="godot_battle_bot" parent="BattleBot/Armature/Skeleton" index="0"]
-
 material/0 = ExtResource( 3 )
 material/1 = ExtResource( 4 )
-_sections_unfolded = [ "material" ]
-
-[node name="Camera" type="Camera" parent="." index="4"]
 
+[node name="Camera" type="Camera" parent="."]
 editor/display_folded = true
 transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 11.5014, 8.81922 )
-keep_aspect = 1
-cull_mask = 1048575
-environment = null
-h_offset = 0.0
-v_offset = 0.0
-doppler_tracking = 0
-projection = 0
-current = false
 fov = 74.0
-size = 1.0
-near = 0.05
-far = 100.0
 script = ExtResource( 5 )
 MOVEMENT_SPEED = -2.0
 flip_axis = true
 
-[node name="targets" type="Spatial" parent="Camera" index="0"]
-
-[node name="IK_LookAt_Head" type="Spatial" parent="Camera/targets" index="0"]
+[node name="targets" type="Spatial" parent="Camera"]
 
+[node name="IK_LookAt_Head" type="Spatial" parent="Camera/targets"]
 script = ExtResource( 6 )
-_sections_unfolded = [ "Transform" ]
 __meta__ = {
 "_editor_icon": ExtResource( 7 )
 }
 skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton")
 bone_name = "Head"
-update_mode = 0
-look_at_axis = 1
-use_our_rotation_x = false
-use_our_rotation_y = false
-use_our_rotation_z = false
-use_negative_our_rot = false
 additional_rotation = Vector3( 90, 0, 0 )
-debug_messages = false
-
-[node name="IK_LookAt_LeftArm" type="Spatial" parent="Camera/targets" index="1"]
 
+[node name="IK_LookAt_LeftArm" type="Spatial" parent="Camera/targets"]
 script = ExtResource( 6 )
-_sections_unfolded = [ "Transform" ]
 __meta__ = {
 "_editor_icon": ExtResource( 7 )
 }
 skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton")
 bone_name = "Left_UpperArm"
-update_mode = 0
-look_at_axis = 1
-use_our_rotation_x = false
-use_our_rotation_y = false
-use_our_rotation_z = false
-use_negative_our_rot = false
-additional_rotation = Vector3( 0, 0, 0 )
-debug_messages = false
-
-[node name="IK_LookAt_RightArm" type="Spatial" parent="Camera/targets" index="2"]
 
+[node name="IK_LookAt_RightArm" type="Spatial" parent="Camera/targets"]
 script = ExtResource( 6 )
-_sections_unfolded = [ "Transform" ]
 __meta__ = {
 "_editor_icon": ExtResource( 7 )
 }
 skeleton_path = NodePath("../../../BattleBot/Armature/Skeleton")
 bone_name = "Right_UpperArm"
-update_mode = 0
-look_at_axis = 1
-use_our_rotation_x = false
-use_our_rotation_y = false
-use_our_rotation_z = false
-use_negative_our_rot = false
 additional_rotation = Vector3( 0, 0, 180 )
-debug_messages = false
-
-[node name="Control" type="Control" parent="." index="5"]
 
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Control" type="Control" parent="."]
 margin_right = 40.0
 margin_bottom = 40.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-
-[node name="Panel" type="Panel" parent="Control" index="0"]
 
+[node name="Panel" type="Panel" parent="Control"]
 modulate = Color( 1, 1, 1, 0.784314 )
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
 margin_left = -2.0
 margin_top = 530.0
 margin_right = 1028.0
 margin_bottom = 600.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-_sections_unfolded = [ "Visibility" ]
-
-[node name="Label" type="Label" parent="Control/Panel" index="0"]
 
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Label" type="Label" parent="Control/Panel"]
 margin_left = 12.0
 margin_top = 10.0
 margin_right = 1012.0
 margin_bottom = 41.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-mouse_filter = 2
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 4
 text = "LookAt IK
 Move mouse to move IK targets"
 align = 1
 valign = 1
-percent_visible = 1.0
-lines_skipped = 0
-max_lines_visible = -1
 
-[node name="Button_Next" type="Button" parent="Control" index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="Button_Next" type="Button" parent="Control"]
 margin_left = 900.0
 margin_top = 540.0
 margin_right = 1019.0
 margin_bottom = 590.0
-rect_pivot_offset = Vector2( 0, 0 )
-rect_clip_content = false
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
-size_flags_horizontal = 1
-size_flags_vertical = 1
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
 text = "Next scene"
-flat = false
-align = 1
 script = ExtResource( 8 )
 scene_to_change_to = "res://fabrik_ik.tscn"
 

+ 6 - 1
3d/ik/project.godot

@@ -6,7 +6,12 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=3
+config_version=4
+
+_global_script_classes=[  ]
+_global_script_class_icons={
+
+}
 
 [application]
 

+ 12 - 97
3d/ik/simple_bullet.tscn

@@ -1,123 +1,38 @@
-[gd_scene load_steps=5 format=2]
+[gd_scene load_steps=6 format=2]
 
 [ext_resource path="res://simple_bullet.gd" type="Script" id=1]
 
-[sub_resource type="SphereMesh" id=1]
-
-radius = 1.0
-height = 2.0
-radial_segments = 64
-rings = 32
-is_hemisphere = false
+[sub_resource type="PhysicsMaterial" id=1]
+bounce = 0.5
 
-[sub_resource type="SpatialMaterial" id=2]
+[sub_resource type="SphereMesh" id=2]
 
-render_priority = 0
-flags_transparent = false
-flags_unshaded = false
-flags_vertex_lighting = false
-flags_no_depth_test = false
-flags_use_point_size = false
-flags_world_triplanar = false
-flags_fixed_size = false
-flags_albedo_tex_force_srgb = false
-vertex_color_use_as_albedo = false
-vertex_color_is_srgb = false
-params_diffuse_mode = 0
-params_specular_mode = 0
-params_blend_mode = 0
-params_cull_mode = 0
-params_depth_draw_mode = 0
-params_line_width = 1.0
-params_point_size = 1.0
-params_billboard_mode = 0
-params_grow = false
-params_use_alpha_scissor = false
+[sub_resource type="SpatialMaterial" id=3]
 albedo_color = Color( 0.769531, 0.486969, 0, 1 )
-metallic = 0.0
-metallic_specular = 0.5
-metallic_texture_channel = 0
-roughness = 1.0
-roughness_texture_channel = 0
 emission_enabled = true
 emission = Color( 1, 0.445313, 0, 1 )
 emission_energy = 1.8
 emission_operator = 0
 emission_on_uv2 = false
-normal_enabled = false
-rim_enabled = false
-clearcoat_enabled = false
-anisotropy_enabled = false
-ao_enabled = false
-depth_enabled = false
-subsurf_scatter_enabled = false
-transmission_enabled = false
-refraction_enabled = false
-detail_enabled = false
-uv1_scale = Vector3( 1, 1, 1 )
-uv1_offset = Vector3( 0, 0, 0 )
-uv1_triplanar = false
-uv1_triplanar_sharpness = 1.0
-uv2_scale = Vector3( 1, 1, 1 )
-uv2_offset = Vector3( 0, 0, 0 )
-uv2_triplanar = false
-uv2_triplanar_sharpness = 1.0
-proximity_fade_enable = false
-distance_fade_enable = false
-
-[sub_resource type="SphereShape" id=3]
 
+[sub_resource type="SphereShape" id=4]
 radius = 0.4
 
 [node name="SimpleBullet" type="RigidBody"]
-
-input_ray_pickable = true
-input_capture_on_drag = false
-collision_layer = 1
-collision_mask = 1
-mode = 0
 mass = 2.0
-friction = 1.0
-bounce = 0.5
+physics_material_override = SubResource( 1 )
 gravity_scale = 3.0
-custom_integrator = false
 continuous_cd = true
-contacts_reported = 0
-contact_monitor = false
-sleeping = false
 can_sleep = false
-axis_lock_linear_x = false
-axis_lock_linear_y = false
-axis_lock_linear_z = false
-axis_lock_angular_x = false
-axis_lock_angular_y = false
-axis_lock_angular_z = false
-linear_velocity = Vector3( 0, 0, 0 )
 linear_damp = 0.4
-angular_velocity = Vector3( 0, 0, 0 )
-angular_damp = -1.0
 script = ExtResource( 1 )
 
-[node name="MeshInstance" type="MeshInstance" parent="." index="0"]
-
+[node name="MeshInstance" type="MeshInstance" parent="."]
 transform = Transform( 0.4, 0, 0, 0, 0.4, 0, 0, 0, 0.4, 0, 0, 0 )
-layers = 1
-material_override = null
 cast_shadow = 0
-extra_cull_margin = 0.0
-use_in_baked_light = false
-lod_min_distance = 0.0
-lod_min_hysteresis = 0.0
-lod_max_distance = 0.0
-lod_max_hysteresis = 0.0
-mesh = SubResource( 1 )
-skeleton = NodePath("..")
-material/0 = SubResource( 2 )
-_sections_unfolded = [ "Geometry", "Transform", "material" ]
-
-[node name="CollisionShape" type="CollisionShape" parent="." index="1"]
-
-shape = SubResource( 3 )
-disabled = false
+mesh = SubResource( 2 )
+material/0 = SubResource( 3 )
 
+[node name="CollisionShape" type="CollisionShape" parent="."]
+shape = SubResource( 4 )
 

+ 0 - 3
3d/ik/weapon_pistol.dae.import

@@ -7,10 +7,7 @@ path="res://.import/weapon_pistol.dae-b8ccfaa12c6b728117e9f797617f9226.scn"
 [deps]
 
 source_file="res://weapon_pistol.dae"
-source_md5="5070f29403355abe514cc6a266bd148e"
-
 dest_files=[ "res://.import/weapon_pistol.dae-b8ccfaa12c6b728117e9f797617f9226.scn" ]
-dest_md5="ab927a59008424dee9aa13cbf2e81b2b"
 
 [params]
 

+ 7 - 5
3d/navmesh/icon.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
-source_file="res://kinebody3d.png"
-source_md5="5eca5c1838fc1255a4ad6a0adf3f9948"
-
-dest_files=[ "res://.import/kinebody3d.png-13e5946de0ae5f65e359d6d81ccb14f1.stex" ]
-dest_md5="d510ae31bff93a498822d7d61bfd5b45"
+source_file="res://icon.png"
+dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

BIN
3d/navmesh/navmesh.scn


+ 11 - 0
3d/navmesh/particle.png.import

@@ -4,12 +4,22 @@ importer="texture"
 type="StreamTexture"
 path.s3tc="res://.import/particle.png-c2ba3d91e96c62035d672392a1197218.s3tc.stex"
 path.etc2="res://.import/particle.png-c2ba3d91e96c62035d672392a1197218.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
+
+[deps]
+
+source_file="res://particle.png"
+dest_files=[ "res://.import/particle.png-c2ba3d91e96c62035d672392a1197218.s3tc.stex", "res://.import/particle.png-c2ba3d91e96c62035d672392a1197218.etc2.stex" ]
 
 [params]
 
 compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=true
 flags/filter=true
@@ -19,6 +29,7 @@ flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=false

+ 6 - 1
3d/navmesh/project.godot

@@ -6,7 +6,12 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=3
+config_version=4
+
+_global_script_classes=[  ]
+_global_script_class_icons={
+
+}
 
 [application]
 

+ 5 - 3
3d/platformer/cutout.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/cutout.png-8aacc6c936bf12e889c8e11f6c4eb91c.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://cutout.png"
-source_md5="402126cf2fa67147f40ea3903c5faf24"
-
 dest_files=[ "res://.import/cutout.png-8aacc6c936bf12e889c8e11f6c4eb91c.stex" ]
-dest_md5="61fc77ca5029cf1672400d8638ddc7cb"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=true
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 0 - 15
3d/platformer/default_bus_layout.tres

@@ -1,42 +1,27 @@
 [gd_resource type="AudioBusLayout" load_steps=4 format=2]
 
 [sub_resource type="AudioEffectReverb" id=1]
-
 resource_name = "Reverb"
-predelay_msec = 150.0
 predelay_feedback = 0.8
 room_size = 0.33
 damping = 0.32
-spread = 1.0
 hipass = 0.9
 dry = 0.0
 wet = 1.0
 
 [sub_resource type="AudioEffectAmplify" id=2]
-
 resource_name = "Amplify"
-volume_db = 0.0
 
 [sub_resource type="AudioEffectReverb" id=3]
-
 resource_name = "Reverb"
-predelay_msec = 150.0
 predelay_feedback = 0.8
 room_size = 0.89
 damping = 0.17
-spread = 1.0
 hipass = 0.08
 dry = 0.0
 wet = 0.36
 
 [resource]
-
-bus/0/name = "Master"
-bus/0/solo = false
-bus/0/mute = false
-bus/0/bypass_fx = false
-bus/0/volume_db = 0.0
-bus/0/send = ""
 bus/1/name = "Reverb Small"
 bus/1/solo = false
 bus/1/mute = false

+ 2 - 0
3d/platformer/enemy.gd

@@ -19,6 +19,8 @@ func _integrate_forces(state):
 	var delta = state.get_step()
 	var lv = state.get_linear_velocity()
 	var g = state.get_total_gravity()
+	# get_total_gravity returns zero for the first few frames, leading to errors
+	if g == Vector3.ZERO: g = Vector3 (0, -9.8, 0)
 
 	lv += g * delta # Apply gravity
 	var up = -g.normalized()

+ 5 - 3
3d/platformer/icon.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://icon.png"
-source_md5="fd9813b084986772b022c46b26b70946"
-
 dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
-dest_md5="e00a57b2081c8cced0b55877be375ff5"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=true
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 3
3d/platformer/osb_down.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/osb_down.png-4a1ab934f787719766862b499528d054.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://osb_down.png"
-source_md5="380dffa32ccc4f1a7f26a866a75e8d7f"
-
 dest_files=[ "res://.import/osb_down.png-4a1ab934f787719766862b499528d054.stex" ]
-dest_md5="5eccf0e866157072c9a9aff04c314240"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=true
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 3
3d/platformer/osb_fire.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/osb_fire.png-e657a73546eb75918e9d9a3fea15cf70.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://osb_fire.png"
-source_md5="99a276197ee76a83312af783f33f0ab3"
-
 dest_files=[ "res://.import/osb_fire.png-e657a73546eb75918e9d9a3fea15cf70.stex" ]
-dest_md5="6482bf57180d11ef68855aa2a08394df"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=true
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 3
3d/platformer/osb_jump.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/osb_jump.png-dbbef3b47abbb562ce6c81a9701121c6.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://osb_jump.png"
-source_md5="ac3e3adf52903de07cff73354f63896c"
-
 dest_files=[ "res://.import/osb_jump.png-dbbef3b47abbb562ce6c81a9701121c6.stex" ]
-dest_md5="27ebfaebcab0d0dec8bc8653d9086845"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=true
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 3
3d/platformer/osb_left.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/osb_left.png-fc7230aeb0eec74933ed08f89b893288.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://osb_left.png"
-source_md5="ce066828ec6ef27c9ce3809341574058"
-
 dest_files=[ "res://.import/osb_left.png-fc7230aeb0eec74933ed08f89b893288.stex" ]
-dest_md5="38850545bc1772ea9aa01359f76bc52e"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=true
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 3
3d/platformer/osb_right.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/osb_right.png-5cf5add2dbc1c8dde17173ac56f3a004.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://osb_right.png"
-source_md5="860560d5e66ccd837973fbbde7eb958f"
-
 dest_files=[ "res://.import/osb_right.png-5cf5add2dbc1c8dde17173ac56f3a004.stex" ]
-dest_md5="bc21992309c3a5da0b5df5361cdf07fa"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=true
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 3
3d/platformer/osb_up.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/osb_up.png-6a05b6a7bf0ede3756308a5cffdd2b9a.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://osb_up.png"
-source_md5="5a6485a8b3b72ee63b421dc641e3840d"
-
 dest_files=[ "res://.import/osb_up.png-6a05b6a7bf0ede3756308a5cffdd2b9a.stex" ]
-dest_md5="345b4dd67a8fe5b99a3e9438b7e67123"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=true
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 3
3d/platformer/panorama.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/panorama.png-e05131d3dca9fd5b03101f18fbe08995.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://panorama.png"
-source_md5="dfc06d296e0ae47b4b8751d80530e36b"
-
 dest_files=[ "res://.import/panorama.png-e05131d3dca9fd5b03101f18fbe08995.stex" ]
-dest_md5="46d01f14477d7b9334e7aac18a713e1c"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 1 - 1
3d/platformer/player.gd

@@ -135,7 +135,7 @@ func _physics_process(delta):
 		else:
 			anim = ANIM_AIR_DOWN
 		
-		var hs
+		# var hs
 		if dir.length() > 0.1:
 			hv += target_dir * (accel * 0.2) * delta
 			if (hv.length() > max_speed):

+ 82 - 26
3d/platformer/project.godot

@@ -6,7 +6,12 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=3
+config_version=4
+
+_global_script_classes=[  ]
+_global_script_class_icons={
+
+}
 
 [application]
 
@@ -20,49 +25,100 @@ singletons=[  ]
 
 [input]
 
-ui_accept=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
+ui_accept={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777221,"unicode":0,"echo":false,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777222,"unicode":0,"echo":false,"script":null)
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":false,"script":null)
  ]
-ui_select=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
+}
+ui_select={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":3,"pressure":0.0,"pressed":false,"script":null)
  ]
-ui_cancel=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null)
+}
+ui_cancel={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777217,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null)
  ]
-ui_focus_next=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777218,"unicode":0,"echo":false,"script":null)
+}
+ui_focus_next={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777218,"unicode":0,"echo":false,"script":null)
  ]
-ui_focus_prev=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":true,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777218,"unicode":0,"echo":false,"script":null)
+}
+ui_focus_prev={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":true,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777218,"unicode":0,"echo":false,"script":null)
  ]
-ui_left=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
+}
+ui_left={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":14,"pressure":0.0,"pressed":false,"script":null)
  ]
-ui_right=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
+}
+ui_right={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":15,"pressure":0.0,"pressed":false,"script":null)
  ]
-ui_up=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
+}
+ui_up={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":12,"pressure":0.0,"pressed":false,"script":null)
  ]
-ui_down=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
+}
+ui_down={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":13,"pressure":0.0,"pressed":false,"script":null)
  ]
-ui_page_up=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777235,"unicode":0,"echo":false,"script":null)
- ]
-ui_page_down=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777236,"unicode":0,"echo":false,"script":null)
- ]
-move_forward=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
- ]
-move_backwards=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
- ]
-move_left=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
- ]
-move_right=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
- ]
-jump=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
- ]
-shoot=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":90,"unicode":0,"echo":false,"script":null)
- ]
+}
+ui_page_up={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777235,"unicode":0,"echo":false,"script":null)
+ ]
+}
+ui_page_down={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777236,"unicode":0,"echo":false,"script":null)
+ ]
+}
+move_forward={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
+ ]
+}
+move_backwards={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
+ ]
+}
+move_left={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
+ ]
+}
+move_right={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
+ ]
+}
+jump={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
+ ]
+}
+shoot={
+"deadzone": 0.5,
+"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":90,"unicode":0,"echo":false,"script":null)
+ ]
+}
 
 [memory]
 

+ 0 - 3
3d/platformer/robot_walk.wav.import

@@ -7,10 +7,7 @@ path="res://.import/robot_walk.wav-4313e7d5f563e62e3923080b14a79c15.sample"
 [deps]
 
 source_file="res://robot_walk.wav"
-source_md5="96695430153c689bb7d67c72b2668656"
-
 dest_files=[ "res://.import/robot_walk.wav-4313e7d5f563e62e3923080b14a79c15.sample" ]
-dest_md5="4d8de1222f5b661316e32ed612fe5e3f"
 
 [params]
 

+ 6 - 3
3d/platformer/shine.png.import

@@ -4,20 +4,22 @@ importer="texture"
 type="StreamTexture"
 path.s3tc="res://.import/shine.png-a8253c1d2dc8acbf187823f695c13207.s3tc.stex"
 path.etc2="res://.import/shine.png-a8253c1d2dc8acbf187823f695c13207.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
 
 [deps]
 
 source_file="res://shine.png"
-source_md5="9fe43d82e09598fc96be75bcf60df249"
-
 dest_files=[ "res://.import/shine.png-a8253c1d2dc8acbf187823f695c13207.s3tc.stex", "res://.import/shine.png-a8253c1d2dc8acbf187823f695c13207.etc2.stex" ]
-dest_md5="bcf678c7760624596bb69eefc7ba94b9"
 
 [params]
 
 compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=true
 flags/filter=true
@@ -27,6 +29,7 @@ flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=true
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=false

+ 0 - 3
3d/platformer/sound_coin.wav.import

@@ -7,10 +7,7 @@ path="res://.import/sound_coin.wav-b4defacd1a1eab95585c7b5095506878.sample"
 [deps]
 
 source_file="res://sound_coin.wav"
-source_md5="c9b8b4e85a53ce0e7add721a872d0479"
-
 dest_files=[ "res://.import/sound_coin.wav-b4defacd1a1eab95585c7b5095506878.sample" ]
-dest_md5="542f0e54992f13943960a4ba3d92d25b"
 
 [params]
 

+ 0 - 3
3d/platformer/sound_explode.wav.import

@@ -7,10 +7,7 @@ path="res://.import/sound_explode.wav-23e94be75a4346bffb517c7e07035977.sample"
 [deps]
 
 source_file="res://sound_explode.wav"
-source_md5="c49bffd6268c2fb061a578c559fbd988"
-
 dest_files=[ "res://.import/sound_explode.wav-23e94be75a4346bffb517c7e07035977.sample" ]
-dest_md5="389669f4f619bc262f193e2690441702"
 
 [params]
 

+ 0 - 3
3d/platformer/sound_hit.wav.import

@@ -7,10 +7,7 @@ path="res://.import/sound_hit.wav-d8455980ada2d4a9a73508948d7317cc.sample"
 [deps]
 
 source_file="res://sound_hit.wav"
-source_md5="ce60125d5b1639a3b88d652aea6ca0c3"
-
 dest_files=[ "res://.import/sound_hit.wav-d8455980ada2d4a9a73508948d7317cc.sample" ]
-dest_md5="8fd07bb22183997827c99038f32cfce6"
 
 [params]
 

+ 0 - 3
3d/platformer/sound_jump.wav.import

@@ -7,10 +7,7 @@ path="res://.import/sound_jump.wav-4966d1f327e26a176b56ab335c03b5e1.sample"
 [deps]
 
 source_file="res://sound_jump.wav"
-source_md5="f15f2f75683475fb46217cb108a91d44"
-
 dest_files=[ "res://.import/sound_jump.wav-4966d1f327e26a176b56ab335c03b5e1.sample" ]
-dest_md5="ed4b4900592085ee75dcc3a9cbd8d999"
 
 [params]
 

+ 0 - 3
3d/platformer/sound_shoot.wav.import

@@ -7,10 +7,7 @@ path="res://.import/sound_shoot.wav-f0f26619cba21d411b53ad23b8788116.sample"
 [deps]
 
 source_file="res://sound_shoot.wav"
-source_md5="5c1909840119124623da414167fad697"
-
 dest_files=[ "res://.import/sound_shoot.wav-f0f26619cba21d411b53ad23b8788116.sample" ]
-dest_md5="f8ee1819f359ada59454d9e368103a8e"
 
 [params]
 

BIN
3d/platformer/stage.scn


+ 5 - 3
3d/platformer/texture.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/texture.png-77dc6ecaf884a35cd9dbaf886cacc46d.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://texture.png"
-source_md5="f11823b1bf51802d6dbcd773e273174c"
-
 dest_files=[ "res://.import/texture.png-77dc6ecaf884a35cd9dbaf886cacc46d.stex" ]
-dest_md5="6bb2624f46507a07fed7d1984bfeb6ca"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=1
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=1
 process/fix_alpha_border=false
 process/premult_alpha=true
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=false

+ 6 - 3
3d/platformer/texturemr.png.import

@@ -4,20 +4,22 @@ importer="texture"
 type="StreamTexture"
 path.s3tc="res://.import/texturemr.png-0568a8b09834741143da53ce460e36f1.s3tc.stex"
 path.etc2="res://.import/texturemr.png-0568a8b09834741143da53ce460e36f1.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
 
 [deps]
 
 source_file="res://texturemr.png"
-source_md5="44c91f2d59a98b888e2bc235d5ea379d"
-
 dest_files=[ "res://.import/texturemr.png-0568a8b09834741143da53ce460e36f1.s3tc.stex", "res://.import/texturemr.png-0568a8b09834741143da53ce460e36f1.etc2.stex" ]
-dest_md5="2526b51bff771b289cc452ccfb76606c"
 
 [params]
 
 compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=true
 flags/filter=true
@@ -27,6 +29,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=true
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=false

+ 6 - 3
3d/truck_town/Images/cement.png.import

@@ -4,20 +4,22 @@ importer="texture"
 type="StreamTexture"
 path.s3tc="res://.import/cement.png-702c83258feb3e054c70d5eef03c8880.s3tc.stex"
 path.etc2="res://.import/cement.png-702c83258feb3e054c70d5eef03c8880.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
 
 [deps]
 
 source_file="res://Images/cement.png"
-source_md5="eeac520b0926b5a69820dd5aa243dadc"
-
 dest_files=[ "res://.import/cement.png-702c83258feb3e054c70d5eef03c8880.s3tc.stex", "res://.import/cement.png-702c83258feb3e054c70d5eef03c8880.etc2.stex" ]
-dest_md5="fa2e8d9d96178308423d83b443dee9a2"
 
 [params]
 
 compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=true
 flags/filter=true
@@ -27,6 +29,7 @@ flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=false

+ 5 - 3
3d/truck_town/Images/choose_tow.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/choose_tow.png-44e07473d53f066833ce9f8293b279c2.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://Images/choose_tow.png"
-source_md5="474fa78a657c8f395a1bf94dc4d532bb"
-
 dest_files=[ "res://.import/choose_tow.png-44e07473d53f066833ce9f8293b279c2.stex" ]
-dest_md5="b7a40b72ea2f6ab95a46e321a7de1430"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 3
3d/truck_town/Images/choose_trailer.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/choose_trailer.png-655ee091ac0a8e8db872e684d92af7c9.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://Images/choose_trailer.png"
-source_md5="e0fce3a1711fd29ae0ca65cc68fe88ad"
-
 dest_files=[ "res://.import/choose_trailer.png-655ee091ac0a8e8db872e684d92af7c9.stex" ]
-dest_md5="1fdac0fd9d07f9fbd4457533ddeb20cc"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 5 - 3
3d/truck_town/Images/choose_van.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/choose_van.png-7feae3acf1caead6dd28bf86a912e079.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://Images/choose_van.png"
-source_md5="66c134dd13fa4b6d9c0cb3fad8949436"
-
 dest_files=[ "res://.import/choose_van.png-7feae3acf1caead6dd28bf86a912e079.stex" ]
-dest_md5="c3516ba2528a80d067d3702798213ec7"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 6 - 3
3d/truck_town/Images/grass.png.import

@@ -4,20 +4,22 @@ importer="texture"
 type="StreamTexture"
 path.s3tc="res://.import/grass.png-6ab6f9e06dc0919bf6b674e512573aeb.s3tc.stex"
 path.etc2="res://.import/grass.png-6ab6f9e06dc0919bf6b674e512573aeb.etc2.stex"
+metadata={
+"imported_formats": [ "s3tc", "etc2" ],
+"vram_texture": true
+}
 
 [deps]
 
 source_file="res://Images/grass.png"
-source_md5="89609533074cf9f2a59597ce7da97244"
-
 dest_files=[ "res://.import/grass.png-6ab6f9e06dc0919bf6b674e512573aeb.s3tc.stex", "res://.import/grass.png-6ab6f9e06dc0919bf6b674e512573aeb.etc2.stex" ]
-dest_md5="cd60aecf8b29efadd62de28c7a861800"
 
 [params]
 
 compress/mode=2
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=true
 flags/filter=true
@@ -27,6 +29,7 @@ flags/srgb=1
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=false

+ 4 - 62
3d/truck_town/car_select.tscn

@@ -5,15 +5,9 @@
 [ext_resource path="res://Images/choose_trailer.png" type="Texture" id=3]
 [ext_resource path="res://Images/choose_tow.png" type="Texture" id=4]
 
-[node name="base" type="Control" index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
+[node name="base" type="Control"]
 anchor_right = 1.0
 anchor_bottom = 1.0
-rect_pivot_offset = Vector2( 0, 0 )
-mouse_filter = 0
-mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
 script = ExtResource( 1 )
@@ -21,85 +15,33 @@ __meta__ = {
 "__editor_plugin_screen__": "2D"
 }
 
-[node name="van 1" type="Button" parent="." index="0"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="van 1" type="Button" parent="."]
 margin_left = 4.0
 margin_top = 160.0
 margin_right = 340.0
 margin_bottom = 400.0
-rect_pivot_offset = Vector2( 0, 0 )
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
 icon = ExtResource( 2 )
-flat = false
-align = 1
-_sections_unfolded = [ "Anchor", "Margin" ]
 
-[node name="van 2" type="Button" parent="." index="1"]
-
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="van 2" type="Button" parent="."]
 margin_left = 344.0
 margin_top = 160.0
 margin_right = 680.0
 margin_bottom = 401.0
-rect_pivot_offset = Vector2( 0, 0 )
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
 icon = ExtResource( 3 )
-flat = false
-align = 1
-_sections_unfolded = [ "Margin" ]
-
-[node name="van 3" type="Button" parent="." index="2"]
 
-anchor_left = 0.0
-anchor_top = 0.0
-anchor_right = 0.0
-anchor_bottom = 0.0
+[node name="van 3" type="Button" parent="."]
 margin_left = 684.0
 margin_top = 160.0
 margin_right = 1020.0
 margin_bottom = 400.0
-rect_pivot_offset = Vector2( 0, 0 )
-focus_mode = 2
-mouse_filter = 0
-mouse_default_cursor_shape = 0
 size_flags_horizontal = 2
 size_flags_vertical = 2
-toggle_mode = false
-enabled_focus_mode = 2
-shortcut = null
-group = null
 icon = ExtResource( 4 )
-flat = false
-align = 1
-_sections_unfolded = [ "Margin" ]
 
 [connection signal="pressed" from="van 1" to="." method="_on_van_1_pressed"]
-
 [connection signal="pressed" from="van 2" to="." method="_on_van_2_pressed"]
-
 [connection signal="pressed" from="van 3" to="." method="_on_van_3_pressed"]
-
-

+ 0 - 86
3d/truck_town/default_env.tres

@@ -1,103 +1,17 @@
 [gd_resource type="Environment" load_steps=2 format=2]
 
 [sub_resource type="ProceduralSky" id=1]
-
-radiance_size = 4
 sky_top_color = Color( 0.0470588, 0.454902, 0.976471, 1 )
 sky_horizon_color = Color( 0.482353, 0.784314, 0.94902, 1 )
 sky_curve = 0.25
-sky_energy = 1.0
 ground_bottom_color = Color( 0.193604, 0.40625, 0.33859, 1 )
 ground_horizon_color = Color( 0.482353, 0.788235, 0.952941, 1 )
 ground_curve = 0.01
-ground_energy = 1.0
-sun_color = Color( 1, 1, 1, 1 )
-sun_latitude = 35.0
-sun_longitude = 0.0
-sun_angle_min = 1.0
-sun_angle_max = 100.0
-sun_curve = 0.05
 sun_energy = 16.0
-texture_size = 2
-_sections_unfolded = [ "Ground", "Sky" ]
 
 [resource]
-
 background_mode = 2
 background_sky = SubResource( 1 )
-background_sky_custom_fov = 0.0
-background_color = Color( 0, 0, 0, 1 )
-background_energy = 1.0
-background_canvas_max_layer = 0
 ambient_light_color = Color( 0.347656, 0.347656, 0.347656, 1 )
-ambient_light_energy = 1.0
 ambient_light_sky_contribution = 0.2
-fog_enabled = false
-fog_color = Color( 0.5, 0.6, 0.7, 1 )
-fog_sun_color = Color( 1, 0.9, 0.7, 1 )
-fog_sun_amount = 0.0
-fog_depth_enabled = true
-fog_depth_begin = 10.0
-fog_depth_curve = 1.0
-fog_transmit_enabled = false
-fog_transmit_curve = 1.0
-fog_height_enabled = false
-fog_height_min = 0.0
-fog_height_max = 100.0
-fog_height_curve = 1.0
-tonemap_mode = 0
-tonemap_exposure = 1.0
-tonemap_white = 1.0
-auto_exposure_enabled = false
-auto_exposure_scale = 0.4
-auto_exposure_min_luma = 0.05
-auto_exposure_max_luma = 8.0
-auto_exposure_speed = 0.5
-ss_reflections_enabled = false
-ss_reflections_max_steps = 64
-ss_reflections_fade_in = 0.15
-ss_reflections_fade_out = 2.0
-ss_reflections_depth_tolerance = 0.2
-ss_reflections_roughness = true
-ssao_enabled = false
-ssao_radius = 1.0
-ssao_intensity = 1.0
-ssao_radius2 = 0.0
-ssao_intensity2 = 1.0
-ssao_bias = 0.01
-ssao_light_affect = 0.0
-ssao_color = Color( 0, 0, 0, 1 )
-ssao_quality = 0
-ssao_blur = 3
-ssao_edge_sharpness = 4.0
-dof_blur_far_enabled = false
-dof_blur_far_distance = 10.0
-dof_blur_far_transition = 5.0
-dof_blur_far_amount = 0.1
-dof_blur_far_quality = 1
-dof_blur_near_enabled = false
-dof_blur_near_distance = 2.0
-dof_blur_near_transition = 1.0
-dof_blur_near_amount = 0.1
-dof_blur_near_quality = 1
-glow_enabled = false
-glow_levels/1 = false
-glow_levels/2 = false
-glow_levels/3 = true
-glow_levels/4 = false
-glow_levels/5 = true
-glow_levels/6 = false
-glow_levels/7 = false
-glow_intensity = 0.8
-glow_strength = 1.0
-glow_bloom = 0.0
-glow_blend_mode = 2
-glow_hdr_threshold = 1.0
-glow_hdr_scale = 2.0
-glow_bicubic_upscale = false
-adjustment_enabled = false
-adjustment_brightness = 1.0
-adjustment_contrast = 1.0
-adjustment_saturation = 1.0
-_sections_unfolded = [ "Ambient Light", "Background" ]
 

+ 5 - 3
3d/truck_town/icon.png.import

@@ -3,20 +3,21 @@
 importer="texture"
 type="StreamTexture"
 path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
+metadata={
+"vram_texture": false
+}
 
 [deps]
 
 source_file="res://icon.png"
-source_md5="695ebada54b308bf05ee2e31a023973f"
-
 dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
-dest_md5="c0676ee0f90e2983c3b4b06a2a22dd98"
 
 [params]
 
 compress/mode=0
 compress/lossy_quality=0.7
 compress/hdr_mode=0
+compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
 flags/filter=true
@@ -26,6 +27,7 @@ flags/srgb=2
 process/fix_alpha_border=true
 process/premult_alpha=false
 process/HDR_as_SRGB=false
+process/invert_color=false
 stream=false
 size_limit=0
 detect_3d=true

+ 6 - 1
3d/truck_town/project.godot

@@ -6,7 +6,12 @@
 ;   [section] ; section goes between []
 ;   param=value ; assign values to parameters
 
-config_version=3
+config_version=4
+
+_global_script_classes=[  ]
+_global_script_class_icons={
+
+}
 
 [application]
 

+ 1 - 1
README.md

@@ -6,7 +6,7 @@ be used with [Godot Engine](https://godotengine.org), the open source
 
 ## Important note
 
-- The `master` branch is compatible with the latest Godot version (currently 3.0).
+- The `master` branch is compatible with the latest Godot version (currently 3.1).
 - Use the appropriate branch for your Godot version, such as the
   [`2.1`](https://github.com/godotengine/godot-demo-projects/tree/2.1) branch
   for Godot 2.1.x.

Some files were not shown because too many files changed in this diff