Commit Graph

85 Commits

Author SHA1 Message Date
Steffen Fündgens
76b8b3bc03 Moved triggering to lua, got a strange bug with the const char* holding the name of the lua script. 2015-01-13 13:52:22 +01:00
Steffen Fündgens
b8d45cc522 Moved all dampning parameters (except for the camera) to Compositions.xml. 2015-01-06 13:31:53 +01:00
Steffen Fündgens
3560957d67 Moved friction and player strength to Level.xml. 2015-01-06 13:14:30 +01:00
Steffen Fündgens
6bec8fc01d Added the option to give a trigger a target composition. The position the trigger activates at is the old manually set position + the position of the target composition. 2014-12-19 16:15:29 +01:00
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
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
Steffen Fündgens
0a2d0c2f75 Implemented half the loading of triggers. 2014-12-15 14:59:03 +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
8bba52d35d Implemented loading of gloabal lighting. Added physics parameters to Compositions.xml. 2014-12-12 16:24:47 +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
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
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
13f8800785 Fixed the filesytem for the converter. 2014-12-05 16:18:48 +01:00
Steffen Fündgens
4c3f597822 Added Level0.png. 2014-12-05 15:00:46 +01:00
Steffen Fündgens
3fd4c4d156 Implemented error checking for XML. Fixed loading of OBJ-Files. 2014-12-05 14:45:44 +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
b36cbb9230 Compositions.xml makes sense now 2014-12-02 13:13:20 +01:00
Steffen Fündgens
2ed33268cb added example Compositions.xml, implemented most of newComposition() method 2014-11-28 17:05:49 +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