Commit Graph

8 Commits

Author SHA1 Message Date
sfroitzheim
89741cfcb3 Added some walls to the scene properly (weird physics bugs are apparent) 2015-01-23 14:56:02 +01:00
sfroitzheim
7c1f0e7960 Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
	Levels/ObjectSetups/Level1.xml
2015-01-23 13:56:40 +01:00
sfroitzheim
4ce7464ae7 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
65ba8c0249 Added improved starting bridge version 2015-01-19 15:15:18 +01:00
sfroitzheim
42b65fa9c0 Added torch for testing. 2015-01-19 13:59:50 +01:00
sfroitzheim
98091fa305 Fixed a few bugs like duplicate marble(bridge will be fixed at monday) 2015-01-16 16:47:55 +01:00
sfroitzheim
073000d097 Additional changes with the heightmap 2015-01-16 16:37:00 +01:00
Faerbit
6b64ec7360 Made level more presentation friendly. 2014-12-15 22:58:48 +01:00