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

113 Commits

Author SHA1 Message Date
sfroitzheim
0eacb96e81 Version 1.1 of the heightmap 2014-12-15 15:45:56 +01:00
sfroitzheim
6b3db436dc Added Heightmap prototype(could be garbage) 2014-12-15 15:13:29 +01:00
Steffen Fündgens
db1de34bce Merge branch 'master' of github.com:Faerbit/swp 2014-12-15 14:59:09 +01:00
Steffen Fündgens
66cf9ef8d6 Implemented half the loading of triggers. 2014-12-15 14:59:03 +01:00
sfroitzheim
121f357d23 Added a simple wall to models/textures 2014-12-15 14:24:11 +01:00
sfroitzheim
9c92954bc0 Fixed Poles of Marble 2014-12-15 13:28:05 +01:00
Steffen Fündgens
56be22a460 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
b5f7e73c4c Removing torches for better testing. 2014-12-15 01:03:48 +01:00
Steffen Fündgens
c406bd4b62 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
caea9b7181 Implemented loading of physical objects. Compositions.xml holds mostly Dummy-Values for those. 2014-12-12 16:52:05 +01:00
Steffen Fündgens
f8d9ff0919 Adjusted the name of the marbles texture in Compositions.xml... 2014-12-12 16:28:34 +01:00
Steffen Fündgens
71a05e5b1e Merge branch 'master' of github.com:Faerbit/swp 2014-12-12 16:25:18 +01:00
Steffen Fündgens
d67b7b5b23 Implemented loading of gloabal lighting. Added physics parameters to Compositions.xml. 2014-12-12 16:24:47 +01:00
sfroitzheim
a05095c9dd Triangulated Faces 2014-12-12 15:16:56 +01:00
sfroitzheim
cc64a524fc Additional Marbletexture optimizing 2014-12-12 15:05:53 +01:00
sfroitzheim
b5e5289511 Improved marbletexture and added Blenderfile 2014-12-12 14:58:12 +01:00
Steffen Fündgens
2790bddd11 Added loading of lights, adjusted Compositions.xml and Level0.png to test it. 2014-12-08 15:19:50 +01:00
Steffen Fündgens
68202bdef2 merging 2014-12-08 14:19:23 +01:00
Steffen Fündgens
b0b43cc2ee 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
b51cc256bd Reexporting column, because it had no normals. 2014-12-08 13:43:47 +01:00
Steffen Fündgens
f4529d1430 Added objectData to Compositions.xml. It contains texture data as of now. 2014-12-05 16:55:17 +01:00
Steffen Fündgens
a6c65efcee Changed model and texture names to not start with capital letters. 2014-12-05 16:36:31 +01:00
Steffen Fündgens
b5deb6b9e7 Merge branch 'master' of github.com:Faerbit/swp 2014-12-05 16:19:06 +01:00
Steffen Fündgens
da197f063f Fixed the filesytem for the converter. 2014-12-05 16:18:48 +01:00
sfroitzheim
4805a4a3ce Merge branch 'master' of https://github.com/Faerbit/swp 2014-12-05 15:01:16 +01:00
Steffen Fündgens
e79128a1a5 Added Level0.png. 2014-12-05 15:00:46 +01:00
sfroitzheim
3268881a13 Merge branch 'master' of https://github.com/Faerbit/swp 2014-12-05 14:51:23 +01:00
sfroitzheim
c899c4e67e Fixed some display bugs with the column. 2014-12-05 14:49:23 +01:00
Steffen Fündgens
41584ef993 Merge branch 'master' of github.com:Faerbit/swp 2014-12-05 14:45:57 +01:00
Steffen Fündgens
24edf1aca9 Implemented error checking for XML. Fixed loading of OBJ-Files. 2014-12-05 14:45:44 +01:00
sfroitzheim
73d5e5fd52 Added a movable Block that will be used to be pushed on switches. 2014-12-05 14:39:51 +01:00
sfroitzheim
d4168fb002 Changed Columntexture to something better. 2014-12-05 14:39:08 +01:00
Steffen Fündgens
5e44f9680e integrating tinyxml into level, adding lights to compositions 2014-12-05 12:47:02 +01:00
Steffen Fündgens
0e06ae9fd3 changed filePath to levelNum 2014-12-04 15:07:31 +01:00
Steffen Fündgens
4adc1198b8 Merged master and converter 2014-12-02 13:17:33 +01:00
Steffen Fündgens
b6c694b350 Compositions.xml makes sense now 2014-12-02 13:13:20 +01:00
Faerbit
ed889ebd76 Reexporting Block.obj, because normals were missing. 2014-12-01 13:55:47 +01:00
Faerbit
8317188314 Removing big textures as they are not needed. 2014-11-29 02:06:46 +01:00
Faerbit
f3f870c2d1 Removing useless files. 2014-11-29 01:36:59 +01:00
Steffen Fündgens
9f1a931b0b added example Compositions.xml, implemented most of newComposition() method 2014-11-28 17:05:49 +01:00
Faerbit
869e1ed415 Moved Blenderfiles out of Levels because of packaging. 2014-11-28 16:47:35 +01:00
sfroitzheim
414da9ba7e 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
150a556c22 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
00cdbe4c5e Fixed origin of block. 2014-11-28 15:28:03 +01:00
Steffen Fündgens
6b904894c6 skeleton runs now, only xml read/write missing 2014-11-25 13:51:25 +01:00
Steffen Fündgens
7bf1d8eed4 converter now takes the Level to convert as input 2014-11-24 13:21:52 +01:00
Faerbit
3a9a04d4d6 Changed skybox to skydome. 2014-11-22 00:39:58 +01:00
Faerbit
c47ed4646d Added skybox and refined fog a bit. Fog still needs a lot of work. 2014-11-21 02:38:03 +01:00
Faerbit
eadc819f80 Removing useless files. 2014-11-20 20:42:40 +01:00
Faerbit
2638b43b44 Resized large textures to one third of their size. 2014-11-18 19:39:44 +01:00
Steffen Fündgens
5a92765518 changed terrain normals to consider 8 vertices, looks the same 2014-11-18 13:09:55 +01:00
Faerbit
6a8182ab8d Reexported objects and enabled smooth shading. 2014-11-17 22:03:28 +01:00
sfroitzheim
c403814cd6 Merge branch 'master' of https://github.com/Faerbit/swp 2014-11-17 18:31:48 +01:00
sfroitzheim
c58e4d01b1 Changing marble model. 2014-11-17 18:31:22 +01:00
Fabian Klemp
9611c9ef08 Changing sand texture to a seamless sand texture. 2014-11-17 18:18:57 +01:00
Fabian Klemp
29f24d6f05 Adding column and block ruins. 2014-11-17 15:29:38 +01:00
Fabian Klemp
6f7486b3f8 Fixed normals. 2014-11-17 15:19:19 +01:00
Fabian Klemp
4dc7897f8c Removed middle Ring. 2014-11-17 15:04:59 +01:00
Fabian Klemp
48691338ba Basic Marble Model with Textures added. 2014-11-17 14:38:35 +01:00
Fabian Klemp
0b7f8e95d3 Adding torch. 2014-11-17 14:23:23 +01:00
Steffen Fündgens
29f4cf6279 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