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.

This commit is contained in:
Relintai 2020-07-31 02:12:23 +02:00
parent 0785d99415
commit b05eec6bf0
29 changed files with 40 additions and 41 deletions

2
HEADS
View File

@ -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"}} {"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"}}

View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/ceiling.gltf-31931818101359c78d30eea12b4d98c6.res" ]
[params] [params]
import_type=0
collider_type=0 collider_type=0
offset=Vector3( 0, 0, 0 ) offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 )

View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/floor.gltf-c87d2b449be23a2fbf8be35d435399f4.res" ]
[params] [params]
import_type=0
collider_type=4 collider_type=4
offset=Vector3( 0, 0, 0 ) offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 )

View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/wall_xn.gltf-fb5dd2da9017722351efa0181f866a6e.res" ]
[params] [params]
import_type=0
collider_type=4 collider_type=4
offset=Vector3( 0, 0, 0 ) offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 )

View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/wall_xp.gltf-a08b64506fd911056171688cd8aaff18.res" ]
[params] [params]
import_type=0
collider_type=4 collider_type=4
offset=Vector3( 0, 0, 0 ) offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 )

View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/wall_zn.gltf-08602f55eaf79f19f3aed3d2b3757b33.res" ]
[params] [params]
import_type=0
collider_type=4 collider_type=4
offset=Vector3( 0, 0, 0 ) offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 )

View File

@ -11,6 +11,7 @@ dest_files=[ "res://.import/wall_zp.gltf-abe4ff43d2ed09dbbdf1f9ddde6279bb.res" ]
[params] [params]
import_type=0
collider_type=4 collider_type=4
offset=Vector3( 0, 0, 0 ) offset=Vector3( 0, 0, 0 )
rotation=Vector3( 0, 0, 0 ) rotation=Vector3( 0, 0, 0 )

BIN
game/ui/icons/icon_add.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 564 B

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/icon_add.svg-8d234c23ab44bacb67bdfe3f0ee81a47.stex" path="res://.import/icon_add.png-617e288ed3bf67d2ba76ab9f47fbf4f0.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://ui/icons/icon_add.svg" source_file="res://ui/icons/icon_add.png"
dest_files=[ "res://.import/icon_add.svg-8d234c23ab44bacb67bdfe3f0ee81a47.stex" ] dest_files=[ "res://.import/icon_add.png-617e288ed3bf67d2ba76ab9f47fbf4f0.stex" ]
[params] [params]

View File

@ -1 +0,0 @@
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m7 1v6h-6v2h6v6h2v-6h6v-2h-6v-6z" fill="#e0e0e0"/></svg>

Before

Width:  |  Height:  |  Size: 149 B

BIN
game/ui/icons/icon_edit.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 627 B

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/icon_edit.svg-1aba0748a13b323d6887f1edfd72e194.stex" path="res://.import/icon_edit.png-4e4d30376f2cfaefd3d39b2dce70ee57.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://ui/icons/icon_edit.svg" source_file="res://ui/icons/icon_edit.png"
dest_files=[ "res://.import/icon_edit.svg-1aba0748a13b323d6887f1edfd72e194.stex" ] dest_files=[ "res://.import/icon_edit.png-4e4d30376f2cfaefd3d39b2dce70ee57.stex" ]
[params] [params]

View File

@ -1 +0,0 @@
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m7 1c-.554 0-1 .446-1 1v2h4v-2c0-.554-.446-1-1-1zm-1 4v7l2 3 2-3v-7zm1 1h1v5h-1z" fill="#e0e0e0"/></svg>

Before

Width:  |  Height:  |  Size: 197 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 689 B

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/icon_joy_axis.svg-df8e548a1140e7ce99b04939b395b138.stex" path="res://.import/icon_joy_axis.png-d24cf014cc6938689bf543968d165c5a.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://ui/icons/icon_joy_axis.svg" source_file="res://ui/icons/icon_joy_axis.png"
dest_files=[ "res://.import/icon_joy_axis.svg-df8e548a1140e7ce99b04939b395b138.stex" ] dest_files=[ "res://.import/icon_joy_axis.png-d24cf014cc6938689bf543968d165c5a.stex" ]
[params] [params]

