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

108 Commits

Author SHA1 Message Date
Steffen Fündgens
a393fb688d Implemented half the loading of triggers. 2014-12-15 14:59:03 +01:00
sfroitzheim
ea587dc26b Added a simple wall to models/textures 2014-12-15 14:24:11 +01:00
sfroitzheim
f03274082e Fixed Poles of Marble 2014-12-15 13:28:05 +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
Faerbit
5b2233e1b3 Removing torches for better testing. 2014-12-15 01:03:48 +01:00
Steffen Fündgens
b4e9218e95 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
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
45d4b944c4 Merge branch 'master' of github.com:Faerbit/swp 2014-12-12 16:25:18 +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
sfroitzheim
cb488035cb Triangulated Faces 2014-12-12 15:16:56 +01:00
sfroitzheim
291a0f1899 Additional Marbletexture optimizing 2014-12-12 15:05:53 +01:00
sfroitzheim
d21569e71b Improved marbletexture and added Blenderfile 2014-12-12 14:58:12 +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
4ad1f0607d merging 2014-12-08 14:19:23 +01:00
Steffen Fündgens
db1092be44 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
6eb52d2dab Reexporting column, because it had no normals. 2014-12-08 13:43:47 +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
780897e1ab Merge branch 'master' of github.com:Faerbit/swp 2014-12-05 16:19:06 +01:00
Steffen Fündgens
cfe29d2830 Fixed the filesytem for the converter. 2014-12-05 16:18:48 +01:00
sfroitzheim
0e2f5ac580 Merge branch 'master' of https://github.com/Faerbit/swp 2014-12-05 15:01:16 +01:00
Steffen Fündgens
ca3b29251e Added Level0.png. 2014-12-05 15:00:46 +01:00
sfroitzheim
cb825a6588 Merge branch 'master' of https://github.com/Faerbit/swp 2014-12-05 14:51:23 +01:00
sfroitzheim
f83bb7ec7d Fixed some display bugs with the column. 2014-12-05 14:49:23 +01:00
Steffen Fündgens
097e1acfbc Merge branch 'master' of github.com:Faerbit/swp 2014-12-05 14:45:57 +01:00
Steffen Fündgens
4d1fbc6045 Implemented error checking for XML. Fixed loading of OBJ-Files. 2014-12-05 14:45:44 +01:00
sfroitzheim
3f9d8a815b Added a movable Block that will be used to be pushed on switches. 2014-12-05 14:39:51 +01:00
sfroitzheim
de47c1bdd6 Changed Columntexture to something better. 2014-12-05 14:39:08 +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
f218a141fa changed filePath to levelNum 2014-12-04 15:07:31 +01:00
Steffen Fündgens
2a9bfbf5da Merged master and converter 2014-12-02 13:17:33 +01:00
Steffen Fündgens
37c1006431 Compositions.xml makes sense now 2014-12-02 13:13:20 +01:00
Faerbit
85215a1a95 Reexporting Block.obj, because normals were missing. 2014-12-01 13:55:47 +01:00
Faerbit
0865c356be Removing big textures as they are not needed. 2014-11-29 02:06:46 +01:00
Faerbit
220b72f85b Removing useless files. 2014-11-29 01:36:59 +01:00
Steffen Fündgens
f6bdf5dc32 added example Compositions.xml, implemented most of newComposition() method 2014-11-28 17:05:49 +01:00
Faerbit
cc9f2a3916 Moved Blenderfiles out of Levels because of packaging. 2014-11-28 16:47:35 +01:00
sfroitzheim
808a7a0569 Added switch models and textures in 2 seperate parts (switchInner is the movable object - size may needs to be changed in the future) 2014-11-28 16:38:55 +01:00
sfroitzheim
263e9e72af Added all blender files (except marble, as I don't have the newest and smoothed version) 2014-11-28 16:31:50 +01:00
sfroitzheim
348d624564 Fixed origin of block. 2014-11-28 15:28:03 +01:00
Steffen Fündgens
20e7c732e2 skeleton runs now, only xml read/write missing 2014-11-25 13:51:25 +01:00
Steffen Fündgens
91099d91a0 converter now takes the Level to convert as input 2014-11-24 13:21:52 +01:00
Faerbit
22c9a7a936 Changed skybox to skydome. 2014-11-22 00:39:58 +01:00
Faerbit
c7518a7f8e Added skybox and refined fog a bit. Fog still needs a lot of work. 2014-11-21 02:38:03 +01:00
Faerbit
d84a4640d5 Removing useless files. 2014-11-20 20:42:40 +01:00
Faerbit
0e3dc33b80 Resized large textures to one third of their size. 2014-11-18 19:39:44 +01:00
Steffen Fündgens
d6ee36c071 changed terrain normals to consider 8 vertices, looks the same 2014-11-18 13:09:55 +01:00
Faerbit
e0c8820bd0 Reexported objects and enabled smooth shading. 2014-11-17 22:03:28 +01:00
sfroitzheim
4b6d6f1a6d Changing marble model. 2014-11-17 18:31:22 +01:00
Fabian Klemp
682a25a7ee Adding column and block ruins. 2014-11-17 15:29:38 +01:00
Fabian Klemp
976567fd97 Fixed normals. 2014-11-17 15:19:19 +01:00
Fabian Klemp
59c1798ea0 Removed middle Ring. 2014-11-17 15:04:59 +01:00
Fabian Klemp
8d082e203b Basic Marble Model with Textures added. 2014-11-17 14:38:35 +01:00
Fabian Klemp
1b876b4c35 Adding torch. 2014-11-17 14:23:23 +01:00
Steffen Fündgens
9024d29d12 Reorganizing file structure. 2014-11-17 13:36:05 +01:00
Steffen Fündgens
8eec5fa49e debuged the load function in terrain.cc loading and rendering kind of works (no texture) 2014-11-11 12:22:47 +01:00
Steffen Fündgens
c030799799 added 'Levels' folder to point filePaths at 2014-11-07 16:48:29 +01:00