Commit Graph

761 Commits

Author SHA1 Message Date
Faerbit
8d130ee906 Made first attempt at blurring shadows with gaussian blur. Doesn't seem to work right now. Not that important right now. 2015-03-05 16:21:30 +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
4eb328d09d Disabled multisampling because we draw to an offscreen fbo anyway. 2015-03-04 23:37:10 +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
Steffen Fündgens
956b59a8b8 Added a check to catch the error that a typeID does not exist in Compositions.xml. 2015-03-04 18:04:17 +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
Jasper
5dd03ef9e6 added playermove 2015-03-04 16:01:55 +01:00
Steffen Fündgens
6f0e0997e3 Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 15:52:39 +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
Steffen Fündgens
f3520639c9 Added new undo parameter for triggers to the converter. 2015-03-04 15:45:48 +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
Jasper
f195d8e017 Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 15:33:50 +01:00
Jasper
3710852841 fix 2015-03-04 15:33:31 +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
db0eda098d Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-04 15:11:14 +01:00
Jasper
c598f0215f Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 15:09:50 +01:00
sfroitzheim
b06d76780d Seperated skydome and sun 2015-03-04 15:06:58 +01:00
Jasper
d03bfb61bc modified the update in level.cc. Now the ball no longer goes bouncy. 2015-03-04 15:04:46 +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
Steffen Fündgens
0cb792b415 Made the block for the switches heavier so it can activate the switches again. 2015-03-04 13:38:38 +01:00
Jasper
d0b56e3cf1 modified camera to a directional camera as requested 2015-03-04 13:37:27 +01:00
Faerbit
f4b9d4dc38 Now also blurring the edges of the flames. 2015-03-04 12:13:58 +01:00
Faerbit
bb3267c72a Fixed blurring of flames with stencil buffer. 2015-03-04 11:25:02 +01:00
Jasper
5428f4cbed Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 11:16:22 +01:00
Faerbit
38292e335d Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 00:55:11 +01:00
Faerbit
2a82f9f2e2 Made first attempt at blurring flames. Conceptually bad, looks very bad. 2015-03-04 00:55:01 +01:00
Faerbit
e54ee77557 Removed now useless stuff from the flame shader. 2015-03-03 23:32:43 +01:00
Faerbit
35b77c9c01 Introduced flame post processing shader. 2015-03-03 23:27:41 +01:00
Steffen
91fe9a9b27 Added checks and error messages in case files do not exist. 2015-03-03 18:45:02 +01:00