View File

@ -1 +0,0 @@
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><g transform="translate(0 -1036.4)"><path d="m27 1038.4h7v14h-7z" fill="#fff" fill-opacity=".99608"/><g fill="#e0e0e0"><path d="m3 1a2 2 0 0 0 -2 2v10a2 2 0 0 0 2 2h12v-14zm4 2h2a1 1 0 0 1 1 1v2h2a1 1 0 0 1 1 1v2a1 1 0 0 1 -1 1h-2v2a1 1 0 0 1 -1 1h-2a1 1 0 0 1 -1-1v-2h-2a1 1 0 0 1 -1-1v-2a1 1 0 0 1 1-1h2v-2a1 1 0 0 1 1-1z" fill-opacity=".99608" transform="translate(0 1036.4)"/><circle cx="8" cy="1044.4" r="1"/></g></g></svg>

Before

Width:  |  Height:  |  Size: 512 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 703 B

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/icon_joy_button.svg-90efe2841da127b700c9fe4f1211a539.stex" path="res://.import/icon_joy_button.png-393039a547dbf39d452b3aafcee9f20c.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://ui/icons/icon_joy_button.svg" source_file="res://ui/icons/icon_joy_button.png"
dest_files=[ "res://.import/icon_joy_button.svg-90efe2841da127b700c9fe4f1211a539.stex" ] dest_files=[ "res://.import/icon_joy_button.png-393039a547dbf39d452b3aafcee9f20c.stex" ]
[params] [params]

View File

@ -1 +0,0 @@
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><g fill-opacity=".99608" transform="translate(0 -1036.4)"><path d="m27 1038.4h7v14h-7z" fill="#fff"/><path d="m1 1v14h12c1.1046 0 2-.8954 2-2v-10c0-1.1046-.89543-2-2-2zm7 1a2 2 0 0 1 2 2 2 2 0 0 1 -2 2 2 2 0 0 1 -2-2 2 2 0 0 1 2-2zm-4 4a2 2 0 0 1 2 2 2 2 0 0 1 -2 2 2 2 0 0 1 -2-2 2 2 0 0 1 2-2zm8 0a2 2 0 0 1 2 2 2 2 0 0 1 -2 2 2 2 0 0 1 -2-2 2 2 0 0 1 2-2zm-4 4a2 2 0 0 1 2 2 2 2 0 0 1 -2 2 2 2 0 0 1 -2-2 2 2 0 0 1 2-2z" fill="#e0e0e0" transform="translate(0 1036.4)"/></g></svg>

Before

Width:  |  Height:  |  Size: 566 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 739 B

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/icon_keyboard.svg-48afc1010696d26403af4139c2b28ebf.stex" path="res://.import/icon_keyboard.png-58b4ebdc3868706f0d2ebc63fcba3a74.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://ui/icons/icon_keyboard.svg" source_file="res://ui/icons/icon_keyboard.png"
dest_files=[ "res://.import/icon_keyboard.svg-48afc1010696d26403af4139c2b28ebf.stex" ] dest_files=[ "res://.import/icon_keyboard.png-58b4ebdc3868706f0d2ebc63fcba3a74.stex" ]
[params] [params]

View File

@ -1 +0,0 @@
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><g fill-opacity=".99608" transform="translate(0 -1036.4)"><path d="m4 2a1 1 0 0 0 -1 1v9.084a1 .91667 0 0 0 1 .91602h8a1 .91667 0 0 0 1-.91602v-9.084a1 1 0 0 0 -1-1zm-3 2v9a2 2 0 0 0 2 2h10a2 2 0 0 0 2-2v-9h-1v9a.99998.99998 0 0 1 -1 1h-10a1 1 0 0 1 -1-1v-9zm4 0h2v3l2-3h2l-2 3 2 4h-2l-2-4v4h-2z" fill="#e0e0e0" transform="translate(0 1036.4)"/><path d="m27 1038.4h7v14h-7z" fill="#fff"/></g></svg>

Before

