Steffen Fündgens
|
e13659b787
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 19:25:11 +01:00 |
|
Steffen Fündgens
|
0d64f064ed
|
Added a trigger to open the first door, cant close it again cause apparently i have no idea what the difference between global and shared variables in lua is...
|
2015-02-13 19:24:57 +01:00 |
|
sfroitzheim
|
4113b8010f
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-02-13 18:18:03 +01:00 |
|
sfroitzheim
|
77d6e16db8
|
made some extreme level-layout improvements (putting walls properly together etc)
|
2015-02-13 18:17:47 +01:00 |
|
Steffen Fündgens
|
1d2a1a8a02
|
Added position constraints
|
2015-02-13 18:10:49 +01:00 |
|
Steffen Fündgens
|
ff5bd0dae1
|
Merged physics.cc.
|
2015-02-06 18:04:20 +01:00 |
|
sfroitzheim
|
4978869f82
|
Finally fixed wall and gate physics plus made some heightmap modifications
|
2015-02-06 16:31:21 +01:00 |
|
Steffen Fündgens
|
8be350c713
|
Added terrain parameters to the xml.
|
2015-02-06 12:37:00 +01:00 |
|
Steffen Fündgens
|
a018d5f547
|
Added and tested physics boxes for the switchOuter. Graphical object to match them is missing.
|
2015-02-02 13:20:20 +01:00 |
|
sfroitzheim
|
3278bf5302
|
Added some new walls and changed some physics properties (still not working properly)
|
2015-01-30 15:28:09 +01:00 |
|
sfroitzheim
|
fcbc228438
|
Fixed some problems with the new bridge (wasn't able to roll onto it) and changed some heightmap heights
|
2015-01-28 15:49:38 +01:00 |
|
sfroitzheim
|
b957ba27bd
|
Added a model for a gate and added it to the scene with some additional level improvements
|
2015-01-28 15:19:35 +01:00 |
|
Steffen Fündgens
|
ccc7cbaa9c
|
Deleted a torch that had a duplicate ID and let the converter recreate it. Shadows look weirder now. This might be good for debugging the shadows.
|
2015-01-27 12:25:16 +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
|
16db3fcc72
|
Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
Levels/ObjectSetups/Level1.xml
|
2015-01-23 13:56:40 +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 |
|
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 |
|
sfroitzheim
|
44d7d4f107
|
Fixed a few bugs like duplicate marble(bridge will be fixed at monday)
|
2015-01-16 16:47:55 +01:00 |
|
sfroitzheim
|
036a9cb365
|
Additional changes with the heightmap
|
2015-01-16 16:37:00 +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
|
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
|
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
|
8d12f676db
|
Triangulated faces of the torch and added it to the Level again.
|
2014-12-19 15:09:00 +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
|
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 |
|
Steffen Fündgens
|
405d3bb505
|
Changed to Lvl1.
|
2014-12-15 18:58:32 +01:00 |
|