sfroitzheim bdb92b2cf1 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
..
BackupLevel0.png	Fixed the filesytem for the converter.	2014-12-05 16:18:48 +01:00
BackupLevel1.png	Fixed a few bugs like duplicate marble(bridge will be fixed at monday)	2015-01-16 16:47:55 +01:00
BackupLevel1.xcf	Additional changes with the heightmap	2015-01-16 16:37:00 +01:00
BackupLevel1.xml	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
Compositions.xml	Merge branch 'master' of https://github.com/Faerbit/swp	2015-01-23 14:06:20 +01:00
Level0.png	Removing torches for better testing.	2014-12-15 01:03:48 +01:00
Level0.xcf	skeleton runs now, only xml read/write missing	2014-11-25 13:51:25 +01:00
Level0.xml	Removing torches for better testing.	2014-12-15 01:03:48 +01:00
Level1.png	Merge branch 'master' of https://github.com/Faerbit/swp	2015-01-23 13:56:40 +01:00
Level1.xcf	Merge branch 'master' of https://github.com/Faerbit/swp	2015-01-23 14:06:20 +01:00
Level1.xml	Merge branch 'master' of https://github.com/Faerbit/swp	2015-01-23 13:56:40 +01:00