From b05eec6bf0d830c92b8d127c9d60a0f9f07a95f1 Mon Sep 17 00:00:00 2001 From: Relintai Date: Fri, 31 Jul 2020 02:12:23 +0200 Subject: [PATCH] Revert the editor to an earlier commit as the exports doesn't seem to work for me on head, and converted the icons from svg to png. --- HEADS | 2 +- game/modules/core_models/ceiling.gltf.import | 1 + game/modules/core_models/floor.gltf.import | 1 + game/modules/core_models/wall_xn.gltf.import | 1 + game/modules/core_models/wall_xp.gltf.import | 1 + game/modules/core_models/wall_zn.gltf.import | 1 + game/modules/core_models/wall_zp.gltf.import | 1 + game/ui/icons/icon_add.png | Bin 0 -> 564 bytes ...con_add.svg.import => icon_add.png.import} | 6 ++--- game/ui/icons/icon_add.svg | 1 - game/ui/icons/icon_edit.png | Bin 0 -> 627 bytes ...n_edit.svg.import => icon_edit.png.import} | 6 ++--- game/ui/icons/icon_edit.svg | 1 - game/ui/icons/icon_joy_axis.png | Bin 0 -> 689 bytes ...is.svg.import => icon_joy_axis.png.import} | 6 ++--- game/ui/icons/icon_joy_axis.svg | 1 - game/ui/icons/icon_joy_button.png | Bin 0 -> 703 bytes ....svg.import => icon_joy_button.png.import} | 6 ++--- game/ui/icons/icon_joy_button.svg | 1 - game/ui/icons/icon_keyboard.png | Bin 0 -> 739 bytes ...rd.svg.import => icon_keyboard.png.import} | 6 ++--- game/ui/icons/icon_keyboard.svg | 1 - game/ui/icons/icon_mouse.png | Bin 0 -> 689 bytes ...mouse.svg.import => icon_mouse.png.import} | 6 ++--- game/ui/icons/icon_mouse.svg | 1 - game/ui/icons/icon_remove.png | Bin 0 -> 615 bytes ...move.svg.import => icon_remove.png.import} | 6 ++--- game/ui/icons/icon_remove.svg | 1 - game/ui/keybinds/Keybinds.tscn | 24 +++++++++--------- 29 files changed, 40 insertions(+), 41 deletions(-) create mode 100644 game/ui/icons/icon_add.png rename game/ui/icons/{icon_add.svg.import => icon_add.png.import} (70%) delete mode 100644 game/ui/icons/icon_add.svg create mode 100644 game/ui/icons/icon_edit.png rename game/ui/icons/{icon_edit.svg.import => icon_edit.png.import} (70%) delete mode 100644 game/ui/icons/icon_edit.svg create mode 100644 game/ui/icons/icon_joy_axis.png rename game/ui/icons/{icon_joy_axis.svg.import => icon_joy_axis.png.import} (68%) delete mode 100644 game/ui/icons/icon_joy_axis.svg create mode 100644 game/ui/icons/icon_joy_button.png rename game/ui/icons/{icon_joy_button.svg.import => icon_joy_button.png.import} (68%) delete mode 100644 game/ui/icons/icon_joy_button.svg create mode 100644 game/ui/icons/icon_keyboard.png rename game/ui/icons/{icon_keyboard.svg.import => icon_keyboard.png.import} (68%) delete mode 100644 game/ui/icons/icon_keyboard.svg create mode 100644 game/ui/icons/icon_mouse.png rename game/ui/icons/{icon_mouse.svg.import => icon_mouse.png.import} (69%) delete mode 100644 game/ui/icons/icon_mouse.svg create mode 100644 game/ui/icons/icon_remove.png rename game/ui/icons/{icon_remove.svg.import => icon_remove.png.import} (69%) delete mode 100644 game/ui/icons/icon_remove.svg 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 0000000000000000000000000000000000000000..fafc1543c500fd6c0749f4373f1cec2d2999bf20 GIT binary patch literal 564 zcmV-40?Yl0P)EX>4Tx04R}tkv&MmKpe$iTcsiu2MdabWT;LSM5T1pDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0scmXsb<$CplX(p zP9}tGZdC}rB8X88B8IrcOnpuiQ}7&L_we!cF3PjK&;2?2l)T9RpFljzbi*RvAdYQX zI_G`jFe^z4@j3B?K^G)`x1ki;UEAVPqQ8p^1^LX=jG6ccIMPk8u;9luB}nOtQs zax9<<6_Voz|AXJ%nuX~pHz||=x?gPjV+;uH0?oQ@e;?a+^8^Sy16NwxUu^*KPtxmc zEpi0(Zvz+CZB5<-E_Z;TCtWfmM+(sN7Ye}p8GTa@7`O#`*WBJ(`#607GSpS-1~@nb z#*37_?(y!P&ffk#)9UXB66A8{+{!BA00006VoOIv03!g600MZy2UGw6010qNS#tmY z4c7nw4c7reD4Tcy000McNliru05M5KK~y-)V_={qc<|uC{|65q z{Kuz;iBd~O4PankgoQRaniUij7@0=X!Ei8uVgLZgZW5H=^g5#e0000 diff --git a/game/ui/icons/icon_edit.png b/game/ui/icons/icon_edit.png new file mode 100644 index 0000000000000000000000000000000000000000..37a0c837c771ab99b3b1de668ef6fb7ebdc17de6 GIT binary patch literal 627 zcmV-(0*w8MP)EX>4Tx04R}tkv&MmKpe$iTcsiu2MdabWT;LSM5T1pDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0scmXsb<$CplX(p zP9}tGZdC}rB8X88B8IrcOnpuiQ}7&L_we!cF3PjK&;2?2l)T9RpFljzbi*RvAdYQX zI_G`jFe^z4@j3B?K^G)`x1ki;UEAVPqQ8p^1^LX=jG6ccIMPk8u;9luB}nOtQs zax9<<6_Voz|AXJ%nuX~pHz||=x?gPjV+;uH0?oQ@e;?a+^8^Sy16NwxUu^*KPtxmc zEpi0(Zvz+CZB5<-E_Z;TCtWfmM+(sN7Ye}p8GTa@7`O#`*WBJ(`#607GSpS-1~@nb z#*37_?(y!P&ffk#)9UXB66A8{+{!BA00006VoOIv03!g600MZy2UGw6010qNS#tmY z4c7nw4c7reD4Tcy000McNliruf`Sb;bxe2+w?blD<5I-LFwg*B82m@(D<~*1lI#Usny4BE!`%S%m>|`F z)iB2Y|NmE!YycY@TNVQY!%GGRhBtrz{>>%Je-9r%41M_UVJJ diff --git a/game/ui/icons/icon_joy_axis.png b/game/ui/icons/icon_joy_axis.png new file mode 100644 index 0000000000000000000000000000000000000000..f788feb86c10ba5c453ac324ecb04f01804fd07a GIT binary patch literal 689 zcmV;i0#5yjP)EX>4Tx04R}tkv&MmKpe$iTcsiu2MdabWT;LSM5T1pDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0scmXsb<$CplX(p zP9}tGZdC}rB8X88B8IrcOnpuiQ}7&L_we!cF3PjK&;2?2l)T9RpFljzbi*RvAdYQX zI_G`jFe^z4@j3B?K^G)`x1ki;UEAVPqQ8p^1^LX=jG6ccIMPk8u;9luB}nOtQs zax9<<6_Voz|AXJ%nuX~pHz||=x?gPjV+;uH0?oQ@e;?a+^8^Sy16NwxUu^*KPtxmc zEpi0(Zvz+CZB5<-E_Z;TCtWfmM+(sN7Ye}p8GTa@7`O#`*WBJ(`#607GSpS-1~@nb z#*37_?(y!P&ffk#)9UXB66A8{+{!BA00006VoOIv03!g600MZy2UGw6010qNS#tmY z4c7nw4c7reD4Tcy000McNliruu%28I9t0Io?yK~y-)#gfep!Y~X*KPPMf z2S-_>WdR0ZB$$W4EgJdIHBxh-RR}3GLIR)SM7G|G4SX2{03xyja0IZfDQ0G40Dy=N zwZ&r?08rIU;jLk2!^|eexP9AT2JbeWz4w>u22~0r?9zvobj%#~V>(w6Ij48I&L@RI zRdumK*L6)s)H>&$kV6P diff --git a/game/ui/icons/icon_joy_button.png b/game/ui/icons/icon_joy_button.png new file mode 100644 index 0000000000000000000000000000000000000000..752dc6125c883a412d449915792cc660b88bd8e5 GIT binary patch literal 703 zcmV;w0zmzVP)EX>4Tx04R}tkv&MmKpe$iTcsiu2MdabWT;LSM5T1pDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0scmXsb<$CplX(p zP9}tGZdC}rB8X88B8IrcOnpuiQ}7&L_we!cF3PjK&;2?2l)T9RpFljzbi*RvAdYQX zI_G`jFe^z4@j3B?K^G)`x1ki;UEAVPqQ8p^1^LX=jG6ccIMPk8u;9luB}nOtQs zax9<<6_Voz|AXJ%nuX~pHz||=x?gPjV+;uH0?oQ@e;?a+^8^Sy16NwxUu^*KPtxmc zEpi0(Zvz+CZB5<-E_Z;TCtWfmM+(sN7Ye}p8GTa@7`O#`*WBJ(`#607GSpS-1~@nb z#*37_?(y!P&ffk#)9UXB66A8{+{!BA00006VoOIv03!g600MZy2UGw6010qNS#tmY z4c7nw4c7reD4Tcy000McNliru=K~y-)#Zuc1f4YuECc~S+qT!AOhmn^7S6dUiRg}L znpzRb08~>#RW|?*01ylik-fF{;=S+3aoo*FY&76om=M9tWnI?=5s@*b4C#_c=bV{4 zW6TM_Hnhp}3L=tu?|T4fn#SIZ(@oxZ=UlSh2A?{I`00o_Gj}hW?1o_=W-e!VEd2xg l{SVI3fKca$Syc diff --git a/game/ui/icons/icon_keyboard.png b/game/ui/icons/icon_keyboard.png new file mode 100644 index 0000000000000000000000000000000000000000..cd939c352e4962c9a9bacf6f9d0baead32f036bb GIT binary patch literal 739 zcmV<90v!E`P)EX>4Tx04R}tkv&MmKpe$iTcsiu2MdabWT;LSM5T1pDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0scmXsb<$CplX(p zP9}tGZdC}rB8X88B8IrcOnpuiQ}7&L_we!cF3PjK&;2?2l)T9RpFljzbi*RvAdYQX zI_G`jFe^z4@j3B?K^G)`x1ki;UEAVPqQ8p^1^LX=jG6ccIMPk8u;9luB}nOtQs zax9<<6_Voz|AXJ%nuX~pHz||=x?gPjV+;uH0?oQ@e;?a+^8^Sy16NwxUu^*KPtxmc zEpi0(Zvz+CZB5<-E_Z;TCtWfmM+(sN7Ye}p8GTa@7`O#`*WBJ(`#607GSpS-1~@nb z#*37_?(y!P&ffk#)9UXB66A8{+{!BA00006VoOIv03!g600MZy2UGw6010qNS#tmY z4c7nw4c7reD4Tcy000McNliruBCo6e$>`cM8;KLm7PsB$jpkFRoQXJ%*q%uv(%b81-9LaqF5wJ z(o;&U>k1kH#+Z2!1Q*wJHvk471BmEa{=5IKrVX$x0jsY70Kz=aL*Msf0P#0~RuxWN z&>CxKkGV;~p~Lp>Ulb70IZe|sGlyOFKg+TSfYTEoB9Y@bTdno5;|-leB>KrU-T|;z VPaw!=umS)8002ovPDHLkV1mntK{x;a literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..eebefdcdd1840f2f52f0d7f096c0e4e655c72c68 GIT binary patch literal 689 zcmV;i0#5yjP)EX>4Tx04R}tkv&MmKpe$iTcsiu2MdabWT;LSM5T1pDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0scmXsb<$CplX(p zP9}tGZdC}rB8X88B8IrcOnpuiQ}7&L_we!cF3PjK&;2?2l)T9RpFljzbi*RvAdYQX zI_G`jFe^z4@j3B?K^G)`x1ki;UEAVPqQ8p^1^LX=jG6ccIMPk8u;9luB}nOtQs zax9<<6_Voz|AXJ%nuX~pHz||=x?gPjV+;uH0?oQ@e;?a+^8^Sy16NwxUu^*KPtxmc zEpi0(Zvz+CZB5<-E_Z;TCtWfmM+(sN7Ye}p8GTa@7`O#`*WBJ(`#607GSpS-1~@nb z#*37_?(y!P&ffk#)9UXB66A8{+{!BA00006VoOIv03!g600MZy2UGw6010qNS#tmY z4c7nw4c7reD4Tcy000McNliru$+md)YhW?G?m+tb`?OVgvjaNf$}; zp|hhnA!%)92LQ8Px&m+tA*`|hNfm${01jM6l644SnyX;@?s+6PIl#D}MHBp$7&XyK zOx}AY$M~sYz@xx(&jH#3K$`@RYzhEP65yOW0;n_Qz4!i{oI?LInc1?pST_JoZ2pR# X40SZZIS6T+00000NkvXXu0mjf#8V}L literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..5df461d0c26d1433fc5e33270033f40f7d060833 GIT binary patch literal 615 zcmV-t0+{`YP)EX>4Tx04R}tkv&MmKpe$iTcsiu2MdabWT;LSM5T1pDionYs1;guFuC*#nlvOS zE{=k0!NHHks)LKOt`4q(Aou~|}?mh0_0scmXsb<$CplX(p zP9}tGZdC}rB8X88B8IrcOnpuiQ}7&L_we!cF3PjK&;2?2l)T9RpFljzbi*RvAdYQX zI_G`jFe^z4@j3B?K^G)`x1ki;UEAVPqQ8p^1^LX=jG6ccIMPk8u;9luB}nOtQs zax9<<6_Voz|AXJ%nuX~pHz||=x?gPjV+;uH0?oQ@e;?a+^8^Sy16NwxUu^*KPtxmc zEpi0(Zvz+CZB5<-E_Z;TCtWfmM+(sN7Ye}p8GTa@7`O#`*WBJ(`#607GSpS-1~@nb z#*37_?(y!P&ffk#)9UXB66A8{+{!BA00006VoOIv03!g600MZy2UGw6010qNS#tmY z4c7nw4c7reD4Tcy000McNliruFt0+Hz}<7} zzwY4#zd^Bsl+q??>D28c*INQf(aeq>v7|U{KPQtgGFuwrZcqRK002ovPDHLkV1lG) B2%rD} literal 0 HcmV?d00001 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"]