Commit Graph

80 Commits

Author SHA1 Message Date
sfroitzheim
e611b15d46 Added a few torches and changed the hinttorches to green 2015-03-09 18:32:48 +01:00
Jasper
ecc3b14703 modified light intensity 2015-03-09 17:06:47 +01:00
Jasper
05374068d3 Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 17:03:28 +01:00
Jasper
b94aa934a6 modified marbel rolling and box to allow somewhat easier movement 2015-03-09 17:01:14 +01:00
Fabian Klemp
bd4fad2641 Increasing terrain ambient factor be better visible on the beamer. 2015-03-09 17:01:14 +01:00
Fabian Klemp
21593c8fad Changed green flame parameters. They don't clip anymore. 2015-03-09 16:53:26 +01:00
Fabian Klemp
8dab0b313d Changed a few material parameters. 2015-03-09 16:01:03 +01:00
Jasper
a78d97e3e1 Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 15:46:10 +01:00
Jasper
5f48e4ad87 changed ambient factors 2015-03-09 15:45:49 +01:00
Fabian Klemp
4881b11f41 Made sunrise last longer. 2015-03-09 15:43:44 +01:00
Fabian Klemp
330ce60564 Changed a few parameters corresponding with the sunrise. 2015-03-09 15:43:12 +01:00
Jasper
cd9952fdeb Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 14:40:51 +01:00
sfroitzheim
4d28ceebed Added a half transparent water texture to files and scene 2015-03-09 14:13:27 +01:00
Jasper
565e45c58d modified starting sunhight + sunrise functions 2015-03-09 13:58:48 +01:00
Faerbit
dd914a555c Gave sun rise more different colors. 2015-03-09 00:39:59 +01:00
Faerbit
3403f9778d Changed flame function to cosine to be able to rotate it properly. Also changed corresponding parameters. 2015-03-08 23:13:16 +01:00
Faerbit
c5a4ee98d5 Fixed parameters for new brazier model. 2015-03-08 16:04:15 +01:00
Faerbit
11c7552171 Changed flame parameters for the braziers. 2015-03-08 14:58:51 +01:00
Faerbit
25f7800c86 Gave flames their own class again. The size of the flames are now respected. 2015-03-07 22:48:44 +01:00
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
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
SteffenFuendgens
4e99ca2241 Added lua scripts for the sunrise. 2015-03-05 18:30:50 +01:00
Faerbit
d6ec0c27f9 Changed brazier parameters to sensible values. 2015-03-05 12:48:32 +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
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
c8f360e1c2 Using new skydome texture. 2015-03-04 16:10:15 +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
c4f106bf86 Added flameHeight and flameWidth with loading from xml. 2015-03-04 15:22:07 +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