Width:  |  Height:  |  Size: 482 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 689 B

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/icon_mouse.svg-92245f2e2690694f01e281113add7d2d.stex" path="res://.import/icon_mouse.png-5bef59a63732b271e4a97478075d6992.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://ui/icons/icon_mouse.svg" source_file="res://ui/icons/icon_mouse.png"
dest_files=[ "res://.import/icon_mouse.svg-92245f2e2690694f01e281113add7d2d.stex" ] dest_files=[ "res://.import/icon_mouse.png-5bef59a63732b271e4a97478075d6992.stex" ]
[params] [params]

View File

@ -1 +0,0 @@
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m7 1.1016a5 5 0 0 0 -4 4.8984h4zm2 .0039063v4.8945h4a5 5 0 0 0 -4-4.8945zm-6 6.8945v2a5 5 0 0 0 5 5 5 5 0 0 0 5-5v-2z" fill="#e0e0e0"/></svg>

Before

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 615 B

View File

@ -2,15 +2,15 @@
importer="texture" importer="texture"
type="StreamTexture" type="StreamTexture"
path="res://.import/icon_remove.svg-997114201fcc93bffd099fce5ecc1ae7.stex" path="res://.import/icon_remove.png-05b3a725226167bddcdc3b55463863b5.stex"
metadata={ metadata={
"vram_texture": false "vram_texture": false
} }
[deps] [deps]
source_file="res://ui/icons/icon_remove.svg" source_file="res://ui/icons/icon_remove.png"
dest_files=[ "res://.import/icon_remove.svg-997114201fcc93bffd099fce5ecc1ae7.stex" ] dest_files=[ "res://.import/icon_remove.png-05b3a725226167bddcdc3b55463863b5.stex" ]
[params] [params]

View File

@ -1 +0,0 @@
<svg height="16" viewBox="0 0 16 16" width="16" xmlns="http://www.w3.org/2000/svg"><path d="m5 1v1h-4v2h14v-2h-4v-1zm-3 4v8a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2v-8zm1 2h2v6h-2zm4 0h2v6h-2zm4 0h2v6h-2z" fill="#e0e0e0" fill-opacity=".99608"/></svg>

Before

Width:  |  Height:  |  Size: 240 B

View File

@ -3,13 +3,13 @@
[ext_resource path="res://ui/keybinds/Keybinds.gd" type="Script" id=1] [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/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/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_mouse.png" 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.png" type="Texture" id=5]
[ext_resource path="res://ui/icons/icon_keyboard.svg" type="Texture" id=6] [ext_resource path="res://ui/icons/icon_joy_button.png" type="Texture" id=6]
[ext_resource path="res://ui/icons/icon_edit.svg" type="Texture" id=7] [ext_resource path="res://ui/icons/icon_remove.png" type="Texture" id=7]
[ext_resource path="res://ui/icons/icon_add.svg" type="Texture" id=8] [ext_resource path="res://ui/icons/icon_add.png" type="Texture" id=8]
[ext_resource path="res://ui/icons/icon_remove.svg" type="Texture" id=9] [ext_resource path="res://ui/icons/icon_edit.png" 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_joy_axis.png" type="Texture" id=10]
[node name="KeybindWindow" type="PanelContainer"] [node name="KeybindWindow" type="PanelContainer"]
anchor_right = 1.0 anchor_right = 1.0
@ -52,11 +52,11 @@ margin_bottom = 554.0
size_flags_horizontal = 3 size_flags_horizontal = 3
size_flags_vertical = 3 size_flags_vertical = 3
add_texture = ExtResource( 8 ) add_texture = ExtResource( 8 )
remove_texture = ExtResource( 9 ) remove_texture = ExtResource( 7 )
edit_texture = ExtResource( 7 ) edit_texture = ExtResource( 9 )
keyboard_texture = ExtResource( 6 ) keyboard_texture = ExtResource( 5 )
joybutton_texture = ExtResource( 10 ) joybutton_texture = ExtResource( 6 )
joyaxis_texture = ExtResource( 5 ) joyaxis_texture = ExtResource( 10 )
mouse_texture = ExtResource( 4 ) mouse_texture = ExtResource( 4 )
[node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"] [node name="HBoxContainer2" type="HBoxContainer" parent="VBoxContainer"]