Merge pull request #302 from re1nex/dev

Dev

export_presets.cfg

@@ -33,8 +33,8 @@ codesign/digest_algorithm=1
 codesign/description=""
 codesign/custom_options=PoolStringArray(  )
 application/icon="res://icon.ico"
-application/file_version="0.4.0"
-application/product_version="0.4.0"
+application/file_version="0.5.0"
+application/product_version="0.5.0"
 application/company_name="Portan Ignis"
 application/product_name="Portan Ignis"
 application/file_description=""

project.godot

@@ -49,6 +49,10 @@ run/main_scene="res://src/ui/mainMenu/MainMenuView.tscn"
 config/icon="res://icon.png"
 config/windows_native_icon="res://icon.ico"
 
+[audio]
+
+default_bus_layout="res://resource/sounds/bus/music_bus.tres"
+
 [autoload]
 
 Settings="*res://src/globals/settings/Settings.gd"
@@ -155,10 +159,16 @@ ui_2={
 , Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777352,"unicode":0,"echo":false,"script":null)
  ]
 }
+ui_3={
+"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":51,"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":16777353,"unicode":0,"echo":false,"script":null)
+ ]
+}
 ui_interaction={
 "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":69,"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)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":1,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
 ui_recharge={
@@ -170,13 +180,11 @@ ui_recharge={
 ui_rotate_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":86,"unicode":0,"echo":false,"script":null)
-, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":-1.0,"script":null)
  ]
 }
 ui_rotate_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":66,"unicode":0,"echo":false,"script":null)
-, Object(InputEventJoypadMotion,"resource_local_to_scene":false,"resource_name":"","device":0,"axis":1,"axis_value":1.0,"script":null)
  ]
 }
 ui_weapon_up={
@@ -194,25 +202,19 @@ ui_weapon_down={
 switch_ignis={
 "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":70,"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)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":3,"pressure":0.0,"pressed":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)
 , Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":0,"pressure":0.0,"pressed":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_inventory={
 "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":73,"unicode":0,"echo":false,"script":null)
- ]
-}
-ui_3={
-"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":51,"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":16777353,"unicode":0,"echo":false,"script":null)
+, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":0,"button_index":10,"pressure":0.0,"pressed":false,"script":null)
  ]
 }
 

resource/sounds/bus/music_bus.tres

@@ -0,0 +1,9 @@
+[gd_resource type="AudioBusLayout" format=2]
+
+[resource]
+bus/1/name = "Music"
+bus/1/solo = false
+bus/1/mute = false
+bus/1/bypass_fx = false
+bus/1/volume_db = 0.0
+bus/1/send = "Master"

resource/sounds/player/jump.wav.import → resource/sounds/player/jump/jump0.wav.import

@@ -2,12 +2,12 @@
 
 importer="wav"
 type="AudioStreamSample"
-path="res://.import/jump.wav-3d625154968b5ec727432131bd823057.sample"
+path="res://.import/jump0.wav-5daa1b80f62772f227d8b8a00b013485.sample"
 
 [deps]
 
-source_file="res://resource/sounds/player/jump.wav"
-dest_files=[ "res://.import/jump.wav-3d625154968b5ec727432131bd823057.sample" ]
+source_file="res://resource/sounds/player/jump/jump0.wav"
+dest_files=[ "res://.import/jump0.wav-5daa1b80f62772f227d8b8a00b013485.sample" ]
 
 [params]
 

