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

76 Commits

Author SHA1 Message Date
Steffen Fündgens
8d12f676db Triangulated faces of the torch and added it to the Level again. 2014-12-19 15:09:00 +01:00
Steffen Fündgens
346f4b221c Removing useless mtl file. 2014-12-19 15:07:43 +01:00
Steffen Fündgens
f8215284af Changed the default objectNum for triggers from 1 to 0. Moved blocks up so they dont spawn in the heightmap. 2014-12-19 13:35:17 +01:00
Steffen Fündgens
f0a64f9a3a added comments to Compositions.xml and adjusted marble size. 2014-12-19 13:33:59 +01:00
Steffen Fündgens
053c645012 Moved triggers into compositions. 2014-12-16 13:46:49 +01:00
Faerbit
0d57bf65ef Made trigger more presentation friendly. 2014-12-15 23:36:22 +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
Steffen Fündgens
405d3bb505 Changed to Lvl1. 2014-12-15 18:58:32 +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
sfroitzheim
4e28d7c21b Version 1.1 of the heightmap 2014-12-15 15:45:56 +01:00
sfroitzheim
928898b1ca Added Heightmap prototype(could be garbage) 2014-12-15 15:13:29 +01:00
Steffen Fündgens
5c9a1bfb84 Merge branch 'master' of github.com:Faerbit/swp 2014-12-15 14:59:09 +01:00
Steffen Fündgens
0a2d0c2f75 Implemented half the loading of triggers. 2014-12-15 14:59:03 +01:00
sfroitzheim
4c4ac76c4c Added a simple wall to models/textures 2014-12-15 14:24:11 +01:00
sfroitzheim
762f466f14 Fixed Poles of Marble 2014-12-15 13:28:05 +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
Faerbit
067e3c1369 Removing torches for better testing. 2014-12-15 01:03:48 +01:00
Steffen Fündgens
94b122d220 Converter now adds a Dummy-Trigger to the xml. Copy and customize it in the Levelx.xml to create actual triggers. 2014-12-12 17:18:31 +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
c8a9ae2eb9 Merge branch 'master' of github.com:Faerbit/swp 2014-12-12 16:25:18 +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
sfroitzheim
fbe244c11a Triangulated Faces 2014-12-12 15:16:56 +01:00
sfroitzheim
4e336fbca4 Additional Marbletexture optimizing 2014-12-12 15:05:53 +01:00
sfroitzheim
5fa9899af9 Improved marbletexture and added Blenderfile 2014-12-12 14:58:12 +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
3e205b4157 merging 2014-12-08 14:19:23 +01:00
Steffen Fündgens
ff16297a63 Added error checking for all XML Queries, fixed bugs and continued to implement loading from xml. 2014-12-08 14:10:08 +01:00
Faerbit
d6c9d9b4ee Reexporting column, because it had no normals. 2014-12-08 13:43:47 +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
0bf148373a Merge branch 'master' of github.com:Faerbit/swp 2014-12-05 16:19:06 +01:00
Steffen Fündgens
13f8800785 Fixed the filesytem for the converter. 2014-12-05 16:18:48 +01:00
sfroitzheim
4db241acb1 Merge branch 'master' of https://github.com/Faerbit/swp 2014-12-05 15:01:16 +01:00
Steffen Fündgens
4c3f597822 Added Level0.png. 2014-12-05 15:00:46 +01:00
sfroitzheim
e15d3763fa Merge branch 'master' of https://github.com/Faerbit/swp 2014-12-05 14:51:23 +01:00
sfroitzheim
04f27bc965 Fixed some display bugs with the column. 2014-12-05 14:49:23 +01:00
Steffen Fündgens
5156ea0f9b Merge branch 'master' of github.com:Faerbit/swp 2014-12-05 14:45:57 +01:00
Steffen Fündgens
3fd4c4d156 Implemented error checking for XML. Fixed loading of OBJ-Files. 2014-12-05 14:45:44 +01:00
sfroitzheim
16c855d211 Added a movable Block that will be used to be pushed on switches. 2014-12-05 14:39:51 +01:00
sfroitzheim
cdb115d626 Changed Columntexture to something better. 2014-12-05 14:39:08 +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
8a686dc9a3 changed filePath to levelNum 2014-12-04 15:07:31 +01:00
Steffen Fündgens
10529b5a89 Merged master and converter 2014-12-02 13:17:33 +01:00
Steffen Fündgens
b36cbb9230 Compositions.xml makes sense now 2014-12-02 13:13:20 +01:00
Faerbit
0f94babcc2 Reexporting Block.obj, because normals were missing. 2014-12-01 13:55:47 +01:00