Commit 3fa6fd82 authored by Tim Scheiber's avatar Tim Scheiber
Browse files

Merge branch 'develop' into feature/7-enemy-attack

parents 7bdd592c 95776e86
Pipeline #3350 failed with stage
in 4 minutes and 17 seconds
......@@ -7,7 +7,7 @@
}
},
"Model": {
"aid": "model:cube"
"aid": "model:drone"
},
"Shadowcaster": {
},
......@@ -30,6 +30,6 @@
"pause_between_shots": 1
},
"Killable": {
"radius": 0.7
"radius": 1
}
}
......@@ -7,7 +7,7 @@
}
},
"Model": {
"aid": "model:cube"
"aid": "model:drone"
},
"Shadowcaster": {
},
......@@ -20,6 +20,6 @@
"FollowTarget": {
},
"Killable": {
"radius": 0.7
"radius": 1
}
}
......@@ -20,7 +20,7 @@
"Input_controller": {},
"Player": {},
"Dash": {
"attack_width": 2
"attack_width": 0.5
},
"Stationary_attack": {
"radius": 3
......
{
"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_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_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