Commit 8a387761 authored by Tim Scheiber's avatar Tim Scheiber
Browse files

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

parents b3ab6f84 aa896962
Pipeline #3334 failed with stage
in 3 minutes and 1 second
......@@ -29,5 +29,6 @@
"pause_between_shots": 1
},
"Killable": {
"radius": 0.7
}
}
......@@ -4,6 +4,6 @@
},
"Goal": {},
"Particle_system": {
"cfg": "particle_sys:test_particles"
"cfg": "particle_sys:test_particle_system"
}
}
......@@ -20,5 +20,6 @@
"FollowTarget": {
},
"Killable": {
"radius": 0.7
}
}
{
"Transform": {
"scale": {
"x": 0.5,
"y": 0.5,
"z": 0.5
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:drone"
"aid": "model:character"
},
"Shadowcaster": {},
"Movement": {
......@@ -20,7 +20,10 @@
"Input_controller": {},
"Player": {},
"Dash": {
"attack_width": 0.8
"attack_width": 2
},
"Stationary_attack": {
"radius": 3
},
"Rigid_body": {
"radius": 0.5
......
{
"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_hose_albedo.ktx",
"normal_aid": "character_hose_normal.ktx",
"brdf_aid": "character_hose_brdf.ktx",
"emission_aid": ""
}
{
"format": {
"version": "1.0"
},
"shaders": {
"Main shader": {
"parameters": {
"Common Parameters": {
"ao_intensity": 0.75,
"emissive_intensity": 1,
"horizonFade": 1.2999999523162842,
"nbSamples": 16
},
"Parallax Occlusion Mapping": {
"maxPOMSamples": 16,
"minPOMSamples": 4,
"pomStrength": 1,
"usePOM": false
},
"Subsurface Scattering Parameters": {
"sssColor": [
0.7009999752044678,
0.3009999990463257,
0.3050000071525574
],
"sssEnabled": true,
"sssScale": 0.5,
"sssType": 1
}
},
"shader": "pbr-metal-rough",
"shaderInstance": "Main shader"
}
},
"texturesets": {
"lambert1": {
"shader": "Main shader"
}
}
}
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