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

39 Commits

Author SHA1 Message Date
Faerbit
cf9e3e2b39 Fixed saving of depthbuffer. 2015-01-26 23:11:04 +01:00
sfroitzheim
06002f78b6 Added some walls to the scene properly (weird physics bugs are apparent) 2015-01-23 14:56:02 +01:00
sfroitzheim
73704434b1 Fixed merge conflicts. 2015-01-23 14:10:35 +01:00
sfroitzheim
0d185fd924 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
adf355cc46 constraints work. Why? because i said so! 2015-01-23 12:59:28 +01:00
Jasper
bea8436a8d Merge branch 'master' of github.com:Faerbit/swp 2015-01-19 18:30:12 +01:00
Jasper
2f980e678c Added light block and changed physics parameters. 2015-01-19 18:28:28 +01:00
sfroitzheim
1e6942ae37 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
a4b734ac5b Merge branch 'master' of github.com:Faerbit/swp 2015-01-19 15:55:18 +01:00
Steffen Fündgens
3f33d6cf86 Added rotation in Compompositions.xml. 2015-01-19 15:55:03 +01:00
sfroitzheim
8c5d485101 Merge branch 'master' of https://github.com/Faerbit/swp 
Conflicts:
	Levels/ObjectSetups/Level1.xml
 2015-01-19 15:18:34 +01:00
sfroitzheim
1de9e862d0 Added improved starting bridge version 2015-01-19 15:15:18 +01:00
Jasper
0d101a3e4b fixed the issue with shpere portruding into blocks 2015-01-19 15:11:56 +01:00
Steffen
abf382a70e Added new composition 2015-01-17 12:38:27 +01:00
Steffen
acd847921d Added ignoreHeightmap option to compositions in Compositions.xml. 2015-01-17 12:24:54 +01:00
sfroitzheim
44d7d4f107 Fixed a few bugs like duplicate marble(bridge will be fixed at monday) 2015-01-16 16:47:55 +01:00
sfroitzheim
b5937ce772 Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-16 16:38:24 +01:00
sfroitzheim
036a9cb365 Additional changes with the heightmap 2015-01-16 16:37:00 +01:00
Jasper
86fd4a6123 Fixed block so that it doesnt BLOW EVERYTHING UP! 2015-01-16 15:40:07 +01:00
Steffen Fündgens
b8d45cc522 Moved all dampning parameters (except for the camera) to Compositions.xml. 2015-01-06 13:31:53 +01:00
Steffen Fündgens
f0a64f9a3a added comments to Compositions.xml and adjusted marble size. 2014-12-19 13:33:59 +01:00
Faerbit
4561145495 Made level more presentation friendly. 2014-12-15 22:58:48 +01:00
Jasper
33173a4db4 Merge branch 'master' of github.com:Faerbit/swp 
Conflicts:
	level.cc
 2014-12-15 19:13:25 +01:00
Jasper
7bfc171459 Tried to adjust box. 2014-12-15 19:11:28 +01:00
Steffen Fündgens
652728b9e3 Fixing texture file name of marble. 2014-12-15 19:00:07 +01:00
Jasper
2cd5351b06 Merge branch 'master' of github.com:Faerbit/swp 2014-12-15 16:04:36 +01:00
Jasper
326f038dcc Composition scales addapted 
Physics added trimeshshapes
 2014-12-15 16:02:04 +01:00
Steffen Fündgens
0a2d0c2f75 Implemented half the loading of triggers. 2014-12-15 14:59:03 +01:00
Steffen Fündgens
0a54807ceb 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
f43f866fc4 Implemented loading of physical objects. Compositions.xml holds mostly Dummy-Values for those. 2014-12-12 16:52:05 +01:00
Steffen Fündgens
f8773134f5 Adjusted the name of the marbles texture in Compositions.xml... 2014-12-12 16:28:34 +01:00
Steffen Fündgens
8bba52d35d Implemented loading of gloabal lighting. Added physics parameters to Compositions.xml. 2014-12-12 16:24:47 +01:00
Steffen Fündgens
d2afede893 Added loading of lights, adjusted Compositions.xml and Level0.png to test it. 2014-12-08 15:19:50 +01:00
Steffen Fündgens
ab3f644ad3 Added objectData to Compositions.xml. It contains texture data as of now. 2014-12-05 16:55:17 +01:00
Steffen Fündgens
1e82b32032 Changed model and texture names to not start with capital letters. 2014-12-05 16:36:31 +01:00
Steffen Fündgens
3fd4c4d156 Implemented error checking for XML. Fixed loading of OBJ-Files. 2014-12-05 14:45:44 +01:00
Steffen Fündgens
56c2655b34 integrating tinyxml into level, adding lights to compositions 2014-12-05 12:47:02 +01:00
Steffen Fündgens
b36cbb9230 Compositions.xml makes sense now 2014-12-02 13:13:20 +01:00
Steffen Fündgens
2ed33268cb added example Compositions.xml, implemented most of newComposition() method 2014-11-28 17:05:49 +01:00