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

113 Commits

Author SHA1 Message Date
Faerbit
a38f251a3e Fixed saving of depthbuffer. 2015-01-26 23:11:04 +01:00
sfroitzheim
0def453bc0 Added some walls to the scene properly (weird physics bugs are apparent) 2015-01-23 14:56:02 +01:00
sfroitzheim
df8e7ac124 Fixed merge conflicts. 2015-01-23 14:10:35 +01:00
sfroitzheim
637568fd26 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
e2c3be7d5d Merge branch 'master' of https://github.com/Faerbit/swp 
Conflicts:
	Levels/ObjectSetups/Level1.xml
 2015-01-23 13:56:40 +01:00
Jasper
81c09eb33a constraints work. Why? because i said so! 2015-01-23 12:59:28 +01:00
Jasper
d827948747 Merge branch 'master' of github.com:Faerbit/swp 2015-01-19 18:30:12 +01:00
Jasper
bd75820471 Added light block and changed physics parameters. 2015-01-19 18:28:28 +01:00
sfroitzheim
c9694f0b5a 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
342a3691c2 Merge branch 'master' of github.com:Faerbit/swp 2015-01-19 15:55:18 +01:00
Steffen Fündgens
9e825ccc1e Added rotation in Compompositions.xml. 2015-01-19 15:55:03 +01:00
Jasper
cb6fdf19a7 small changes to trimesh scaling 2015-01-19 15:33:44 +01:00
sfroitzheim
e7839b3363 Merge branch 'master' of https://github.com/Faerbit/swp 
Conflicts:
	Levels/ObjectSetups/Level1.xml
 2015-01-19 15:18:34 +01:00
sfroitzheim
e04aca7841 Added improved starting bridge version 2015-01-19 15:15:18 +01:00
Jasper
12ee9a4ac5 fixed the issue with shpere portruding into blocks 2015-01-19 15:11:56 +01:00
sfroitzheim
8d46d98de0 Added torch for testing. 2015-01-19 13:59:50 +01:00
Steffen
10017bb855 Updated scripts and added scripts for opening the door in Level1 2015-01-17 13:37:09 +01:00
Steffen
b897dc5457 Added new composition 2015-01-17 12:38:27 +01:00
Steffen
147ae17789 Added ignoreHeightmap option to compositions in Compositions.xml. 2015-01-17 12:24:54 +01:00
Steffen Fündgens
cba7d170da Merge branch 'master' of github.com:Faerbit/swp 2015-01-16 16:52:11 +01:00
Steffen Fündgens
66f892bc15 started working on an actual trigger for Level1 2015-01-16 16:52:04 +01:00
Steffen Fündgens
ed6e257b69 moved the triggered/not triggered information to lua 2015-01-16 16:51:36 +01:00
sfroitzheim
ec29499416 Fixed a few bugs like duplicate marble(bridge will be fixed at monday) 2015-01-16 16:47:55 +01:00
sfroitzheim
f39fd522ce Merge branch 'master' of https://github.com/Faerbit/swp 2015-01-16 16:38:24 +01:00
sfroitzheim
a83e6155b3 Additional changes with the heightmap 2015-01-16 16:37:00 +01:00
Jasper
ed16b4aab7 Fixed block so that it doesnt BLOW EVERYTHING UP! 2015-01-16 15:40:07 +01:00
sfroitzheim
4e29a44505 Improved level heightmap (still not finished though) 2015-01-15 15:09:42 +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
c6d4e1d916 Added and used a new trigger without recompiling, scripting really works. :) 2015-01-13 17:52:31 +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
9deaf22bca Triangulated block. 2014-12-19 15:14:33 +01:00
Steffen Fündgens
1998e2abc9 Triangulated faces of the torch and added it to the Level again. 2014-12-19 15:09:00 +01:00
Steffen Fündgens
965e865d92 Removing useless mtl file. 2014-12-19 15:07:43 +01:00
Steffen Fündgens
9f3b11c274 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
749f8cb2dc added comments to Compositions.xml and adjusted marble size. 2014-12-19 13:33:59 +01:00
Steffen Fündgens
cb3ccb3668 Moved triggers into compositions. 2014-12-16 13:46:49 +01:00
Faerbit
70aab2a58f Made trigger more presentation friendly. 2014-12-15 23:36:22 +01:00
Faerbit
4fe9cc2bf8 Made level more presentation friendly. 2014-12-15 22:58:48 +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
124ae53f59 Fixing texture file name of marble. 2014-12-15 19:00:07 +01:00
Steffen Fündgens
6d6f798d12 Changed to Lvl1. 2014-12-15 18:58:32 +01:00
Jasper
9964b9be34 Merge branch 'master' of github.com:Faerbit/swp 2014-12-15 16:04:36 +01:00
Jasper
e49e4c2177 Composition scales addapted 
Physics added trimeshshapes
 2014-12-15 16:02:04 +01:00