sfroitzheim
|
637568fd26
|
Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
Levels/ObjectSetups/Compositions.xml
Levels/ObjectSetups/Level1.png
Levels/ObjectSetups/Level1.xcf
Levels/ObjectSetups/Level1.xml
|
2015-01-23 14:06:20 +01:00 |
|
sfroitzheim
|
e2c3be7d5d
|
Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
Levels/ObjectSetups/Level1.xml
|
2015-01-23 13:56:40 +01:00 |
|
Jasper
|
81c09eb33a
|
constraints work. Why? because i said so!
|
2015-01-23 12:59:28 +01:00 |
|
sfroitzheim
|
c9694f0b5a
|
Added some walls and made some fixes (there are too many walls, I will fix this till tomorrow)
|
2015-01-19 16:47:17 +01:00 |
|
sfroitzheim
|
e04aca7841
|
Added improved starting bridge version
|
2015-01-19 15:15:18 +01:00 |
|
sfroitzheim
|
8d46d98de0
|
Added torch for testing.
|
2015-01-19 13:59:50 +01:00 |
|
sfroitzheim
|
ec29499416
|
Fixed a few bugs like duplicate marble(bridge will be fixed at monday)
|
2015-01-16 16:47:55 +01:00 |
|
sfroitzheim
|
a83e6155b3
|
Additional changes with the heightmap
|
2015-01-16 16:37:00 +01:00 |
|