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

96 Commits

Author SHA1 Message Date
Steffen
abf382a70e Added new composition 2015-01-17 12:38:27 +01:00
Steffen
acd847921d Added ignoreHeightmap option to compositions in Compositions.xml. 2015-01-17 12:24:54 +01:00
Steffen Fündgens
7935b6aa0c Merge branch 'master' of github.com:Faerbit/swp 2015-01-16 16:52:11 +01:00
Steffen Fündgens
476c40cb00 started working on an actual trigger for Level1 2015-01-16 16:52:04 +01:00
Steffen Fündgens
956da26624 moved the triggered/not triggered information to lua 2015-01-16 16:51:36 +01:00
sfroitzheim
44d7d4f107 Fixed a few bugs like duplicate marble(bridge will be fixed at monday) 2015-01-16 16:47:55 +01:00
sfroitzheim
b5937ce772 Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-16 16:38:24 +01:00
sfroitzheim
036a9cb365 Additional changes with the heightmap 2015-01-16 16:37:00 +01:00
Jasper
86fd4a6123 Fixed block so that it doesnt BLOW EVERYTHING UP! 2015-01-16 15:40:07 +01:00
sfroitzheim
3636be675a Improved level heightmap (still not finished though) 2015-01-15 15:09:42 +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
78aef93eef Added and used a new trigger without recompiling, scripting really works. :) 2015-01-13 17:52:31 +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
a7c3ad0138 Triangulated block. 2014-12-19 15:14:33 +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
346f4b221c Removing useless mtl file. 2014-12-19 15:07:43 +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
sfroitzheim
4e28d7c21b Version 1.1 of the heightmap 2014-12-15 15:45:56 +01:00
sfroitzheim
928898b1ca Added Heightmap prototype(could be garbage) 2014-12-15 15:13:29 +01:00
Steffen Fündgens
5c9a1bfb84 Merge branch 'master' of github.com:Faerbit/swp 2014-12-15 14:59:09 +01:00
Steffen Fündgens
0a2d0c2f75 Implemented half the loading of triggers. 2014-12-15 14:59:03 +01:00
sfroitzheim
4c4ac76c4c Added a simple wall to models/textures 2014-12-15 14:24:11 +01:00
sfroitzheim
762f466f14 Fixed Poles of Marble 2014-12-15 13:28:05 +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
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
sfroitzheim
fbe244c11a Triangulated Faces 2014-12-12 15:16:56 +01:00
sfroitzheim
4e336fbca4 Additional Marbletexture optimizing 2014-12-12 15:05:53 +01:00
sfroitzheim
5fa9899af9 Improved marbletexture and added Blenderfile 2014-12-12 14:58:12 +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