Commit ccb6e796 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 9c0eaad1 1aa7d115
Pipeline #3414 passed with stage
in 9 minutes and 7 seconds
{
"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": {
......@@ -19,14 +19,26 @@
},
"Input_controller": {},
"Player": {},
"Dash": {
"attack_width": 0.5
},
"Stationary_attack": {
"radius": 3
},
"Rigid_body": {
"radius": 0.5
},
"Target": {}
"Dash": {
"attack_width": 0.5
},
"Stationary_attack": {
"radius": 3
},
"Rigid_body": {
"radius": 0.5
},
"Target": {},
"Pose": {
"skeleton": "skel:character"
},
"Animation": {},
"Simple_animation_controller": {
"animations": {
"idle": "anim:idle"
},
"current_animation": {
"id": "idle"
}
}
}
{
"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
##################
##----############
#| |---------##
......
......@@ -14,4 +14,4 @@ dummy
####| h h h h h - |#
####| h h h h |#
####|-------------------------|#
################################
\ No newline at end of file
################################
{
"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": ""
}
{
"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_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": ""
}
{
"tile_size": 4,
"tiles": {
"#": {
"blueprint": "ceiling",
"solid": true
},
" ": {
"blueprint": "floor",
"solid": false
},
"-": {
"blueprint": "wall_horizontal",
"solid": true
},
"|": {
"blueprint": "wall_vertical",
"solid": true
},
"p": {
"blueprint": "floor",
"solid": false,
"spawn": true,
"spawns": "player"
},
"h": {
"blueprint": "floor",
"solid": false,
"spawn": true,
"spawns": "hunting_enemy"
},
"b": {
"blueprint": "floor",
"solid": false,
"spawn": true,
"spawns": "basic_enemy"
},
"G": {
"blueprint": "floor",
"solid": false,
"spawn": true,
"spawns": "goal"
}
}
}
No preview for this file type
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
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