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 |
|
Faerbit
|
2a665005e8
|
Removing big textures as they are not needed.
|
2014-11-29 02:06:46 +01:00 |
|
Faerbit
|
690c7b629c
|
Removing useless files.
|
2014-11-29 01:36:59 +01:00 |
|
Steffen Fündgens
|
2ed33268cb
|
added example Compositions.xml, implemented most of newComposition() method
|
2014-11-28 17:05:49 +01:00 |
|
Faerbit
|
002cf31384
|
Moved Blenderfiles out of Levels because of packaging.
|
2014-11-28 16:47:35 +01:00 |
|
sfroitzheim
|
15b0b515e8
|
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
|
957ca84762
|
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
|
e9acd8ad88
|
Fixed origin of block.
|
2014-11-28 15:28:03 +01:00 |
|
Steffen Fündgens
|
3de10e73ae
|
skeleton runs now, only xml read/write missing
|
2014-11-25 13:51:25 +01:00 |
|
Steffen Fündgens
|
a4fc18f944
|
converter now takes the Level to convert as input
|
2014-11-24 13:21:52 +01:00 |
|
Faerbit
|
641f94b715
|
Changed skybox to skydome.
|
2014-11-22 00:39:58 +01:00 |
|
Faerbit
|
235cde0d74
|
Added skybox and refined fog a bit. Fog still needs a lot of work.
|
2014-11-21 02:38:03 +01:00 |
|
Faerbit
|
1a8f208841
|
Removing useless files.
|
2014-11-20 20:42:40 +01:00 |
|
Faerbit
|
3b769c220e
|
Resized large textures to one third of their size.
|
2014-11-18 19:39:44 +01:00 |
|
Steffen Fündgens
|
79d4cff49e
|
changed terrain normals to consider 8 vertices, looks the same
|
2014-11-18 13:09:55 +01:00 |
|
Faerbit
|
1e0157aa2a
|
Reexported objects and enabled smooth shading.
|
2014-11-17 22:03:28 +01:00 |
|
sfroitzheim
|
a8e255e94d
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2014-11-17 18:31:48 +01:00 |
|
sfroitzheim
|
4b6d6f1a6d
|
Changing marble model.
|
2014-11-17 18:31:22 +01:00 |
|
Fabian Klemp
|
173a188467
|
Changing sand texture to a seamless sand texture.
|
2014-11-17 18:18:57 +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 |
|