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

114 Commits

Author SHA1 Message Date
Steffen
36ea806c4f Added the option to define initial position constraints in the Level.xml file. 2015-01-17 14:07:12 +01:00
Steffen
698d917d4c Created a moveObject function in the Level class. 2015-01-17 13:30:33 +01:00
Steffen
b3f11542d2 Removed the lua state from the physics. 2015-01-17 13:11:43 +01:00
Steffen
acd847921d Added ignoreHeightmap option to compositions in Compositions.xml. 2015-01-17 12:24:54 +01:00
sfroitzheim
036a9cb365 Additional changes with the heightmap 2015-01-16 16:37:00 +01:00
Steffen Fündgens
5ce1b3a86d Triggers now adapt if the object they want to do something with gets deleted or changes its index. 2015-01-13 18:18:13 +01:00
Steffen Fündgens
b09451092b Now passing the Lua State to the physics, so that Lua can directly access physics functions. 2015-01-13 17:50:15 +01:00
Steffen Fündgens
74d45e7d38 Lua script works now, worked around the bug by saving the name as a std::string. 2015-01-13 17:21:15 +01:00
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
6f30050403 Integrated Lua into our project. Triggers are now able to call a Lua Script. Havent figured out how to let the Script do anything usefull yet. 2015-01-09 16:51:28 +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
bc348aef35 Also increased strength of the player ball. 2014-12-19 15:21:38 +01:00
Steffen Fündgens
053c645012 Moved triggers into compositions. 2014-12-16 13:46:49 +01:00
Fabian Klemp
1ebccbf325 Moved trigger functions to trigger class. 2014-12-16 12:40:30 +01:00
Fabian Klemp
64f3518dc3 Fixed triggers. Now deletes a truly random object. 2014-12-16 12:19:48 +01:00
Faerbit
0d57bf65ef Made trigger more presentation friendly. 2014-12-15 23:36:22 +01:00
Faerbit
5ca7626ec0 Removing debug output. 2014-12-15 22:03:04 +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
b26d904023 Implemented simple triggers. 2014-12-15 18:43:10 +01:00
Steffen Fündgens
0a2d0c2f75 Implemented half the loading of triggers. 2014-12-15 14:59:03 +01:00
Steffen Fündgens
6563396dc0 Merge branch 'master' of github.com:Faerbit/swp 2014-12-15 13:08:47 +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
51ddcffaf0 Moved calculation of shadowMVP to the CPU side. 2014-12-15 12:41:30 +01:00
Faerbit
d8da75e9fb Moving MVP calculation to the CPU side. 2014-12-15 11:45:31 +01:00
Faerbit
17b8445a2f Made getLights return a pointer to avoid copying around large amounts of light data every frame. 2014-12-15 01:12:51 +01:00
Steffen Fündgens
c7e9cc3b07 Debugging. Had to comment out the loading of physics because it crashed the programm. 2014-12-12 18:38:12 +01:00
Steffen Fündgens
80e2b72a5d Added skeleton for trigger loading. Added comments to identify closing brackets. 2014-12-12 18:02:31 +01:00
Steffen Fündgens
f00a5d58a7 Added indexing of the created objects for use in triggers. Added some comments to the loading. 2014-12-12 17:47:33 +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
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
Steffen Fündgens
80f90175eb Changed fogColor to fogColour. Moved some global Parameters to the xml. 2014-12-12 15:41:17 +01:00
sfroitzheim
5151a864df Fixed wrong texture name 2014-12-12 15:09:51 +01:00
sfroitzheim
4e336fbca4 Additional Marbletexture optimizing 2014-12-12 15:05:53 +01:00
Steffen Fündgens
e99ad8bab5 changed error checking syntax to make code more compact 2014-12-08 15:48:46 +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
82dfbff2fb Finished loading of graphical objects, please check if my interpretation of the rotation is corect(copied from entity.cc). No physics loaded yet. 2014-12-08 14:54:27 +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
8d8ab3a6b6 Implemented more of the loading from xml 2014-12-05 17:14:43 +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
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
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