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

81 Commits

Author SHA1 Message Date
Steffen Fündgens
d936d1f269 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
fe58023458 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
60d76a58de 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
70e2ebb605 Moved all dampning parameters (except for the camera) to Compositions.xml. 2015-01-06 13:31:53 +01:00
Steffen Fündgens
76b6be0beb Moved friction and player strength to Level.xml. 2015-01-06 13:14:30 +01:00
Steffen Fündgens
36c42123b8 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
1c2fbc2e91 Triangulated block. 2014-12-19 15:14:33 +01:00
Steffen Fündgens
62b8b0afb9 Triangulated faces of the torch and added it to the Level again. 2014-12-19 15:09:00 +01:00
Steffen Fündgens
8d3e2c2fac Removing useless mtl file. 2014-12-19 15:07:43 +01:00
Steffen Fündgens
136e4d07f0 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
1cdca7b686 added comments to Compositions.xml and adjusted marble size. 2014-12-19 13:33:59 +01:00
Steffen Fündgens
ba847c80f0 Moved triggers into compositions. 2014-12-16 13:46:49 +01:00
Faerbit
104b8b4bbc Made trigger more presentation friendly. 2014-12-15 23:36:22 +01:00
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
Steffen Fündgens
895d69fc66 Changed to Lvl1. 2014-12-15 18:58:32 +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
sfroitzheim
f19b1ddeb1 Version 1.1 of the heightmap 2014-12-15 15:45:56 +01:00
sfroitzheim
b6e6ee2d24 Added Heightmap prototype(could be garbage) 2014-12-15 15:13:29 +01:00
Steffen Fündgens
60c5275e50 Merge branch 'master' of github.com:Faerbit/swp 2014-12-15 14:59:09 +01:00
Steffen Fündgens
a393fb688d Implemented half the loading of triggers. 2014-12-15 14:59:03 +01:00
sfroitzheim
ea587dc26b Added a simple wall to models/textures 2014-12-15 14:24:11 +01:00
sfroitzheim
f03274082e Fixed Poles of Marble 2014-12-15 13:28:05 +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
Faerbit
5b2233e1b3 Removing torches for better testing. 2014-12-15 01:03:48 +01:00
Steffen Fündgens
b4e9218e95 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
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
45d4b944c4 Merge branch 'master' of github.com:Faerbit/swp 2014-12-12 16:25:18 +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
sfroitzheim
cb488035cb Triangulated Faces 2014-12-12 15:16:56 +01:00
sfroitzheim
291a0f1899 Additional Marbletexture optimizing 2014-12-12 15:05:53 +01:00
sfroitzheim
d21569e71b Improved marbletexture and added Blenderfile 2014-12-12 14:58:12 +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
4ad1f0607d merging 2014-12-08 14:19:23 +01:00
Steffen Fündgens
db1092be44 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
6eb52d2dab Reexporting column, because it had no normals. 2014-12-08 13:43:47 +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
780897e1ab Merge branch 'master' of github.com:Faerbit/swp 2014-12-05 16:19:06 +01:00
Steffen Fündgens
cfe29d2830 Fixed the filesytem for the converter. 2014-12-05 16:18:48 +01:00
sfroitzheim
0e2f5ac580 Merge branch 'master' of https://github.com/Faerbit/swp 2014-12-05 15:01:16 +01:00
Steffen Fündgens
ca3b29251e Added Level0.png. 2014-12-05 15:00:46 +01:00
sfroitzheim
cb825a6588 Merge branch 'master' of https://github.com/Faerbit/swp 2014-12-05 14:51:23 +01:00
sfroitzheim
f83bb7ec7d Fixed some display bugs with the column. 2014-12-05 14:49:23 +01:00
Steffen Fündgens
097e1acfbc Merge branch 'master' of github.com:Faerbit/swp 2014-12-05 14:45:57 +01:00
Steffen Fündgens
4d1fbc6045 Implemented error checking for XML. Fixed loading of OBJ-Files. 2014-12-05 14:45:44 +01:00