Commit b56470d7 authored by Florian Oetke's avatar Florian Oetke

Merge branch 'develop' of...

Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
parents 26512f74 db32890e
Pipeline #3452 failed with stage
in 2 minutes and 53 seconds
{
"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": ""
}
......@@ -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"]
}
}
......@@ -34,7 +34,7 @@
"solid": true
},
"~": {
"blueprint": "wall_vertical",
"blueprint": "pillar",
"solid": true
},
"@": {
......
# Blender MTL File: 'Drone.blend'
# Material Count: 1
newmtl lambert1
Ns 94.117647
Ka 1.000000 1.000000 1.000000
Kd 0.400000 0.400000 0.400000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Kd Drone Material/Drone2_lambert1_BaseColor.png
map_Bump Drone Material/Drone2_lambert1_Normal.png
map_Ka Drone Material/Drone2_lambert1_Metallic.png
map_Ke Drone Material/Drone2_lambert1_Emissive.png
# Blender MTL File: 'pillar.blend'
# Material Count: 4
newmtl Glow1
Ns 94.117647
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.582240 0.000000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Bump Walls Tex 1/Wall_straight_Glow1_Normal.png
map_Ka Walls Tex 1/Wall_straight_Glow1_Metallic.png
map_Kd Walls Tex 1/Wall_straight_Glow1_BaseColor.png
map_Ks Walls Tex 1/Wall_straight_Glow1_Roughness.png
newmtl Glow2
Ns 94.117647
Ka 1.000000 1.000000 1.000000
Kd 0.754160 0.800000 0.000000
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Bump Walls Tex 1/Wall_straight_Glow2_Normal.png
map_Ka Walls Tex 1/Wall_straight_Glow2_Metallic.png
map_Kd Walls Tex 1/Wall_straight_Glow2_BaseColor.png
map_Ks Walls Tex 1/Wall_straight_Glow2_Roughness.png
newmtl Wall_Inner
Ns 94.117647
Ka 1.000000 1.000000 1.000000
Kd 0.144480 0.144480 0.144480
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Bump Walls Tex 1/Wall_straight_Wall_Inner_Normal.png
map_Ka Walls Tex 1/Wall_straight_Wall_Inner_Metallic.png
map_Kd Walls Tex 1/Wall_straight_Wall_Inner_BaseColor.png
map_Ks Walls Tex 1/Wall_straight_Wall_Inner_Roughness.png
newmtl Wall_Outer
Ns 94.117647
Ka 1.000000 1.000000 1.000000
Kd 0.069280 0.069280 0.069280
Ks 0.500000 0.500000 0.500000
Ke 0.000000 0.000000 0.000000
Ni 1.000000
d 1.000000
illum 2
map_Bump Walls Tex 1/Wall_straight_Wall_Outer_Normal.png
map_Ka Walls Tex 1/Wall_straight_Wall_Outer_Metallic.png
map_Kd Walls Tex 1/Wall_straight_Wall_Outer_BaseColor.png
map_Ks Walls Tex 1/Wall_straight_Wall_Outer_Roughness.png
Subproject commit 3f7bceb13b0b5d29ab2b0d6fdd44f078365b4097
Subproject commit 57bcafb5c858c315b9b8cfc00624505d46ea91a0
......@@ -94,6 +94,11 @@ namespace phase_shifter::ui {
_bus.send<Play_sound_msg>("gameover"_strid);
// TODO
});
_mailbox.subscribe_to([&](phase_shifter::gameplay::Beat_missed_msg& e) {
_bus.send<Play_sound_msg>("beat_missed"_strid);
// TODO
});
}
void Effect_system::update(mirrage::util::Time dt)
......
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