Commit 3dd75bbc authored by Georg Schäfer's avatar Georg Schäfer
Browse files

Merge branch 'develop' into feature/11-ui-calibration-screen

parents 480e1b33 95776e86
particle: = particles/*.json
particle_def:test_particles = particles/test_particles.json
particle_sys:test_particles = particles/test_particle_system.json
particle_def: = particles/*.json
particle_sys: = particles/*.json
......@@ -7,7 +7,7 @@
}
},
"Model": {
"aid": "model:cube"
"aid": "model:drone"
},
"Shadowcaster": {
},
......@@ -15,9 +15,10 @@
"beats_per_step": 1,
"distance_per_step": 1,
"step_time_percentage": 0.2,
"off_beat_threshold": 0.2
"off_beat_threshold": 0.0
},
"Killable": {
"radius": 1
},
"FixedPath": {
}
......
......@@ -15,10 +15,11 @@
"beats_per_step": 1,
"distance_per_step": 1,
"step_time_percentage": 0.2,
"off_beat_threshold": 0.2
"off_beat_threshold": 0.0
},
"Fragile": {},
"ContinuousPath": {
"direction": 270,
"curvature": 0,
"curvature": 0
}
}
......@@ -8,8 +8,8 @@
"Viewtarget": {
"offset": {
"x": 0.0,
"y": 10.0,
"z": 1.0
"y": 15.0,
"z": 4.0
}
},
"Spring": {
......
......@@ -3,6 +3,6 @@
"scale": {"x": 1.0, "y": 1.0, "z": 1.0}
},
"Particle_system": {
"cfg": "particle_sys:test_particles"
"cfg": "particle_sys:enemy_death_particle_system"
}
}
{
"Transform":{
"scale": {"x": 1.0, "y": 1.0, "z": 1.0}
},
"Goal": {},
"Particle_system": {
"cfg": "particle_sys:test_particle_system"
}
}
......@@ -7,7 +7,7 @@
}
},
"Model": {
"aid": "model:cube"
"aid": "model:drone"
},
"Shadowcaster": {
},
......@@ -15,10 +15,11 @@
"beats_per_step": 1,
"distance_per_step": 1,
"step_time_percentage": 0.2,
"off_beat_threshold": 0.2
"off_beat_threshold": 0.0
},
"FollowTarget": {
},
"Killable": {
"radius": 1
}
}
{
"Transform": {
"scale": {
"x": 0.5,
"y": 0.5,
"z": 0.5
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:cube"
"aid": "model:character"
},
"Shadowcaster": {},
"Movement": {
"beats_per_step": 1,
"distance_per_step": 5,
"step_time_percentage": 0.3,
"step_time_percentage": 0.5,
"off_beat_threshold": 0.2,
"overshoot": 4
"overshoot": 3
},
"Input_controller": {},
"Player": {},
"Dash": {
"attack_width": 0.8
"attack_width": 0.5
},
"Stationary_attack": {
"radius": 3
},
"Rigid_body": {
"radius": 1.0
"radius": 0.5
}
}
......@@ -3,7 +3,7 @@
},
"Directional_light": {
"source_radius": 1.0,
"intensity": 4000.0,
"intensity": 1000.0,
"color": {
"r": 1,
"g": 1,
......
......@@ -3,8 +3,8 @@ dummy
##----############
#| |---------##
#| p h |#
#| |---- b |#
#| |---- bbb |#
##----####| |#
##########| b |#
##########| b G|#
###########-----##
##################
{
"substance_id": "default",
"albedo_aid": "character_boots_albedo.ktx",
"normal_aid": "character_boots_normal.ktx",
"brdf_aid": "character_boots_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_default_material_albedo.ktx",
"normal_aid": "character_default_material_normal.ktx",
"brdf_aid": "character_default_material_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_face_albedo.ktx",
"normal_aid": "character_face_normal.ktx",
"brdf_aid": "character_face_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_gelenke_albedo.ktx",
"normal_aid": "character_gelenke_normal.ktx",
"brdf_aid": "character_gelenke_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_glow_albedo.ktx",
"normal_aid": "character_glow_normal.ktx",
"brdf_aid": "character_glow_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_handschuhe_albedo.ktx",
"normal_aid": "character_handschuhe_normal.ktx",
"brdf_aid": "character_handschuhe_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_hose_albedo.ktx",
"normal_aid": "character_hose_normal.ktx",
"brdf_aid": "character_hose_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_rüstung_albedo.ktx",
"normal_aid": "character_rüstung_normal.ktx",
"brdf_aid": "character_rüstung_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_sword_albedo.ktx",
"normal_aid": "character_sword_normal.ktx",
"brdf_aid": "character_sword_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