Commit 95ddf362 authored by Tim Scheiber's avatar Tim Scheiber

Merge branch 'develop' of...

Merge branch 'develop' of gitlab.fsi.hochschule-trier.de:GameDevWeek/sommersemester-2019/cpp/phaseshifter into develop
parents 738a1600 170db4bc
......@@ -28,10 +28,10 @@
},
"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
}
}
}
......@@ -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"
}
{
"tile_size": 4,
"tile_size": 4,
"tiles": {
"#": {
"blueprint": "ceiling",
......@@ -18,19 +18,19 @@
"solid": true
},
"[": {
"blueprint": "wall_vertical",
"blueprint": "wall_top_right",
"solid": true
},
"]": {
"blueprint": "wall_vertical",
"blueprint": "wall_top_left",
"solid": true
},
"{": {
"blueprint": "wall_vertical",
"blueprint": "wall_bottom_right",
"solid": true
},
"}": {
"blueprint": "wall_vertical",
"blueprint": "wall_bottom_left",
"solid": true
},
"~": {
......
Subproject commit d997d0e29bbbbe10a5eb9c211f8131a8e46135b0
Subproject commit 57bcafb5c858c315b9b8cfc00624505d46ea91a0
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