Commit 9e6178e0 authored by Kevin Balz's avatar Kevin Balz

Merge branch 'develop' into feature/12-ui-intro

parents eee4e41e 9d24e607
Pipeline #3435 failed with stage
in 22 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
audio: = audio/
audio: = audio/*.opus
music: = music/*.opus
cfg:sound_effects = settings/sound_effects.json
{
"Transform": {
},
"Directional_light": {
"source_radius": 1.0,
"intensity": 80.0,
"color": {
"r": 1,
"g": 0.4,
"b": 0.4
},
"shadow_intensity": 10.0,
"shadow_size": 25,
"near_plane": 10.0,
"far_plane": 100,
"update_frequency": 1,
"light_particles": false
}
}
......@@ -17,9 +17,19 @@
"step_time_percentage": 0.2,
"off_beat_threshold": 0.0
},
"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
},
"FixedPath": {
}
}
}
{
"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": {}
}
......@@ -3,7 +3,10 @@
"Camera": {
"fov": 50.0,
"near": 0.05,
"far": 80.0
"far": 80.0,
"dof_focus": 15,
"dof_range": 3,
"dof_power": 0.5
},
"Viewtarget": {
"offset": {
......@@ -15,5 +18,6 @@
"Spring": {
"spring_constant": 20.0,
"mass": 1.0
}
},
"Shake": {}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:ceiling"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:floor"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
"x": 0.015,
"y": 0.015,
"z": 0.015
}
},
"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": {
"r": 0,
"g": 1.0,
"b": 0.8,
"a": 40000
}
},
"Shadowcaster": {},
"Movement": {
"beats_per_step": 1,
......@@ -19,13 +40,14 @@
},
"Input_controller": {},
"Player": {},
"Dash": {
"attack_width": 0.5
},
"Stationary_attack": {
"radius": 3
},
"Dash": {
"attack_width": 0.5
},
"Stationary_attack": {
"radius": 3
},
"Rigid_body": {
"radius": 0.5
}
},
"Target": {}
}
{
"Transform":{
"scale": {"x": 1.0, "y": 1.0, "z": 1.0}
},
"Particle_system": {
"cfg": "particle_sys:special_attack_particle_system"
}
}
......@@ -3,13 +3,13 @@
},
"Directional_light": {
"source_radius": 1.0,
"intensity": 1000.0,
"intensity": 190.0,
"color": {
"r": 1,
"g": 1,
"b": 1
"g": 0.8,
"b": 0.8
},
"shadow_intensity": 2.0,
"shadow_intensity": 0.0,
"shadow_size": 25,
"near_plane": 10.0,
"far_plane": 100,
......
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:wall_horizontal"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:wall_vertical"
},
"Shadowcaster": {}
}
dummy
tileset
##################
##----############
#| |---------##
......
dummy
################################
#|------------------|#|-------|#
#| - h h h|#| G |#
#| p h hhh h|#| |#
#| h h h|#| -- |#
#|-------------| |#| --h-- |#
####|----------|h |#| h -- |#
####| b b |#| h |#
####| b b h|#| -- |#
####|b |-------| |#| -- |#
####| |-------|h |-| h |#
####| h h h |#
####| h h h h h - |#
####| h h h h |#
####|-------------------------|#
################################
{
"substance_id": "default",
"albedo_aid": "ceiling_floor_albedo.ktx",
"normal_aid": "ceiling_floor_normal.ktx",
"brdf_aid": "ceiling_floor_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_boots.002_albedo.ktx",
"normal_aid": "character_boots.002_normal.ktx",
"brdf_aid": "character_boots.002_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_face.002_albedo.ktx",
"normal_aid": "character_face.002_normal.ktx",
"brdf_aid": "character_face.002_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_gelenke.002_albedo.ktx",
"normal_aid": "character_gelenke.002_normal.ktx",
"brdf_aid": "character_gelenke.002_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_glow.002_albedo.ktx",
"normal_aid": "character_glow.002_normal.ktx",
"brdf_aid": "character_glow.002_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "character_handschuhe.002_albedo.ktx",
"normal_aid": "character_handschuhe.002_normal.ktx",
"brdf_aid": "character_handschuhe.002_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_hose.002_albedo.ktx",
"normal_aid": "character_hose.002_normal.ktx",
"brdf_aid": "character_hose.002_brdf.ktx",
"emission_aid": ""
}
{
"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": ""
}
{
"substance_id": "default",
"albedo_aid": "character_rüstung.002_albedo.ktx",
"normal_aid": "character_rüstung.002_normal.ktx",
"brdf_aid": "character_rüstung.002_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "character_sword.002_albedo.ktx",
"normal_aid": "character_sword.002_normal.ktx",
"brdf_aid": "character_sword.002_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "floor_floor_albedo.ktx",
"normal_aid": "floor_floor_normal.ktx",
"brdf_aid": "floor_floor_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "idle_defaultmaterial_albedo.ktx",
"normal_aid": "idle_defaultmaterial_normal.ktx",
"brdf_aid": "idle_defaultmaterial_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "wall_horizontal_glow1_albedo.ktx",
"normal_aid": "wall_horizontal_glow1_normal.ktx",
"brdf_aid": "wall_horizontal_glow1_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "wall_horizontal_glow2_albedo.ktx",
"normal_aid": "wall_horizontal_glow2_normal.ktx",
"brdf_aid": "wall_horizontal_glow2_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "wall_horizontal_wall_inner_albedo.ktx",
"normal_aid": "wall_horizontal_wall_inner_normal.ktx",
"brdf_aid": "wall_horizontal_wall_inner_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "wall_horizontal_wall_outer_albedo.ktx",
"normal_aid": "wall_horizontal_wall_outer_normal.ktx",
"brdf_aid": "wall_horizontal_wall_outer_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "wall_vertical_glow1_albedo.ktx",
"normal_aid": "wall_vertical_glow1_normal.ktx",
"brdf_aid": "wall_vertical_glow1_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "wall_vertical_glow2_albedo.ktx",
"normal_aid": "wall_vertical_glow2_normal.ktx",
"brdf_aid": "wall_vertical_glow2_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "wall_vertical_wall_inner_albedo.ktx",
"normal_aid": "wall_vertical_wall_inner_normal.ktx",
"brdf_aid": "wall_vertical_wall_inner_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "wall_vertical_wall_outer_albedo.ktx",
"normal_aid": "wall_vertical_wall_outer_normal.ktx",
"brdf_aid": "wall_vertical_wall_outer_brdf.ktx",
"emission_aid": ""
}
1.834376418:
2.275555557:
2.728344672:
3.215963720:
3.552653062:
3.900952382:
4.237641724:
4.597551021:
5.050340137:
5.503129253:
5.979138323:
6.431927439:
6.884716554:
7.349115647:
7.825124718:
8.277913833:
......
......@@ -2,7 +2,7 @@
"emitters": [{
"spawn": [
{"particles_per_second": 300, "stddev":150, "time": 0.5},
{"particles_per_second": 0, "stddev":0, "time": 999}
{"particles_per_second": 0, "stddev":0, "time": 1}
],
"spawn_loop": false,
......
......@@ -2,7 +2,7 @@
"keyframes": [
{
"time": 0,
"color": {"mean":{"hue":0, "saturation":1, "alpha":20}, "stddev":{"hue":0.001}},
"color": {"mean":{"hue":0, "saturation":1, "alpha":3}, "stddev":{"hue":0.001}},
"size": {"mean": {"x": 0.5, "y":0.5, "z":0.5}, "stddev":{"x": 0.3, "y":0.3, "z":0.3}},
"rotation": {"mean":{"angle":0}, "stddev":{"elevation":1, "azimuth":1, "angle": 1}},
"drag": 0.1
......
{
"emitters": [{
"spawn": [
{"particles_per_second": 2000, "stddev":0, "time": 0.01},
{"particles_per_second": 0, "stddev":0, "time": 1}
],
"spawn_loop": false,
"size": {"x":0.0, "y":0.0},
"direction"