Commit eefbfea5 authored by Tim Scheiber's avatar Tim Scheiber
Browse files

Merge branch 'develop' of...

Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
parents 2e3c686b db32890e
{
"Transform": {
"scale": {
"x": 0.3,
"y": 0.3,
"z": 0.3
"x": 0.6,
"y": 0.6,
"z": 0.6
}
},
"Model": {
"aid": "model:drone"
},
"Shadowcaster": {
},
"Shadowcaster": {},
"Movement": {
"beats_per_step": 1,
"distance_per_step": 1,
"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": {
"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
},
"Material_property": {
"emissive_color": {
"a": 20000
}
}
}
......@@ -31,7 +31,7 @@
"r": 1.0,
"g": 0.0,
"b": 1.0,
"a": 20000
"a": 8000
}
}
}
{
"Transform": {
"scale": {
"x": 0.3,
"y": 0.3,
"z": 0.3
"x": 0.6,
"y": 0.6,
"z": 0.6
}
},
"Model": {
"aid": "model:drone"
},
"Shadowcaster": {
},
"Shadowcaster": {},
"Movement": {
"beats_per_step": 1,
"distance_per_step": 1,
"step_time_percentage": 0.2,
"off_beat_threshold": 0.0
},
"FollowTarget": {
},
"FollowTarget": {},
"Killable": {
"radius": 1
"radius": 1
},
"Material_property": {
"emissive_color": {
"a": 20000
}
}
}
{
"Transform": {
"scale": {
"x": 0.3,
"y": 0.3,
"z": 0.3
"x": 0.45,
"y": 0.45,
"z": 0.45
}
},
"Model": {
"aid": "model:drone"
},
"Shadowcaster": {
},
"Shadowcaster": {},
"Movement": {
"beats_per_step": 1,
"distance_per_step": 1,
......@@ -27,5 +26,11 @@
},
"Killable": {
"radius": 1
},
"Material_property": {
"emissive_color": {
"r": 10,
"a": 20000
}
}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:pillar"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 0.3,
"y": 0.3,
"z": 0.3
"x": 0.45,
"y": 0.45,
"z": 0.45
}
},
"Model": {
"aid": "model:drone"
},
"Shadowcaster": {
},
"Shadowcaster": {},
"Movement": {
"beats_per_step": 1,
"distance_per_step": 1,
......@@ -23,5 +22,11 @@
},
"Killable": {
"radius": 1
},
"Material_property": {
"emissive_color": {
"r": 10,
"a": 10000
}
}
}
......@@ -50,4 +50,4 @@ tileset
##############| [-] [--------##
###############----------###-]><[]><[]><[]><[-###########
##############################--##--##--##--#############
#########################################################
\ No newline at end of file
#########################################################
......@@ -3,5 +3,5 @@
"albedo_aid": "drone_lambert1_albedo.ktx",
"normal_aid": "drone_lambert1_normal.ktx",
"brdf_aid": "drone_lambert1_brdf.ktx",
"emission_aid": ""
"emission_aid": "drone_lambert1_emission.ktx"
}
{
"substance_id": "default",
"albedo_aid": "pillar_glow1_albedo.ktx",
"normal_aid": "pillar_glow1_normal.ktx",
"brdf_aid": "pillar_glow1_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "pillar_glow2_albedo.ktx",
"normal_aid": "pillar_glow2_normal.ktx",
"brdf_aid": "pillar_glow2_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "pillar_wall_inner_albedo.ktx",
"normal_aid": "pillar_wall_inner_normal.ktx",
"brdf_aid": "pillar_wall_inner_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "pillar_wall_outer_albedo.ktx",
"normal_aid": "pillar_wall_outer_normal.ktx",
"brdf_aid": "pillar_wall_outer_brdf.ktx",
"emission_aid": ""
}
......@@ -33,9 +33,9 @@
"left_shoulder": {"type":"once_down", "action":"the_button"},
"right_shoulder": {"type":"once_down", "action":"the_button"},
"a": {"type":"once_down", "action":"the_button"},
"b": {"type":"once_down", "action":"the_button"},
"b": {"type":"once_down", "action":"b"},
"x": {"type":"once_down", "action":"the_button"},
"y": {"type":"once_down", "action":"the_button"},
"y": {"type":"once_down", "action":"b"},
"back": {"type":"once", "action":"quit"},
"start": {"type":"once", "action":"quit"}
},
......
......@@ -7,6 +7,7 @@
"enemy_hit": ["enemy_hit_1", "enemy_hit_2", "enemy_hit_3", "enemy_hit_4", "enemy_hit_5"],
"gameover": ["gameover"],
"damaged": ["player_damaged"],
"win": ["win", "win2"]
"win": [ "win", "win2" ],
"beat_missed": ["beat_missed"]
}
}
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