Faerbit
|
6b64ec7360
|
Made level more presentation friendly.
|
2014-12-15 22:58:48 +01:00 |
|
Jasper
|
8072fd1cbb
|
Merge branch 'master' of github.com:Faerbit/swp
Conflicts:
level.cc
|
2014-12-15 19:13:25 +01:00 |
|
Jasper
|
9fd8ae5cd8
|
Tried to adjust box.
|
2014-12-15 19:11:28 +01:00 |
|
Steffen Fündgens
|
32f8683367
|
Fixing texture file name of marble.
|
2014-12-15 19:00:07 +01:00 |
|
Jasper
|
7013f7cf71
|
Merge branch 'master' of github.com:Faerbit/swp
|
2014-12-15 16:04:36 +01:00 |
|
Jasper
|
00716b63bd
|
Composition scales addapted
Physics added trimeshshapes
|
2014-12-15 16:02:04 +01:00 |
|
Steffen Fündgens
|
a393fb688d
|
Implemented half the loading of triggers.
|
2014-12-15 14:59:03 +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 |
|
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
|
b0c371f610
|
Implemented loading of gloabal lighting. Added physics parameters to Compositions.xml.
|
2014-12-12 16:24:47 +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
|
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
|
4d1fbc6045
|
Implemented error checking for XML. Fixed loading of OBJ-Files.
|
2014-12-05 14:45:44 +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
|
37c1006431
|
Compositions.xml makes sense now
|
2014-12-02 13:13:20 +01:00 |
|
Steffen Fündgens
|
f6bdf5dc32
|
added example Compositions.xml, implemented most of newComposition() method
|
2014-11-28 17:05:49 +01:00 |
|