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