diff --git a/HEADS b/HEADS index 854e04dd..05c10bca 100644 --- a/HEADS +++ b/HEADS @@ -1 +1 @@ -{"engine": {"3.2": "78a6a578843928017c1fe40f23a31a620e76d2ef", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "bc2ee7171a29d02a4687eaddd91374e127cf2b88"}, "entity_spell_system": {"master": "0ac9a8770e1855613bdfbffc5c5e0095a2058717"}, "ui_extensions": {"master": "6f07f31ff5db2974832b810b737db7caf0b2fc59"}, "voxelman": {"master": "768728139ede479dad006913e2f86d3f85edae57"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "a9bab9896de71966b9c9056869871e618c64cba7"}, "procedural_animations": {"master": "8426e2c976e9f9cb82bca636c0ec6e79ad7b3bcb"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "0ed644e4a4e7867a49fbe7c727b500305f7077f8"}, "mesh_utils": {"master": "65a802ff39a601bd1a55675023871e09500943ef"}, "broken_seals_module": {"master": "8c4b32d3932ccb043b8f6c92c1277547750fe391"}, "thread_pool": {"master": "164ad82feb05842cb944c2907b65e521f8c7c465"}} \ No newline at end of file +{"engine": {"3.2": "36b746d90393299b81ecb991f4aa94a8d742fd11", "master": "8c73e813134001e575b6f59e3b0100471c007410"}, "world_generator": {"master": "bc2ee7171a29d02a4687eaddd91374e127cf2b88"}, "entity_spell_system": {"master": "0ac9a8770e1855613bdfbffc5c5e0095a2058717"}, "ui_extensions": {"master": "ca7df8435154d1146be36c4fc97e6cc7092d3eb9"}, "voxelman": {"master": "768728139ede479dad006913e2f86d3f85edae57"}, "texture_packer": {"master": "f98b7410cd3f2a743cb57456910ad9f93ef89937"}, "fastnoise": {"master": "d0e3f1c759332cf0d9a5d7e0e71d0b0278310651"}, "mesh_data_resource": {"master": "a9bab9896de71966b9c9056869871e618c64cba7"}, "procedural_animations": {"master": "8426e2c976e9f9cb82bca636c0ec6e79ad7b3bcb"}, "ess_data": {"master": "3bd637fdd3304b64a18287a49a6b7387acf2f5de"}, "props": {"master": "0ed644e4a4e7867a49fbe7c727b500305f7077f8"}, "mesh_utils": {"master": "65a802ff39a601bd1a55675023871e09500943ef"}, "broken_seals_module": {"master": "8c4b32d3932ccb043b8f6c92c1277547750fe391"}, "thread_pool": {"master": "164ad82feb05842cb944c2907b65e521f8c7c465"}} \ No newline at end of file diff --git a/game/modules/core_models/ceiling.gltf.import b/game/modules/core_models/ceiling.gltf.import index 2121332a..c2bed60c 100644 --- a/game/modules/core_models/ceiling.gltf.import +++ b/game/modules/core_models/ceiling.gltf.import @@ -11,6 +11,7 @@ dest_files=[ "res://.import/ceiling.gltf-31931818101359c78d30eea12b4d98c6.res" ] [params] +import_type=0 collider_type=0 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/core_models/floor.gltf.import b/game/modules/core_models/floor.gltf.import index a2e28070..7ee7a6fd 100644 --- a/game/modules/core_models/floor.gltf.import +++ b/game/modules/core_models/floor.gltf.import @@ -11,6 +11,7 @@ dest_files=[ "res://.import/floor.gltf-c87d2b449be23a2fbf8be35d435399f4.res" ] [params] +import_type=0 collider_type=4 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/core_models/wall_xn.gltf.import b/game/modules/core_models/wall_xn.gltf.import index c90e6923..e2be8e1d 100644 --- a/game/modules/core_models/wall_xn.gltf.import +++ b/game/modules/core_models/wall_xn.gltf.import @@ -11,6 +11,7 @@ dest_files=[ "res://.import/wall_xn.gltf-fb5dd2da9017722351efa0181f866a6e.res" ] [params] +import_type=0 collider_type=4 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/core_models/wall_xp.gltf.import b/game/modules/core_models/wall_xp.gltf.import index 7653dd84..11bc188a 100644 --- a/game/modules/core_models/wall_xp.gltf.import +++ b/game/modules/core_models/wall_xp.gltf.import @@ -11,6 +11,7 @@ dest_files=[ "res://.import/wall_xp.gltf-a08b64506fd911056171688cd8aaff18.res" ] [params] +import_type=0 collider_type=4 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/core_models/wall_zn.gltf.import b/game/modules/core_models/wall_zn.gltf.import index b071a97f..f865b5d7 100644 --- a/game/modules/core_models/wall_zn.gltf.import +++ b/game/modules/core_models/wall_zn.gltf.import @@ -11,6 +11,7 @@ dest_files=[ "res://.import/wall_zn.gltf-08602f55eaf79f19f3aed3d2b3757b33.res" ] [params] +import_type=0 collider_type=4 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/modules/core_models/wall_zp.gltf.import b/game/modules/core_models/wall_zp.gltf.import index c857e526..55121b39 100644 --- a/game/modules/core_models/wall_zp.gltf.import +++ b/game/modules/core_models/wall_zp.gltf.import @@ -11,6 +11,7 @@ dest_files=[ "res://.import/wall_zp.gltf-abe4ff43d2ed09dbbdf1f9ddde6279bb.res" ] [params] +import_type=0 collider_type=4 offset=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 ) diff --git a/game/ui/icons/icon_add.png b/game/ui/icons/icon_add.png new file mode 100644 index 00000000..fafc1543 Binary files /dev/null and b/game/ui/icons/icon_add.png differ diff --git a/game/ui/icons/icon_add.svg.import b/game/ui/icons/icon_add.png.import similarity index 70% rename from game/ui/icons/icon_add.svg.import rename to game/ui/icons/icon_add.png.import index 0b9fed67..4a08d749 100644 --- a/game/ui/icons/icon_add.svg.import +++ b/game/ui/icons/icon_add.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/icon_add.svg-8d234c23ab44bacb67bdfe3f0ee81a47.stex" +path="res://.import/icon_add.png-617e288ed3bf67d2ba76ab9f47fbf4f0.stex" metadata={ "vram_texture": false } [deps] -source_file="res://ui/icons/icon_add.svg" -dest_files=[ "res://.import/icon_add.svg-8d234c23ab44bacb67bdfe3f0ee81a47.stex" ] +source_file="res://ui/icons/icon_add.png" +dest_files=[ "res://.import/icon_add.png-617e288ed3bf67d2ba76ab9f47fbf4f0.stex" ] [params] diff --git a/game/ui/icons/icon_add.svg b/game/ui/icons/icon_add.svg deleted file mode 100644 index afad08a2..00000000 --- a/game/ui/icons/icon_add.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/game/ui/icons/icon_edit.png b/game/ui/icons/icon_edit.png new file mode 100644 index 00000000..37a0c837 Binary files /dev/null and b/game/ui/icons/icon_edit.png differ diff --git a/game/ui/icons/icon_edit.svg.import b/game/ui/icons/icon_edit.png.import similarity index 70% rename from game/ui/icons/icon_edit.svg.import rename to game/ui/icons/icon_edit.png.import index c40a25df..723958e3 100644 --- a/game/ui/icons/icon_edit.svg.import +++ b/game/ui/icons/icon_edit.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/icon_edit.svg-1aba0748a13b323d6887f1edfd72e194.stex" +path="res://.import/icon_edit.png-4e4d30376f2cfaefd3d39b2dce70ee57.stex" metadata={ "vram_texture": false } [deps] -source_file="res://ui/icons/icon_edit.svg" -dest_files=[ "res://.import/icon_edit.svg-1aba0748a13b323d6887f1edfd72e194.stex" ] +source_file="res://ui/icons/icon_edit.png" +dest_files=[ "res://.import/icon_edit.png-4e4d30376f2cfaefd3d39b2dce70ee57.stex" ] [params] diff --git a/game/ui/icons/icon_edit.svg b/game/ui/icons/icon_edit.svg deleted file mode 100644 index 6fc7ae01..00000000 --- a/game/ui/icons/icon_edit.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/game/ui/icons/icon_joy_axis.png b/game/ui/icons/icon_joy_axis.png new file mode 100644 index 00000000..f788feb8 Binary files /dev/null and b/game/ui/icons/icon_joy_axis.png differ diff --git a/game/ui/icons/icon_joy_axis.svg.import b/game/ui/icons/icon_joy_axis.png.import similarity index 68% rename from game/ui/icons/icon_joy_axis.svg.import rename to game/ui/icons/icon_joy_axis.png.import index d43316af..e483682b 100644 --- a/game/ui/icons/icon_joy_axis.svg.import +++ b/game/ui/icons/icon_joy_axis.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/icon_joy_axis.svg-df8e548a1140e7ce99b04939b395b138.stex" +path="res://.import/icon_joy_axis.png-d24cf014cc6938689bf543968d165c5a.stex" metadata={ "vram_texture": false } [deps] -source_file="res://ui/icons/icon_joy_axis.svg" -dest_files=[ "res://.import/icon_joy_axis.svg-df8e548a1140e7ce99b04939b395b138.stex" ] +source_file="res://ui/icons/icon_joy_axis.png" +dest_files=[ "res://.import/icon_joy_axis.png-d24cf014cc6938689bf543968d165c5a.stex" ] [params] diff --git a/game/ui/icons/icon_joy_axis.svg b/game/ui/icons/icon_joy_axis.svg deleted file mode 100644 index 1ab65f0a..00000000 --- a/game/ui/icons/icon_joy_axis.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/game/ui/icons/icon_joy_button.png b/game/ui/icons/icon_joy_button.png new file mode 100644 index 00000000..752dc612 Binary files /dev/null and b/game/ui/icons/icon_joy_button.png differ diff --git a/game/ui/icons/icon_joy_button.svg.import b/game/ui/icons/icon_joy_button.png.import similarity index 68% rename from game/ui/icons/icon_joy_button.svg.import rename to game/ui/icons/icon_joy_button.png.import index e054f36a..a3c5873d 100644 --- a/game/ui/icons/icon_joy_button.svg.import +++ b/game/ui/icons/icon_joy_button.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/icon_joy_button.svg-90efe2841da127b700c9fe4f1211a539.stex" +path="res://.import/icon_joy_button.png-393039a547dbf39d452b3aafcee9f20c.stex" metadata={ "vram_texture": false } [deps] -source_file="res://ui/icons/icon_joy_button.svg" -dest_files=[ "res://.import/icon_joy_button.svg-90efe2841da127b700c9fe4f1211a539.stex" ] +source_file="res://ui/icons/icon_joy_button.png" +dest_files=[ "res://.import/icon_joy_button.png-393039a547dbf39d452b3aafcee9f20c.stex" ] [params] diff --git a/game/ui/icons/icon_joy_button.svg b/game/ui/icons/icon_joy_button.svg deleted file mode 100644 index 080d91ad..00000000 --- a/game/ui/icons/icon_joy_button.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/game/ui/icons/icon_keyboard.png b/game/ui/icons/icon_keyboard.png new file mode 100644 index 00000000..cd939c35 Binary files /dev/null and b/game/ui/icons/icon_keyboard.png differ diff --git a/game/ui/icons/icon_keyboard.svg.import b/game/ui/icons/icon_keyboard.png.import similarity index 68% rename from game/ui/icons/icon_keyboard.svg.import rename to game/ui/icons/icon_keyboard.png.import index de95ebee..4419622d 100644 --- a/game/ui/icons/icon_keyboard.svg.import +++ b/game/ui/icons/icon_keyboard.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/icon_keyboard.svg-48afc1010696d26403af4139c2b28ebf.stex" +path="res://.import/icon_keyboard.png-58b4ebdc3868706f0d2ebc63fcba3a74.stex" metadata={ "vram_texture": false } [deps] -source_file="res://ui/icons/icon_keyboard.svg" -dest_files=[ "res://.import/icon_keyboard.svg-48afc1010696d26403af4139c2b28ebf.stex" ] +source_file="res://ui/icons/icon_keyboard.png" +dest_files=[ "res://.import/icon_keyboard.png-58b4ebdc3868706f0d2ebc63fcba3a74.stex" ] [params] diff --git a/game/ui/icons/icon_keyboard.svg b/game/ui/icons/icon_keyboard.svg deleted file mode 100644 index 75b62fc0..00000000 --- a/game/ui/icons/icon_keyboard.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/game/ui/icons/icon_mouse.png b/game/ui/icons/icon_mouse.png new file mode 100644 index 00000000..eebefdcd Binary files /dev/null and b/game/ui/icons/icon_mouse.png differ diff --git a/game/ui/icons/icon_mouse.svg.import b/game/ui/icons/icon_mouse.png.import similarity index 69% rename from game/ui/icons/icon_mouse.svg.import rename to game/ui/icons/icon_mouse.png.import index d8fd806d..4d1b8c03 100644 --- a/game/ui/icons/icon_mouse.svg.import +++ b/game/ui/icons/icon_mouse.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/icon_mouse.svg-92245f2e2690694f01e281113add7d2d.stex" +path="res://.import/icon_mouse.png-5bef59a63732b271e4a97478075d6992.stex" metadata={ "vram_texture": false } [deps] -source_file="res://ui/icons/icon_mouse.svg" -dest_files=[ "res://.import/icon_mouse.svg-92245f2e2690694f01e281113add7d2d.stex" ] +source_file="res://ui/icons/icon_mouse.png" +dest_files=[ "res://.import/icon_mouse.png-5bef59a63732b271e4a97478075d6992.stex" ] [params] diff --git a/game/ui/icons/icon_mouse.svg b/game/ui/icons/icon_mouse.svg deleted file mode 100644 index 21751208..00000000 --- a/game/ui/icons/icon_mouse.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/game/ui/icons/icon_remove.png b/game/ui/icons/icon_remove.png new file mode 100644 index 00000000..5df461d0 Binary files /dev/null and b/game/ui/icons/icon_remove.png differ diff --git a/game/ui/icons/icon_remove.svg.import b/game/ui/icons/icon_remove.png.import similarity index 69% rename from game/ui/icons/icon_remove.svg.import rename to game/ui/icons/icon_remove.png.import index 96744964..cd70e3f6 100644 --- a/game/ui/icons/icon_remove.svg.import +++ b/game/ui/icons/icon_remove.png.import @@ -2,15 +2,15 @@ importer="texture" type="StreamTexture" -path="res://.import/icon_remove.svg-997114201fcc93bffd099fce5ecc1ae7.stex" +path="res://.import/icon_remove.png-05b3a725226167bddcdc3b55463863b5.stex" metadata={ "vram_texture": false } [deps] -source_file="res://ui/icons/icon_remove.svg" -dest_files=[ "res://.import/icon_remove.svg-997114201fcc93bffd099fce5ecc1ae7.stex" ] +source_file="res://ui/icons/icon_remove.png" +dest_files=[ "res://.import/icon_remove.png-05b3a725226167bddcdc3b55463863b5.stex" ] [params] diff --git a/game/ui/icons/icon_remove.svg b/game/ui/icons/icon_remove.svg deleted file mode 100644 index 5bcdf8e5..00000000 --- a/game/ui/icons/icon_remove.svg +++ /dev/null @@ -1 +0,0 @@ - diff --git a/game/ui/keybinds/Keybinds.tscn b/game/ui/keybinds/Keybinds.tscn index 5cf9150c..c5046e3b 100644 --- a/game/ui/keybinds/Keybinds.tscn +++ b/game/ui/keybinds/Keybinds.tscn @@ -3,13 +3,13 @@ [ext_resource path="res://ui/keybinds/Keybinds.gd" type="Script" id=1] [ext_resource path="res://ui/theme/ui_theme.tres" type="Theme" id=2] [ext_resource path="res://ui/keybinds/KeybindCategory.tscn" type="PackedScene" id=3] -[ext_resource path="res://ui/icons/icon_mouse.svg" type="Texture" id=4] -[ext_resource path="res://ui/icons/icon_joy_axis.svg" type="Texture" id=5] -[ext_resource path="res://ui/icons/icon_keyboard.svg" type="Texture" id=6] -[ext_resource path="res://ui/icons/icon_edit.svg" type="Texture" id=7] -[ext_resource path="res://ui/icons/icon_add.svg" type="Texture" id=8] -[ext_resource path="res://ui/icons/icon_remove.svg" type="Texture" id=9] -[ext_resource path="res://ui/icons/icon_joy_button.svg" type="Texture" id=10] +[ext_resource path="res://ui/icons/icon_mouse.png" type="Texture" id=4] +[ext_resource path="res://ui/icons/icon_keyboard.png" type="Texture" id=5] +[ext_resource path="res://ui/icons/icon_joy_button.png" type="Texture" id=6] +[ext_resource path="res://ui/icons/icon_remove.png" type="Texture" id=7] +[ext_resource path="res://ui/icons/icon_add.png" type="Texture" id=8] +[ext_resource path="res://ui/icons/icon_edit.png" type="Texture" id=9] +[ext_resource path="res://ui/icons/icon_joy_axis.png" type="Texture" id=10] [node name="KeybindWindow" type="PanelContainer"] anchor_right = 1.0 @@ -52,11 +52,11 @@ margin_bottom = 554.0 size_flags_horizontal = 3 size_flags_vertical = 3 add_texture = ExtResource( 8 ) -remove_texture = ExtResource( 9 ) -edit_texture = ExtResource( 7 ) -keyboard_texture = ExtResource( 6 ) -joybutton_texture = ExtResource( 10 ) -joyaxis_texture = ExtResource( 5 ) +remove_texture = ExtResource( 7 ) +edit_texture = ExtResource( 9 ) +keyboard_texture = ExtResource( 5 ) +joybutton_texture = ExtResource( 6 ) +joyaxis_texture = ExtResource( 10 ) mouse_texture = ExtResource( 4 ) [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"]