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

117 Commits

Author SHA1 Message Date
Jasper
bbc8c03e53 Added physics type button. 2015-01-19 18:30:07 +01:00
Jasper
93e5c33dfd prepared camera, level and physics for the new camera 2015-01-19 16:51:35 +01:00
Jasper
4e0fe3bee2 prepareing modified camera in physics 2015-01-19 16:30:11 +01:00
Steffen
d26722595e Added the option to define initial position constraints in the Level.xml file. 2015-01-17 14:07:12 +01:00
Steffen
04df8bd22f Created a moveObject function in the Level class. 2015-01-17 13:30:33 +01:00
Steffen
f496532126 Removed the lua state from the physics. 2015-01-17 13:11:43 +01:00
Steffen
147ae17789 Added ignoreHeightmap option to compositions in Compositions.xml. 2015-01-17 12:24:54 +01:00
sfroitzheim
a83e6155b3 Additional changes with the heightmap 2015-01-16 16:37:00 +01:00
Steffen Fündgens
1288c62ce9 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
b483cb2eb9 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
4df1b8e3cb 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
46f163d748 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
e35899523f 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
aee4d4a8ff Moved all dampning parameters (except for the camera) to Compositions.xml. 2015-01-06 13:31:53 +01:00
Steffen Fündgens
cc4842a628 Moved friction and player strength to Level.xml. 2015-01-06 13:14:30 +01:00
Steffen Fündgens
a5de8e733e 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
bbdc6be85d Also increased strength of the player ball. 2014-12-19 15:21:38 +01:00
Steffen Fündgens
cb3ccb3668 Moved triggers into compositions. 2014-12-16 13:46:49 +01:00
Fabian Klemp
d91d5e2028 Moved trigger functions to trigger class. 2014-12-16 12:40:30 +01:00
Fabian Klemp
bab84f01c1 Fixed triggers. Now deletes a truly random object. 2014-12-16 12:19:48 +01:00
Faerbit
70aab2a58f Made trigger more presentation friendly. 2014-12-15 23:36:22 +01:00
Faerbit
8da25e5beb Removing debug output. 2014-12-15 22:03:04 +01:00
Jasper
ebb7045753 Merge branch 'master' of github.com:Faerbit/swp 
Conflicts:
	level.cc
 2014-12-15 19:13:25 +01:00
Jasper
c993bd8f77 Tried to adjust box. 2014-12-15 19:11:28 +01:00
Steffen Fündgens
2a1119da79 Implemented simple triggers. 2014-12-15 18:43:10 +01:00
Steffen Fündgens
66cf9ef8d6 Implemented half the loading of triggers. 2014-12-15 14:59:03 +01:00
Steffen Fündgens
ad24191000 Merge branch 'master' of github.com:Faerbit/swp 2014-12-15 13:08:47 +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
4d36c9fb97 Moved calculation of shadowMVP to the CPU side. 2014-12-15 12:41:30 +01:00
Faerbit
55cc68a333 Moving MVP calculation to the CPU side. 2014-12-15 11:45:31 +01:00
Faerbit
d45ed9060f 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
4ddc21d3c9 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
3504a2d209 Added skeleton for trigger loading. Added comments to identify closing brackets. 2014-12-12 18:02:31 +01:00
Steffen Fündgens
85c6132c3e 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
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
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
Steffen Fündgens
a1981ecbca Changed fogColor to fogColour. Moved some global Parameters to the xml. 2014-12-12 15:41:17 +01:00
sfroitzheim
20f66d996f Fixed wrong texture name 2014-12-12 15:09:51 +01:00
sfroitzheim
cc64a524fc Additional Marbletexture optimizing 2014-12-12 15:05:53 +01:00
Steffen Fündgens
28839b4d3a changed error checking syntax to make code more compact 2014-12-08 15:48:46 +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
030f2f3bdd 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
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
Steffen Fündgens
4ab04faf68 Implemented more of the loading from xml 2014-12-05 17:14:43 +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
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