sfroitzheim
|
7c1f0e7960
|
Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
Levels/ObjectSetups/Level1.xml
|
2015-01-23 13:56:40 +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 |
|
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 |
|
sfroitzheim
|
98091fa305
|
Fixed a few bugs like duplicate marble(bridge will be fixed at monday)
|
2015-01-16 16:47:55 +01:00 |
|
sfroitzheim
|
073000d097
|
Additional changes with the heightmap
|
2015-01-16 16:37:00 +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
|
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
|
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
|
62b8b0afb9
|
Triangulated faces of the torch and added it to the Level again.
|
2014-12-19 15:09:00 +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
|
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 |
|
Steffen Fündgens
|
895d69fc66
|
Changed to Lvl1.
|
2014-12-15 18:58:32 +01:00 |
|