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

120 Commits

Author SHA1 Message Date
Steffen Fündgens
e7ff009482 Scaling of the player ball is now possible. 2015-02-03 12:36:42 +01:00
Steffen Fündgens
9ffe3cd886 Added scaling to the physic of Box and Button. Adjusted the objectData for block.obj perfectly. 2015-02-03 12:29:35 +01:00
Steffen Fündgens
35a13886c3 Added and tested physics boxes for the switchOuter. Graphical object to match them is missing. 2015-02-02 13:20:20 +01:00
Steffen Fündgens
2eaf2f7a58 Removed unnecessary rotation from a lightsource. 2015-02-02 12:40:25 +01:00
sfroitzheim
642caa85f6 Added some new walls and changed some physics properties (still not working properly) 2015-01-30 15:28:09 +01:00
sfroitzheim
4883b753c0 Added new ground tiles for a ruins area to the data 2015-01-30 14:15:07 +01:00
Jasper
ae5d31e04c fixed size ratios of objects 2015-01-29 13:39:37 +01:00
sfroitzheim
e0d9058aef Fixed some problems with the new bridge (wasn't able to roll onto it) and changed some heightmap heights 2015-01-28 15:49:38 +01:00
sfroitzheim
190df8b936 Added a model for a gate and added it to the scene with some additional level improvements 2015-01-28 15:19:35 +01:00
Steffen Fündgens
ec8767c14c Deleted a torch that had a duplicate ID and let the converter recreate it. Shadows look weirder now. This might be good for debugging the shadows. 2015-01-27 12:25:16 +01:00
sfroitzheim
89741cfcb3 Added some walls to the scene properly (weird physics bugs are apparent) 2015-01-23 14:56:02 +01:00
sfroitzheim
db3fab3d35 Fixed merge conflicts. 2015-01-23 14:10:35 +01:00
sfroitzheim
bdb92b2cf1 Merge branch 'master' of https://github.com/Faerbit/swp 
Conflicts:
	Levels/ObjectSetups/Compositions.xml
	Levels/ObjectSetups/Level1.png
	Levels/ObjectSetups/Level1.xcf
	Levels/ObjectSetups/Level1.xml
 2015-01-23 14:06:20 +01:00
sfroitzheim
7c1f0e7960 Merge branch 'master' of https://github.com/Faerbit/swp 
Conflicts:
	Levels/ObjectSetups/Level1.xml
 2015-01-23 13:56:40 +01:00
Jasper
47b386296a constraints work. Why? because i said so! 2015-01-23 12:59:28 +01:00
Jasper
099e0c17c7 Merge branch 'master' of github.com:Faerbit/swp 2015-01-19 18:30:12 +01:00
Jasper
99217ed399 Added light block and changed physics parameters. 2015-01-19 18:28:28 +01:00
sfroitzheim
4ce7464ae7 Added some walls and made some fixes (there are too many walls, I will fix this till tomorrow) 2015-01-19 16:47:17 +01:00
Steffen Fündgens
5070940a94 Merge branch 'master' of github.com:Faerbit/swp 2015-01-19 15:55:18 +01:00
Steffen Fündgens
4c71dbfbea Added rotation in Compompositions.xml. 2015-01-19 15:55:03 +01:00
Jasper
bcdbb2534c small changes to trimesh scaling 2015-01-19 15:33:44 +01:00
sfroitzheim
aeb4b638c7 Merge branch 'master' of https://github.com/Faerbit/swp 
Conflicts:
	Levels/ObjectSetups/Level1.xml
 2015-01-19 15:18:34 +01:00
sfroitzheim
65ba8c0249 Added improved starting bridge version 2015-01-19 15:15:18 +01:00
Jasper
5670d35865 fixed the issue with shpere portruding into blocks 2015-01-19 15:11:56 +01:00
sfroitzheim
42b65fa9c0 Added torch for testing. 2015-01-19 13:59:50 +01:00
Steffen
e66fb546b7 Updated scripts and added scripts for opening the door in Level1 2015-01-17 13:37:09 +01:00
Steffen
2327d80810 Added new composition 2015-01-17 12:38:27 +01:00
Steffen
a128c947b1 Added ignoreHeightmap option to compositions in Compositions.xml. 2015-01-17 12:24:54 +01:00
Steffen Fündgens
f03a01461d Merge branch 'master' of github.com:Faerbit/swp 2015-01-16 16:52:11 +01:00
Steffen Fündgens
90d64bbade started working on an actual trigger for Level1 2015-01-16 16:52:04 +01:00
Steffen Fündgens
0d8dc4b10d moved the triggered/not triggered information to lua 2015-01-16 16:51:36 +01:00
sfroitzheim
98091fa305 Fixed a few bugs like duplicate marble(bridge will be fixed at monday) 2015-01-16 16:47:55 +01:00
sfroitzheim
638323c1c2 Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-16 16:38:24 +01:00
sfroitzheim
073000d097 Additional changes with the heightmap 2015-01-16 16:37:00 +01:00
Jasper
3cba239897 Fixed block so that it doesnt BLOW EVERYTHING UP! 2015-01-16 15:40:07 +01:00
sfroitzheim
16bf2477b0 Improved level heightmap (still not finished though) 2015-01-15 15:09:42 +01:00
Steffen Fündgens
a137d2544a 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
f4408b76e8 Added and used a new trigger without recompiling, scripting really works. :) 2015-01-13 17:52:31 +01:00
Steffen Fündgens
72d1009007 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
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