Commit 4d496516 authored by Tim Scheiber's avatar Tim Scheiber
Browse files

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

parents 8ce0ccbc 8a7be741
Pipeline #3440 passed with stage
in 3 minutes and 49 seconds
{
"Transform": {
"scale": {
"x": 0.4,
"y": 0.4,
"z": 0.4
"x": 1,
"y": 1,
"z": 1
}
},
"Model": {
"aid": "model:tetr"
},
"Shadowcaster": {
"aid": "model:bullet"
},
"Shadowcaster": {},
"Movement": {
"beats_per_step": 1,
"distance_per_step": 1,
......@@ -18,8 +17,7 @@
"off_beat_threshold": 0.0
},
"Fragile": {},
"ContinuousPath": {
},
"ContinuousPath": {},
"Rigid_body": {
"radius": 0.3
},
......@@ -27,5 +25,13 @@
"Killable": {
"radius": 1,
"only_stationary": true
},
"Material_property": {
"emissive_color": {
"r": 0.5,
"g": 0.5,
"b": 0.0,
"a": 40000
}
}
}
......@@ -9,8 +9,26 @@
"Model": {
"aid": "model:character"
},
"Pose": {
"skeleton": "skel:character"
},
"Animation": {},
"Simple_animation_controller": {
"animations": {
"idle": "anim:idle",
"dash": "anim:dash"
},
"current_animation": {
"id": "idle"
}
},
"Material_property": {
"emissive_color": {"a": 4000}
"emissive_color": {
"r": 0,
"g": 1.0,
"b": 0.8,
"a": 40000
}
},
"Shadowcaster": {},
"Movement": {
......@@ -31,17 +49,5 @@
"Rigid_body": {
"radius": 0.5
},
"Target": {},
"Pose": {
"skeleton": "skel:character"
},
"Animation": {},
"Simple_animation_controller": {
"animations": {
"idle": "anim:idle"
},
"current_animation": {
"id": "idle"
}
}
"Target": {}
}
{
"substance_id": "default",
"albedo_aid": "bullet_none_albedo.ktx",
"normal_aid": "bullet_none_normal.ktx",
"brdf_aid": "bullet_none_brdf.ktx",
"emission_aid": ""
}
......@@ -3,5 +3,5 @@
"albedo_aid": "character_glow.002_albedo.ktx",
"normal_aid": "character_glow.002_normal.ktx",
"brdf_aid": "character_glow.002_brdf.ktx",
"emission_aid": ""
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "character_lambert1.001_albedo.ktx",
"normal_aid": "character_lambert1.001_normal.ktx",
"brdf_aid": "character_lambert1.001_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