Commit d6a13630 authored by Kevin Balz's avatar Kevin Balz
Browse files

Merge branch 'develop' into feature/36-level-design

parents dc99e616 4b9f919b
Pipeline #3419 failed with stage
in 5 minutes and 4 seconds
{
"Transform": {
},
"Directional_light": {
"source_radius": 1.0,
"intensity": 80.0,
"color": {
"r": 1,
"g": 0.4,
"b": 0.4
},
"shadow_intensity": 10.0,
"shadow_size": 25,
"near_plane": 10.0,
"far_plane": 100,
"update_frequency": 1,
"light_particles": false
}
}
......@@ -3,7 +3,10 @@
"Camera": {
"fov": 50.0,
"near": 0.05,
"far": 80.0
"far": 80.0,
"dof_focus": 15,
"dof_range": 3,
"dof_power": 0.5
},
"Viewtarget": {
"offset": {
......
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:ceiling"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:floor"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
"x": 0.015,
"y": 0.015,
"z": 0.015
}
},
"Model": {
"aid": "model:character"
},
"Material_property": {
"emissive_color": {"a": 4000}
},
"Shadowcaster": {},
"Movement": {
"beats_per_step": 1,
......@@ -19,14 +22,26 @@
},
"Input_controller": {},
"Player": {},
"Dash": {
"attack_width": 0.5
},
"Stationary_attack": {
"radius": 5.5
},
"Rigid_body": {
"radius": 0.5
},
"Target": {}
"Dash": {
"attack_width": 0.5
},
"Stationary_attack": {
"radius": 3
},
"Rigid_body": {
"radius": 0.5
},
"Target": {},
"Pose": {
"skeleton": "skel:character"
},
"Animation": {},
"Simple_animation_controller": {
"animations": {
"idle": "anim:idle"
},
"current_animation": {
"id": "idle"
}
}
}
{
"Transform":{
"scale": {"x": 1.0, "y": 1.0, "z": 1.0}
},
"Particle_system": {
"cfg": "particle_sys:special_attack_particle_system"
}
}
......@@ -3,13 +3,13 @@
},
"Directional_light": {
"source_radius": 1.0,
"intensity": 1000.0,
"intensity": 190.0,
"color": {
"r": 1,
"g": 1,
"b": 1
"g": 0.8,
"b": 0.8
},
"shadow_intensity": 2.0,
"shadow_intensity": 0.0,
"shadow_size": 25,
"near_plane": 10.0,
"far_plane": 100,
......
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:wall_horizontal"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:wall_vertical"
},
"Shadowcaster": {}
}
dummy
tileset
##################
##----############
#| |---------##
......
dummy
####################
###|--------|#######
#|-| 7| 5|--|####
#| 3 |####
#|-| 7| 1 || |####
###|--------|| |####
#############| |####
##########|--| |--|#
##########| |#
##########| |#
##########| |#
##########| <@> |#
##########| > < |#
##########| |#
##########| ! |#
##########|-------|#
####################
################################
#|------------------|#|-------|#
#| - h h h|#| G |#
#| p h hhh h|#| |#
#| h h h|#| -- |#
#|-------------| |#| --h-- |#
####|----------|h |#| h -- |#
####| b b |#| h |#
####| b b h|#| -- |#
####|b |-------| |#| -- |#
####| |-------|h |-| h |#
####| h h h |#
####| h h h h h - |#
####| h h h h |#
####|-------------------------|#
################################
{
"substance_id": "default",
"albedo_aid": "ceiling_floor_albedo.ktx",
"normal_aid": "ceiling_floor_normal.ktx",
"brdf_aid": "ceiling_floor_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_boots.002_albedo.ktx",
"normal_aid": "character_boots.002_normal.ktx",
"brdf_aid": "character_boots.002_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_face.002_albedo.ktx",
"normal_aid": "character_face.002_normal.ktx",
"brdf_aid": "character_face.002_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_gelenke.002_albedo.ktx",
"normal_aid": "character_gelenke.002_normal.ktx",
"brdf_aid": "character_gelenke.002_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_glow.002_albedo.ktx",
"normal_aid": "character_glow.002_normal.ktx",
"brdf_aid": "character_glow.002_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_handschuhe.002_albedo.ktx",
"normal_aid": "character_handschuhe.002_normal.ktx",
"brdf_aid": "character_handschuhe.002_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_hose.002_albedo.ktx",
"normal_aid": "character_hose.002_normal.ktx",
"brdf_aid": "character_hose.002_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_rüstung.002_albedo.ktx",
"normal_aid": "character_rüstung.002_normal.ktx",
"brdf_aid": "character_rüstung.002_brdf.ktx",
"emission_aid": ""
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment