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

113 Commits

Author SHA1 Message Date
Faerbit
cf9e3e2b39 Fixed saving of depthbuffer. 2015-01-26 23:11:04 +01:00
sfroitzheim
06002f78b6 Added some walls to the scene properly (weird physics bugs are apparent) 2015-01-23 14:56:02 +01:00
sfroitzheim
73704434b1 Fixed merge conflicts. 2015-01-23 14:10:35 +01:00
sfroitzheim
0d185fd924 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
16db3fcc72 Merge branch 'master' of https://github.com/Faerbit/swp 
Conflicts:
	Levels/ObjectSetups/Level1.xml
 2015-01-23 13:56:40 +01:00
Jasper
adf355cc46 constraints work. Why? because i said so! 2015-01-23 12:59:28 +01:00
Jasper
bea8436a8d Merge branch 'master' of github.com:Faerbit/swp 2015-01-19 18:30:12 +01:00
Jasper
2f980e678c Added light block and changed physics parameters. 2015-01-19 18:28:28 +01:00
sfroitzheim
1e6942ae37 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
a4b734ac5b Merge branch 'master' of github.com:Faerbit/swp 2015-01-19 15:55:18 +01:00
Steffen Fündgens
3f33d6cf86 Added rotation in Compompositions.xml. 2015-01-19 15:55:03 +01:00
Jasper
25c6c6b6e1 small changes to trimesh scaling 2015-01-19 15:33:44 +01:00
sfroitzheim
8c5d485101 Merge branch 'master' of https://github.com/Faerbit/swp 
Conflicts:
	Levels/ObjectSetups/Level1.xml
 2015-01-19 15:18:34 +01:00
sfroitzheim
1de9e862d0 Added improved starting bridge version 2015-01-19 15:15:18 +01:00
Jasper
0d101a3e4b fixed the issue with shpere portruding into blocks 2015-01-19 15:11:56 +01:00
sfroitzheim
57fbc655ab Added torch for testing. 2015-01-19 13:59:50 +01:00
Steffen
0184a1684a Updated scripts and added scripts for opening the door in Level1 2015-01-17 13:37:09 +01:00
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