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 |
|
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 |
|