SteffenFuendgens
|
79d14461e6
|
Added lights that get created and deleted from lua. Scripts dont crash but i cant test it further until monday.
|
2015-03-07 13:41:35 +01:00 |
|
Steffen Fündgens
|
198f8054b7
|
Merging level.cc und level.hh.
|
2015-03-06 17:49:21 +01:00 |
|
Steffen Fündgens
|
15671202e8
|
Added a reset for the second moveable box.
|
2015-03-06 17:44:34 +01:00 |
|
Jasper
|
876df5f793
|
./ruMerge branch 'master' of github.com:Faerbit/swp
|
2015-03-06 16:57:50 +01:00 |
|
Jasper
|
b4c3f753df
|
corrrected reset position
|
2015-03-06 16:57:38 +01:00 |
|
Jasper
|
63d5af903a
|
changed waterlevel
|
2015-03-06 16:57:10 +01:00 |
|
sfroitzheim
|
1e12f2e981
|
Added torches to the scene
|
2015-03-06 16:44:24 +01:00 |
|
sfroitzheim
|
c54e7132f4
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-06 16:29:05 +01:00 |
|
sfroitzheim
|
797d45467b
|
Added the exit to models and scene
|
2015-03-06 16:28:38 +01:00 |
|
Jasper
|
1d4822160e
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-06 16:20:18 +01:00 |
|
Jasper
|
25b8960b92
|
Added endgame.
|
2015-03-06 16:19:57 +01:00 |
|
Jasper
|
6ae19043fb
|
Fixed y value of the sun.
|
2015-03-06 16:14:59 +01:00 |
|
Steffen Fündgens
|
b04185d720
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-06 15:24:49 +01:00 |
|
Steffen Fündgens
|
3233a5b4f2
|
Added waterPlane.(with skydome texture)
|
2015-03-06 15:24:02 +01:00 |
|
sfroitzheim
|
ae1fb3df87
|
Added the loading screen to the data plus replaced switch-torches with braziers
|
2015-03-06 15:19:28 +01:00 |
|
Steffen Fündgens
|
f9135a6bc1
|
Adjusted constraints and triggers to lowered switches.
|
2015-03-06 13:39:04 +01:00 |
|
Steffen Fündgens
|
a843d00f1c
|
Finished lua script for the sunrise and added triggers to call it.
|
2015-03-06 13:22:04 +01:00 |
|
Faerbit
|
eac0031b0a
|
Added shader which could manipulate the color of the flames.
|
2015-03-06 09:21:38 +01:00 |
|
Faerbit
|
f015ec0879
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-06 09:16:37 +01:00 |
|
Faerbit
|
a82ecad52f
|
Gave the flames it's own framebuffer to be able to manipulate it's color.
|
2015-03-06 09:16:29 +01:00 |
|
SteffenFuendgens
|
4e99ca2241
|
Added lua scripts for the sunrise.
|
2015-03-05 18:30:50 +01:00 |
|
Faerbit
|
8443ab789f
|
Removing unused code.
|
2015-03-05 16:17:21 +01:00 |
|
Faerbit
|
d6ec0c27f9
|
Changed brazier parameters to sensible values.
|
2015-03-05 12:48:32 +01:00 |
|
Faerbit
|
60f88a13df
|
Triangulted faces of brazier.
|
2015-03-05 12:41:31 +01:00 |
|
Faerbit
|
dcb5e4e427
|
Fixed brazier model.
|
2015-03-05 12:31:34 +01:00 |
|
Faerbit
|
074132b49d
|
Made use of the night texture. Now blends to night texture if the sun vector is pointing down.
|
2015-03-04 21:50:47 +01:00 |
|
Faerbit
|
f3cbfe6133
|
Gave the skydome it's own class which contains the nightTexture and changed the loader and the level XML.
|
2015-03-04 21:28:46 +01:00 |
|
Faerbit
|
6c2fb865b6
|
Removed hardcoded obj file name from skydome.
|
2015-03-04 21:05:24 +01:00 |
|
Steffen Fündgens
|
62b6f893d6
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 18:11:38 +01:00 |
|
Steffen Fündgens
|
5ac6309772
|
Made the block for the switches lighter and adjusted the triggers.
|
2015-03-04 18:11:32 +01:00 |
|
Steffen Fündgens
|
deb70240d1
|
Added 'Safepoints' to the resetPlayer script.
|
2015-03-04 18:10:49 +01:00 |
|
Fabian Klemp
|
e922780e71
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 17:47:41 +01:00 |
|
Fabian Klemp
|
388217648c
|
Added fading to the sun.
|
2015-03-04 17:47:34 +01:00 |
|
Fabian Klemp
|
b6c1d94cc3
|
Added sun to skydome.
|
2015-03-04 17:09:46 +01:00 |
|
sfroitzheim
|
2568a2a69f
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-04 17:09:25 +01:00 |
|
sfroitzheim
|
2c0073eb9f
|
Added torches for the switches plus added the hint to the scene
|
2015-03-04 17:08:53 +01:00 |
|
Fabian Klemp
|
b2daa764d5
|
Increases vertex count of skydome.
|
2015-03-04 17:08:47 +01:00 |
|
Fabian Klemp
|
c8f360e1c2
|
Using new skydome texture.
|
2015-03-04 16:10:15 +01:00 |
|
Fabian Klemp
|
95fef2448e
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 16:08:11 +01:00 |
|
Fabian Klemp
|
1ec7f05eca
|
Gave skydome it's own shader.
|
2015-03-04 16:08:03 +01:00 |
|
Steffen Fündgens
|
47bd2d29df
|
Added a trigger that resets the player when his z value is below 15.
|
2015-03-04 15:52:28 +01:00 |
|
sfroitzheim
|
16fbe291d1
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-04 15:42:51 +01:00 |
|
sfroitzheim
|
fa577bb9d2
|
adjusted height for first blockswitch
|
2015-03-04 15:41:25 +01:00 |
|
Steffen Fündgens
|
306b4d03bc
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 15:22:14 +01:00 |
|
Steffen Fündgens
|
c4f106bf86
|
Added flameHeight and flameWidth with loading from xml.
|
2015-03-04 15:22:07 +01:00 |
|
sfroitzheim
|
b06d76780d
|
Seperated skydome and sun
|
2015-03-04 15:06:58 +01:00 |
|
sfroitzheim
|
764a936361
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-04 15:04:32 +01:00 |
|
sfroitzheim
|
c0daf67d6a
|
smoothed the alpha in the hintTexture
|
2015-03-04 15:04:08 +01:00 |
|
Steffen Fündgens
|
5cd13899d6
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 14:35:26 +01:00 |
|
Steffen Fündgens
|
58db26b9da
|
Changed triggers so the undo function can be in the same lua file. Fixed triggers for the second door.
|
2015-03-04 14:35:14 +01:00 |
|