divers reglages

This commit is contained in:
osquallo 2018-09-25 21:46:44 +02:00
parent 400fdc8bb1
commit 513b6cfb47
7 changed files with 104 additions and 92 deletions

View file

@ -10,7 +10,7 @@
radius = 1.0 radius = 1.0
height = 1.0 height = 1.0
[node name="character" type="KinematicBody"] [node name="character" type="KinematicBody" index="0"]
transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0 ) transform = Transform( 0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0 )
input_ray_pickable = false input_ray_pickable = false
@ -45,7 +45,7 @@ transform = Transform( 1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.0730682, 0 )
[node name="camera" type="Camera" parent="camera_rotation_helper" index="0"] [node name="camera" type="Camera" parent="camera_rotation_helper" index="0"]
transform = Transform( 1, 0, 0, 0, 0.972209, 0.397244, 0, -0.137979, 0.972208, 0, 2.71489, 0.896517 ) transform = Transform( 1, 0, 0, 0, 0.981951, 0, 0, 0, 1.05023, 0, 2.5, 3 )
keep_aspect = 1 keep_aspect = 1
cull_mask = 1048575 cull_mask = 1048575
environment = null environment = null
@ -54,7 +54,7 @@ v_offset = 0.0
doppler_tracking = 0 doppler_tracking = 0
projection = 0 projection = 0
current = false current = false
fov = 70.0 fov = 75.0
size = 1.0 size = 1.0
near = 0.05 near = 0.05
far = 10000.0 far = 10000.0

View file

@ -70,7 +70,7 @@ _sections_unfolded = [ "shader_param" ]
points = PoolVector3Array( -1, 1, 1, 1, 1, -1, 1, 1, 1, -1, 1, -1, -1, -1, 1, 1, -1, -1, 1, -1, 1, -1, -1, -1, 1, 1, 1, -1, 1, -1, 1, 1, -1, -1, 1, 1, 1, -1, 1, -1, -1, -1, 1, -1, -1, -1, -1, 1, 1, 1, 1, -1, -1, 1, -1, 1, 1, 1, -1, 1, 1, 1, -1, -1, -1, -1, -1, 1, -1, 1, -1, -1 ) points = PoolVector3Array( -1, 1, 1, 1, 1, -1, 1, 1, 1, -1, 1, -1, -1, -1, 1, 1, -1, -1, 1, -1, 1, -1, -1, -1, 1, 1, 1, -1, 1, -1, 1, 1, -1, -1, 1, 1, 1, -1, 1, -1, -1, -1, 1, -1, -1, -1, -1, 1, 1, 1, 1, -1, -1, 1, -1, 1, 1, 1, -1, 1, 1, 1, -1, -1, -1, -1, -1, 1, -1, 1, -1, -1 )
[node name="CubeShaderTest" type="RigidBody"] [node name="CubeShaderTest" type="RigidBody" index="0"]
input_ray_pickable = true input_ray_pickable = true
input_capture_on_drag = false input_capture_on_drag = false
@ -104,7 +104,7 @@ layers = 1
material_override = null material_override = null
cast_shadow = 1 cast_shadow = 1
extra_cull_margin = 0.0 extra_cull_margin = 0.0
use_in_baked_light = false use_in_baked_light = true
lod_min_distance = 0.0 lod_min_distance = 0.0
lod_min_hysteresis = 0.0 lod_min_hysteresis = 0.0
lod_max_distance = 0.0 lod_max_distance = 0.0
@ -112,7 +112,7 @@ lod_max_hysteresis = 0.0
mesh = SubResource( 1 ) mesh = SubResource( 1 )
skeleton = NodePath("..") skeleton = NodePath("..")
material/0 = SubResource( 3 ) material/0 = SubResource( 3 )
_sections_unfolded = [ "material" ] _sections_unfolded = [ "Geometry", "material" ]
[node name="CollisionShape" type="CollisionShape" parent="." index="1"] [node name="CollisionShape" type="CollisionShape" parent="." index="1"]

File diff suppressed because one or more lines are too long

View file

@ -4,8 +4,7 @@
[ext_resource path="res://assets/Game/materials/flamme_01.tres" type="QuadMesh" id=2] [ext_resource path="res://assets/Game/materials/flamme_01.tres" type="QuadMesh" id=2]
[ext_resource path="res://game_scene/Game/smoke.tscn" type="PackedScene" id=3] [ext_resource path="res://game_scene/Game/smoke.tscn" type="PackedScene" id=3]
[node name="fire_01" type="Particles"]
[node name="fire_01" type="Particles" index="0"]
layers = 1 layers = 1
material_override = null material_override = null

View file

@ -74,7 +74,7 @@ _sections_unfolded = [ "Albedo", "Flags", "Resource" ]
points = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, -1, 0, -1 ) points = PoolVector3Array( 1, 0, 1, -1, 0, 1, 1, 0, -1, -1, 0, -1 )
[node name="JukeboxPannel" type="Spatial"] [node name="JukeboxPannel" type="Spatial" index="0"]
script = ExtResource( 1 ) script = ExtResource( 1 )
@ -82,7 +82,7 @@ script = ExtResource( 1 )
arvr = false arvr = false
size = Vector2( 256, 256 ) size = Vector2( 256, 256 )
own_world = false own_world = true
world = null world = null
transparent_bg = true transparent_bg = true
msaa = 2 msaa = 2

View file

@ -79,7 +79,7 @@ layers = 1
material_override = null material_override = null
cast_shadow = 1 cast_shadow = 1
extra_cull_margin = 0.0 extra_cull_margin = 0.0
use_in_baked_light = false use_in_baked_light = true
lod_min_distance = 0.0 lod_min_distance = 0.0
lod_min_hysteresis = 0.0 lod_min_hysteresis = 0.0
lod_max_distance = 0.0 lod_max_distance = 0.0
@ -87,7 +87,7 @@ lod_max_hysteresis = 0.0
mesh = SubResource( 1 ) mesh = SubResource( 1 )
skeleton = NodePath("..") skeleton = NodePath("..")
material/0 = SubResource( 2 ) material/0 = SubResource( 2 )
_sections_unfolded = [ "material" ] _sections_unfolded = [ "Geometry", "material" ]
[node name="static_body" type="StaticBody" parent="mesh_instance" index="0"] [node name="static_body" type="StaticBody" parent="mesh_instance" index="0"]

View file

@ -14,6 +14,9 @@ visible = false
[node name="login_menu" parent="." index="1" instance=ExtResource( 3 )] [node name="login_menu" parent="." index="1" instance=ExtResource( 3 )]
margin_top = -1.0
margin_bottom = -1.0
[connection signal="character_selected" from="character_selection_menu" to="." method="_on_character_selection_menu_character_selected"] [connection signal="character_selected" from="character_selection_menu" to="." method="_on_character_selection_menu_character_selected"]
[connection signal="return_button_pressed" from="character_selection_menu" to="." method="_on_character_selection_menu_return_button_pressed"] [connection signal="return_button_pressed" from="character_selection_menu" to="." method="_on_character_selection_menu_return_button_pressed"]