Commit 8b9846bb 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 5e5b1c7b 6e9d11d0
Pipeline #3448 canceled with stage
{
"Transform": {
"scale": {
"x": 0.2,
"y": 0.2,
"z": 0.2
"x": 1,
"y": 1,
"z": 1
}
},
"Model": {
......@@ -22,12 +22,16 @@
"radius": 0.3
},
"Bullet": {},
"Killable": {
"radius": 1,
"only_stationary": true
},
"Material_property": {
"emissive_color": {
"r": 0.5,
"g": 0.5,
"b": 0.0,
"a": 40000
"r": 1.0,
"g": 0.0,
"b": 1.0,
"a": 20000
}
}
}
{
"Transform": {
"scale": {
"x": 0.3,
"y": 0.3,
"z": 0.3
}
},
"Model": {
"aid": "model:drone"
},
"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": {
"spawn_offset": 1,
"pause_between_shots": 1
},
"Killable": {
"radius": 1
}
}
......@@ -33,7 +33,7 @@
"Shadowcaster": {},
"Movement": {
"beats_per_step": 1,
"distance_per_step": 5,
"distance_per_step": 4,
"step_time_percentage": 0.5,
"off_beat_threshold": 0.2,
"overshoot": 3
......
{
"Transform": {
"scale": {
"x": 0.3,
"y": 0.3,
"z": 0.3
}
},
"Model": {
"aid": "model:drone"
},
"Shadowcaster": {
},
"Movement": {
"beats_per_step": 1,
"distance_per_step": 1,
"step_time_percentage": 0.2,
"off_beat_threshold": 0.0
},
"Shooting": {
"spawn_offset": 1,
"pause_between_shots": 1
},
"Killable": {
"radius": 1
}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:bottom_left"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:bottom_right"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:top_left"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 1.0,
"y": 1.0,
"z": 1.0
}
},
"Model": {
"aid": "model:top_right"
},
"Shadowcaster": {}
}
tileset
##################
##----############
#| |---------##
#| }---------##
#| p h |#
#| |---- bbb |#
#| ]---[ bbb |#
##----####| |#
##########| b G|#
###########-----##
......
tileset
#########################################################
###########################################-#############
##########################################|!|############
########################################--} {--##########
#######################################| hbh |#########
#######################################|3 7|#########
#######################################| h |#########
#######################################| |#########
#######################################| c |#########
#######################################| ~ |#########
#######################################| |#########
########################################--]@[--##########
##########################################| |############
###################################-------} |############
##################################| |############
##################################| < < < < |############
##################################| |############
##################################| > > > > |############
####################-----#########| |############
######---####-----#|> >|########| [-------#############
##---} 7{--} 5 {} |######--} {--##################
#| 5 |#####| |#################
##---] 7[--] 1 [] |#####| |#################
######---####-----#|> >|#####| h i |#################
####################-] [-######| |#################
#####################| |#######| |#################
#####################| |########--] [--##################
####################-} {-#########| |####################
###################|4 6|###-----} {####################
###############----} |##|5 5 7|###################
##############| |##| |###################
##############| |--] |##| 7|###################
##############} {##|2 8|##| [----######---###########
#############|0 |##-----###}~ ~{########-}0 0{-#########
#############| |#########| 5 5 |######| |########
#############| 0|#########| |###--#] [---] |########
#############| |#########| > |##|55{} |##-} {-#######
#############|0 |#########| < {--} |#|e f|######
#############| |#########| |#| |######
#############| 0|##########----------]11[##| |######
#############| |#####################--###| |######
##############] [############################-] [-#######
##############| |--------#####################| {------##
##############| d|####################| |#
##############| |####--##--##--##--###--] |#
##############| d|##-}<>{}<>{}<>{}<>{-###| j |#
##############| {-} {--} |#
##############| d |#
##############| [-] [--------##
###############----------###-]><[]><[]><[]><[-###########
##############################--##--##--##--#############
#########################################################
\ No newline at end of file
......@@ -3,5 +3,5 @@
"albedo_aid": "bullet_none_albedo.ktx",
"normal_aid": "bullet_none_normal.ktx",
"brdf_aid": "bullet_none_brdf.ktx",
"emission_aid": ""
"emission_aid": "white"
}
......@@ -3,5 +3,5 @@
"albedo_aid": "floor_floor_albedo.ktx",
"normal_aid": "floor_floor_normal.ktx",
"brdf_aid": "floor_floor_brdf.ktx",
"emission_aid": ""
"emission_aid": "floor_floor_emission.ktx"
}
{
"substance_id": "default",
"albedo_aid": "wall_bottom_left_glow1_albedo.ktx",
"normal_aid": "wall_bottom_left_glow1_normal.ktx",
"brdf_aid": "wall_bottom_left_glow1_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "wall_bottom_left_glow2_albedo.ktx",
"normal_aid": "wall_bottom_left_glow2_normal.ktx",
"brdf_aid": "wall_bottom_left_glow2_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "wall_bottom_left_wall_inner_albedo.ktx",
"normal_aid": "wall_bottom_left_wall_inner_normal.ktx",
"brdf_aid": "wall_bottom_left_wall_inner_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "wall_bottom_left_wall_outer_albedo.ktx",
"normal_aid": "wall_bottom_left_wall_outer_normal.ktx",
"brdf_aid": "wall_bottom_left_wall_outer_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "wall_bottom_right_glow1_albedo.ktx",
"normal_aid": "wall_bottom_right_glow1_normal.ktx",
"brdf_aid": "wall_bottom_right_glow1_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "wall_bottom_right_glow2_albedo.ktx",
"normal_aid": "wall_bottom_right_glow2_normal.ktx",
"brdf_aid": "wall_bottom_right_glow2_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "wall_bottom_right_wall_inner_albedo.ktx",
"normal_aid": "wall_bottom_right_wall_inner_normal.ktx",
"brdf_aid": "wall_bottom_right_wall_inner_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "wall_bottom_right_wall_outer_albedo.ktx",
"normal_aid": "wall_bottom_right_wall_outer_normal.ktx",
"brdf_aid": "wall_bottom_right_wall_outer_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "wall_top_left_glow1_albedo.ktx",
"normal_aid": "wall_top_left_glow1_normal.ktx",
"brdf_aid": "wall_top_left_glow1_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "wall_top_left_glow2_albedo.ktx",
"normal_aid": "wall_top_left_glow2_normal.ktx",
"brdf_aid": "wall_top_left_glow2_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "wall_top_left_wall_inner_albedo.ktx",
"normal_aid": "wall_top_left_wall_inner_normal.ktx",
"brdf_aid": "wall_top_left_wall_inner_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "wall_top_left_wall_outer_albedo.ktx",
"normal_aid": "wall_top_left_wall_outer_normal.ktx",
"brdf_aid": "wall_top_left_wall_outer_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "wall_top_right_glow1_albedo.ktx",
"normal_aid": "wall_top_right_glow1_normal.ktx",
"brdf_aid": "wall_top_right_glow1_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "wall_top_right_glow2_albedo.ktx",
"normal_aid": "wall_top_right_glow2_normal.ktx",
"brdf_aid": "wall_top_right_glow2_brdf.ktx",
"emission_aid": "white"
}
{
"substance_id": "default",
"albedo_aid": "wall_top_right_wall_inner_albedo.ktx",
"normal_aid": "wall_top_right_wall_inner_normal.ktx",
"brdf_aid": "wall_top_right_wall_inner_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "wall_top_right_wall_outer_albedo.ktx",
"normal_aid": "wall_top_right_wall_outer_normal.ktx",
"brdf_aid": "wall_top_right_wall_outer_brdf.ktx",
"emission_aid": ""
}
{
"tile_size": 4,
"tiles": {
"|": {
"blueprint": "dummy_wall",
"solid": true
},
"-": {
"blueprint": "dummy_wall",
"solid": true
},
" ": {
"blueprint": "dummy_floor",
"solid": false
},
"#": {
"blueprint": "dummy_ceiling",
"solid": true
},
"p": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "player"
},
"h": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "hunting_enemy"
},
"b": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "basic_enemy"
},
"G": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "goal"
}
}
"tiles": {
"|": {
"blueprint": "dummy_wall",
"solid": true
},
"-": {
"blueprint": "dummy_wall",
"solid": true
},
" ": {
"blueprint": "dummy_floor",
"solid": false
},
"#": {
"blueprint": "dummy_ceiling",
"solid": true
},
"@": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "player"
},
"!": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "goal"
},
"0": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"1": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"2": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"3": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"4": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"5": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"6": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"7": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"8": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"<": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
">": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"a": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"b": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"c": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},
"d": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "moving_turret"
},
"e": {
"blueprint": "dummy_floor",
"solid": false,
"spawn": true,
"spawns": "static_turret"
},