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

Merge branch 'develop' into 'feature/36-level-design'

# Conflicts:
#   assets/game_assets/tilesets/tileset.json
parents 4d496516 3fb64e03
Pipeline #3441 passed with stage
in 3 minutes and 51 seconds
{
"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|#
###########-----##
......
{
"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": ""
}
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