resource/sounds/player/jump/jump1.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/jump1.wav-5f8a5fbce4d807d710b545a0d0d7afef.sample"
+
+[deps]
+
+source_file="res://resource/sounds/player/jump/jump1.wav"
+dest_files=[ "res://.import/jump1.wav-5f8a5fbce4d807d710b545a0d0d7afef.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0

resource/sounds/player/jump/jump2.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/jump2.wav-40e1145e6c988d33e48258578c4973b0.sample"
+
+[deps]
+
+source_file="res://resource/sounds/player/jump/jump2.wav"
+dest_files=[ "res://.import/jump2.wav-40e1145e6c988d33e48258578c4973b0.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0

resource/sounds/player/jump/jump3.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/jump3.wav-552e19a63321a98263f9b1ba04fc5d72.sample"
+
+[deps]
+
+source_file="res://resource/sounds/player/jump/jump3.wav"
+dest_files=[ "res://.import/jump3.wav-552e19a63321a98263f9b1ba04fc5d72.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0

resource/sounds/player/jump/jump4.wav.import

@@ -0,0 +1,21 @@
+[remap]
+
+importer="wav"
+type="AudioStreamSample"
+path="res://.import/jump4.wav-cf0b5ab86a1fb755248a57b8ada159aa.sample"
+
+[deps]
+
+source_file="res://resource/sounds/player/jump/jump4.wav"
+dest_files=[ "res://.import/jump4.wav-cf0b5ab86a1fb755248a57b8ada159aa.sample" ]
+
+[params]
+
+force/8_bit=false
+force/mono=false
+force/max_rate=false
+force/max_rate_hz=44100
+edit/trim=false
+edit/normalize=false
+edit/loop=false
+compress/mode=0

resource/sprites/ignis/ignis_regular_level/hintTorch.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/hintTorch.png-99220af9a8935698da6af8dd3bdf02d5.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resource/sprites/ignis/ignis_regular_level/hintTorch.png"
+dest_files=[ "res://.import/hintTorch.png-99220af9a8935698da6af8dd3bdf02d5.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=false
+flags/mipmaps=false
+flags/anisotropic=false
+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
+svg/scale=1.0

resource/sprites/objects/fuel/fuel_box.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/fuel_box.png-687d0c5f3ce15e9bfb413f24e104312c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resource/sprites/objects/fuel/fuel_box.png"
+dest_files=[ "res://.import/fuel_box.png-687d0c5f3ce15e9bfb413f24e104312c.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=false
+flags/mipmaps=false
+flags/anisotropic=false
+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
+svg/scale=1.0

resource/sprites/objects/stairs/oldstairs_down.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/oldstairs_down.png-87751a5e13924fd5436f8ab7f2704bd9.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resource/sprites/objects/stairs/oldstairs_down.png"
+dest_files=[ "res://.import/oldstairs_down.png-87751a5e13924fd5436f8ab7f2704bd9.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=false
+flags/mipmaps=false
+flags/anisotropic=false
+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
+svg/scale=1.0

resource/sprites/objects/stairs/oldstairs_med.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/oldstairs_med.png-30f0cd889714c64267d34659982ea14c.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resource/sprites/objects/stairs/oldstairs_med.png"
+dest_files=[ "res://.import/oldstairs_med.png-30f0cd889714c64267d34659982ea14c.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=false
+flags/mipmaps=false
+flags/anisotropic=false
+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
+svg/scale=1.0

resource/sprites/objects/stairs/oldstairs_up.png.import

@@ -0,0 +1,34 @@
+[remap]
+
+importer="texture"
+type="StreamTexture"
+path="res://.import/oldstairs_up.png-18eabd00f5bb431b15d936d72e5b486a.stex"
+metadata={
+"vram_texture": false
+}
+
+[deps]
+
+source_file="res://resource/sprites/objects/stairs/oldstairs_up.png"
+dest_files=[ "res://.import/oldstairs_up.png-18eabd00f5bb431b15d936d72e5b486a.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=false
+flags/mipmaps=false
+flags/anisotropic=false
+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
+svg/scale=1.0

resource/tileres/stones.tres

@@ -3,10 +3,10 @@
 [ext_resource path="res://resource/sprites/tiles/level_1/cavern_textures.png" type="Texture" id=1]
 
 [sub_resource type="ConvexPolygonShape2D" id=1]
-points = PoolVector2Array( 6.04242, 6.19086, 11.9488, 0, 21.3601, 0, 27.9805, 16, 6.1073, 16 )
+points = PoolVector2Array( 11.1569, 0, 22.1389, 0, 22.1389, 16, 11.079, 16 )
 
 [sub_resource type="ConvexPolygonShape2D" id=2]
-points = PoolVector2Array( 2.13727, 16, 10.3586, 0, 23.5561, 0, 26.0982, 16 )
+points = PoolVector2Array( 10.1444, 0, 22.061, 0, 22.3726, 16, 10.1444, 16 )
 
 [resource]
 0/name = "Stone 1"

resource/ui/hud/TorchWithLens.png.import

@@ -20,7 +20,7 @@ compress/hdr_mode=0
 compress/bptc_ldr=0
 compress/normal_map=0
 flags/repeat=0
-flags/filter=true
+flags/filter=false
 flags/mipmaps=false
 flags/anisotropic=false
 flags/srgb=2