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

Merge branch 'develop' into feature/6-enemy-movement

parents b9008682 f3fde2ae
Pipeline #3255 failed with stage
in 6 minutes and 46 seconds
tiles: = tilesets/*.json
level: = level/*.lvl
{
"Transform": {
},
"Transform": {},
"Camera": {
"fov": 50.0,
"near": 0.05,
......@@ -15,6 +14,6 @@
},
"Spring": {
"spring_constant": 20.0,
"mass": 1.0
"mass": 1.0
}
}
{
"Transform": {
"scale": {
"x": 2.0,
"y": 2.0,
"z": 2.0
}
},
"Model": {
"aid": "model:dummy_ceiling"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 2.0,
"y": 2.0,
"z": 2.0
}
},
"Model": {
"aid": "model:dummy_floor"
},
"Shadowcaster": {}
}
{
"Transform": {
"scale": {
"x": 2.0,
"y": 2.0,
"z": 2.0
}
},
"Model": {
"aid": "model:dummy_wall"
},
"Shadowcaster": {}
}
dummy
##################
##----############
#| |---------##
#| p |#
#| |---- |#
##----####| |#
##########| |#
###########-----##
##################
{
"substance_id": "default",
"albedo_aid": "dummy_ceiling_none_albedo.ktx",
"normal_aid": "dummy_ceiling_none_normal.ktx",
"brdf_aid": "dummy_ceiling_none_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "dummy_floor_none.001_albedo.ktx",
"normal_aid": "dummy_floor_none.001_normal.ktx",
"brdf_aid": "dummy_floor_none.001_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "dummy_wall_horizontal_none_albedo.ktx",
"normal_aid": "dummy_wall_horizontal_none_normal.ktx",
"brdf_aid": "dummy_wall_horizontal_none_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "dummy_wall_none_albedo.ktx",
"normal_aid": "dummy_wall_none_normal.ktx",
"brdf_aid": "dummy_wall_none_brdf.ktx",
"emission_aid": ""
}
{
"substance_id": "default",
"albedo_aid": "dummy_wall_vertical_none_albedo.ktx",
"normal_aid": "dummy_wall_vertical_none_normal.ktx",
"brdf_aid": "dummy_wall_vertical_none_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