faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity
535 Commits 16 Branches 6 Tags 174 MiB
8620e16681
Commit Graph

40 Commits

Author SHA1 Message Date
sfroitzheim
e0d9058aef Fixed some problems with the new bridge (wasn't able to roll onto it) and changed some heightmap heights 2015-01-28 15:49:38 +01:00
sfroitzheim
190df8b936 Added a model for a gate and added it to the scene with some additional level improvements 2015-01-28 15:19:35 +01:00
sfroitzheim
89741cfcb3 Added some walls to the scene properly (weird physics bugs are apparent) 2015-01-23 14:56:02 +01:00
sfroitzheim
db3fab3d35 Fixed merge conflicts. 2015-01-23 14:10:35 +01:00
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
Jasper
47b386296a constraints work. Why? because i said so! 2015-01-23 12:59:28 +01:00
Jasper
099e0c17c7 Merge branch 'master' of github.com:Faerbit/swp 2015-01-19 18:30:12 +01:00
Jasper
99217ed399 Added light block and changed physics parameters. 2015-01-19 18:28:28 +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
Steffen Fündgens
5070940a94 Merge branch 'master' of github.com:Faerbit/swp 2015-01-19 15:55:18 +01:00
Steffen Fündgens
4c71dbfbea Added rotation in Compompositions.xml. 2015-01-19 15:55:03 +01:00
sfroitzheim
aeb4b638c7 Merge branch 'master' of https://github.com/Faerbit/swp 
Conflicts:
	Levels/ObjectSetups/Level1.xml
 2015-01-19 15:18:34 +01:00
sfroitzheim
65ba8c0249 Added improved starting bridge version 2015-01-19 15:15:18 +01:00
Jasper
5670d35865 fixed the issue with shpere portruding into blocks 2015-01-19 15:11:56 +01:00
Steffen
2327d80810 Added new composition 2015-01-17 12:38:27 +01:00
Steffen
a128c947b1 Added ignoreHeightmap option to compositions in Compositions.xml. 2015-01-17 12:24:54 +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
638323c1c2 Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-16 16:38:24 +01:00
sfroitzheim
073000d097 Additional changes with the heightmap 2015-01-16 16:37:00 +01:00
Jasper
3cba239897 Fixed block so that it doesnt BLOW EVERYTHING UP! 2015-01-16 15:40:07 +01:00
Steffen Fündgens
70e2ebb605 Moved all dampning parameters (except for the camera) to Compositions.xml. 2015-01-06 13:31:53 +01:00
Steffen Fündgens
1cdca7b686 added comments to Compositions.xml and adjusted marble size. 2014-12-19 13:33:59 +01:00
Faerbit
6b64ec7360 Made level more presentation friendly. 2014-12-15 22:58:48 +01:00
Jasper
8072fd1cbb Merge branch 'master' of github.com:Faerbit/swp 
Conflicts:
	level.cc
 2014-12-15 19:13:25 +01:00
Jasper
9fd8ae5cd8 Tried to adjust box. 2014-12-15 19:11:28 +01:00
Steffen Fündgens
32f8683367 Fixing texture file name of marble. 2014-12-15 19:00:07 +01:00
Jasper
7013f7cf71 Merge branch 'master' of github.com:Faerbit/swp 2014-12-15 16:04:36 +01:00
Jasper
00716b63bd Composition scales addapted 
Physics added trimeshshapes
 2014-12-15 16:02:04 +01:00
Steffen Fündgens
a393fb688d Implemented half the loading of triggers. 2014-12-15 14:59:03 +01:00
Steffen Fündgens
f681987358 Moved mass from objectType to singular objects. Now loading physics from xml, but with a dummy-box instead of meshes. 2014-12-15 13:08:35 +01:00
Steffen Fündgens
8a7f7da0a8 Implemented loading of physical objects. Compositions.xml holds mostly Dummy-Values for those. 2014-12-12 16:52:05 +01:00
Steffen Fündgens
89d3b48c47 Adjusted the name of the marbles texture in Compositions.xml... 2014-12-12 16:28:34 +01:00
Steffen Fündgens
b0c371f610 Implemented loading of gloabal lighting. Added physics parameters to Compositions.xml. 2014-12-12 16:24:47 +01:00
Steffen Fündgens
5f16738c39 Added loading of lights, adjusted Compositions.xml and Level0.png to test it. 2014-12-08 15:19:50 +01:00
Steffen Fündgens
2a501ac047 Added objectData to Compositions.xml. It contains texture data as of now. 2014-12-05 16:55:17 +01:00
Steffen Fündgens
3339ac208e Changed model and texture names to not start with capital letters. 2014-12-05 16:36:31 +01:00
Steffen Fündgens
4d1fbc6045 Implemented error checking for XML. Fixed loading of OBJ-Files. 2014-12-05 14:45:44 +01:00
Steffen Fündgens
086e13ac8e integrating tinyxml into level, adding lights to compositions 2014-12-05 12:47:02 +01:00
Steffen Fündgens
37c1006431 Compositions.xml makes sense now 2014-12-02 13:13:20 +01:00
Steffen Fündgens
f6bdf5dc32 added example Compositions.xml, implemented most of newComposition() method 2014-11-28 17:05:49 +01:00