Commit Graph

78 Commits

Author SHA1 Message Date
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
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
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
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
Faerbit
60c106f863 Moved torch light up to account for new torch model. 2015-03-03 11:05:34 +01:00
Faerbit
7597b068cb Made bias variable to get smaller bias for smaller shadow maps. 2015-03-03 11:04:39 +01:00
Steffen Fündgens
0bc98c7026 Merge branch 'master' of github.com:Faerbit/swp 2015-03-02 17:20:16 +01:00
Steffen Fündgens
9ba15227c2 Added scripts and triggers to open the second door. 2015-03-02 17:20:02 +01:00
sfroitzheim
0dd10f423a Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-02 16:47:54 +01:00
sfroitzheim
d73e092747 Made a new torch model 2015-03-02 16:47:42 +01:00
Steffen Fündgens
262241f559 Recalculated normals because they were wrong. 2015-03-02 15:09:29 +01:00
Steffen Fündgens
80df2aac41 Added lua scripts and triggers for the third door. 2015-03-02 12:58:34 +01:00
Steffen Fündgens
cb538cb9ff Moved unused scripts into a subfolder. 2015-03-02 12:42:04 +01:00
Steffen Fündgens
39e731fa42 Added position constraints for all switch_inner. 2015-03-02 12:22:47 +01:00
Steffen Fündgens
08f8eec432 Adjusted the size of switch_inner so it does not move to the sides. 2015-03-02 12:16:29 +01:00
Faerbit
4bdf64c35a Tried to further improve the rendering of the flame; didn't quite work. 2015-03-01 23:28:36 +01:00
Faerbit
014b2e508a Corrected flame normals. 2015-03-01 22:22:48 +01:00
Faerbit
40e7dda14a Tried adding normals for color calculation seems wrong. 2015-03-01 19:40:39 +01:00
Faerbit
51d78583d7 Fixed normals. 2015-03-01 18:56:56 +01:00
Faerbit
53557b80c4 Using the color of the lights for the flame color. 2015-03-01 18:45:31 +01:00
Faerbit
f5fd73fd1d Added another two render calls to further increase the number of vertices of the flame. 2015-03-01 18:19:19 +01:00
Faerbit
416784539b Made two render calls to circumvent vertex limitation of geometry shader. 2015-03-01 17:01:41 +01:00
Faerbit
9150c628b4 Closing flame at the top. 2015-03-01 16:11:43 +01:00
Faerbit
e6251f8cba Mix borders of directional shadow maps. 2015-02-28 15:10:14 +01:00
Faerbit
2da70f156d Reintroduced cascaded shadow mapping while also fixing it. The old bug with popping shadows should be fixed now. 2015-02-28 14:40:54 +01:00
Faerbit
7ff11e1105 Removed unused code. 2015-02-28 13:51:22 +01:00
Faerbit
85218c94c5 Moved flame down a little bit to better fit the new flame. 2015-02-28 00:53:23 +01:00
Faerbit
90b33907b2 Got generation of flame geometry working. 2015-02-28 00:52:58 +01:00
Faerbit
8fe1482dfb Got generation of circular quads working. 2015-02-28 00:00:30 +01:00