Commit 38ae64ff authored by Florian Oetke's avatar Florian Oetke
Browse files

Merge remote-tracking branch 'origin/develop' into feature/16-sound-effects

parents 56b1ffb9 a670493a
Pipeline #3354 failed with stage
in 1 minute and 32 seconds
{
// Informationen zu dieser Datei finden Sie unter https://go.microsoft.com//fwlink//?linkid=834763.
"configurations": [
{
"name": "x64-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "-v",
"ctestCommandArgs": ""
}
]
}
\ No newline at end of file
......@@ -7,7 +7,7 @@
}
},
"Model": {
"aid": "model:cube"
"aid": "model:drone"
},
"Shadowcaster": {
},
......@@ -17,9 +17,19 @@
"step_time_percentage": 0.2,
"off_beat_threshold": 0.0
},
"Killable": {
"radius": 0.7
},
"FixedPath": {
"pause_between_steps": 1,
"wait_beats": 1
},
"Shooting": {
"default_orientation": 270,
"rotation_per_step": 15,
"max_rotation": 30,
"spawn_offset": 1,
"attack_radius": 5,
"pause_between_shots": 1
},
"Killable": {
"radius": 1
}
}
{
"Transform": {
"scale": {
"x": 0.3,
"y": 0.3,
"z": 0.3
"x": 0.2,
"y": 0.2,
"z": 0.2
}
},
"Model": {
......@@ -19,7 +19,9 @@
},
"Fragile": {},
"ContinuousPath": {
"direction": 270,
"curvature": 0
}
},
"Rigid_body": {
"radius": 0.3
},
"Bullet": {}
}
......@@ -7,7 +7,7 @@
}
},
"Model": {
"aid": "model:cube"
"aid": "model:drone"
},
"Shadowcaster": {
},
......@@ -20,6 +20,6 @@
"FollowTarget": {
},
"Killable": {
"radius": 0.7
"radius": 1
}
}
......@@ -20,12 +20,13 @@
"Input_controller": {},
"Player": {},
"Dash": {
"attack_width": 2
"attack_width": 0.5
},
"Stationary_attack": {
"radius": 3
},
"Rigid_body": {
"radius": 0.5
}
},
"Target": {}
}
{
"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