Commit Graph

90 Commits

Author SHA1 Message Date
Faerbit
1b8b8125f4 Added shader which could manipulate the color of the flames. 2015-03-06 09:21:38 +01:00
Faerbit
00506c6b3e Merge branch 'master' of github.com:Faerbit/swp 2015-03-06 09:16:37 +01:00
Faerbit
e4c9418d4a Gave the flames it's own framebuffer to be able to manipulate it's color. 2015-03-06 09:16:29 +01:00
SteffenFuendgens
0f7240b047 Added lua scripts for the sunrise. 2015-03-05 18:30:50 +01:00
Faerbit
2dd09aff19 Removing unused code. 2015-03-05 16:17:21 +01:00
Faerbit
95c88979f4 Changed brazier parameters to sensible values. 2015-03-05 12:48:32 +01:00
Faerbit
019c150521 Triangulted faces of brazier. 2015-03-05 12:41:31 +01:00
Faerbit
99995d0745 Fixed brazier model. 2015-03-05 12:31:34 +01:00
Faerbit
fa8ba1335e 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
3e86b70778 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
2c333773b2 Removed hardcoded obj file name from skydome. 2015-03-04 21:05:24 +01:00
Steffen Fündgens
6af54ab02f Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 18:11:38 +01:00
Steffen Fündgens
8224250867 Made the block for the switches lighter and adjusted the triggers. 2015-03-04 18:11:32 +01:00
Steffen Fündgens
79faa2edea Added 'Safepoints' to the resetPlayer script. 2015-03-04 18:10:49 +01:00
Fabian Klemp
bed9f09539 Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 17:47:41 +01:00
Fabian Klemp
fce73f1285 Added fading to the sun. 2015-03-04 17:47:34 +01:00
Fabian Klemp
b7f95ebb40 Added sun to skydome. 2015-03-04 17:09:46 +01:00
sfroitzheim
4b0c875504 Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-04 17:09:25 +01:00
sfroitzheim
d17ed99d96 Added torches for the switches plus added the hint to the scene 2015-03-04 17:08:53 +01:00
Fabian Klemp
d273d131e2 Increases vertex count of skydome. 2015-03-04 17:08:47 +01:00
Fabian Klemp
6004651adc Using new skydome texture. 2015-03-04 16:10:15 +01:00
Fabian Klemp
98e8d10cdd Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 16:08:11 +01:00
Fabian Klemp
01a61f43ac Gave skydome it's own shader. 2015-03-04 16:08:03 +01:00
Steffen Fündgens
12f76ddd5a Added a trigger that resets the player when his z value is below 15. 2015-03-04 15:52:28 +01:00
sfroitzheim
11322c0446 Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-04 15:42:51 +01:00
sfroitzheim
88d5229b35 adjusted height for first blockswitch 2015-03-04 15:41:25 +01:00
Steffen Fündgens
c01ca1a1f2 Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 15:22:14 +01:00
Steffen Fündgens
16ba763ddc Added flameHeight and flameWidth with loading from xml. 2015-03-04 15:22:07 +01:00
sfroitzheim
f48d6d4648 Seperated skydome and sun 2015-03-04 15:06:58 +01:00
Steffen Fündgens
93fe07678c Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 14:35:26 +01:00
Steffen Fündgens
6fee8a81b1 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
8b5f6f9b74 Made the block for the switches heavier so it can activate the switches again. 2015-03-04 13:38:38 +01:00
Faerbit
a811ed57be Now also blurring the edges of the flames. 2015-03-04 12:13:58 +01:00
Faerbit
fa47c93b46 Fixed blurring of flames with stencil buffer. 2015-03-04 11:25:02 +01:00
Faerbit
2930a86959 Made first attempt at blurring flames. Conceptually bad, looks very bad. 2015-03-04 00:55:01 +01:00
Faerbit
f34dbf891c Removed now useless stuff from the flame shader. 2015-03-03 23:32:43 +01:00
Faerbit
916c26cda1 Introduced flame post processing shader. 2015-03-03 23:27:41 +01:00
Faerbit
686647fe93 Moved torch light up to account for new torch model. 2015-03-03 11:05:34 +01:00
Faerbit
6fe51809a0 Made bias variable to get smaller bias for smaller shadow maps. 2015-03-03 11:04:39 +01:00
Steffen Fündgens
8f0ec319c4 Merge branch 'master' of github.com:Faerbit/swp 2015-03-02 17:20:16 +01:00
Steffen Fündgens
e043fe482a Added scripts and triggers to open the second door. 2015-03-02 17:20:02 +01:00
sfroitzheim
6140c38813 Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-02 16:47:54 +01:00
sfroitzheim
4d0f2d7be5 Made a new torch model 2015-03-02 16:47:42 +01:00
Steffen Fündgens
48ed278101 Recalculated normals because they were wrong. 2015-03-02 15:09:29 +01:00
Steffen Fündgens
986ed9ea8e Added lua scripts and triggers for the third door. 2015-03-02 12:58:34 +01:00
Steffen Fündgens
c372a2d652 Moved unused scripts into a subfolder. 2015-03-02 12:42:04 +01:00
Steffen Fündgens
81d5f86db1 Added position constraints for all switch_inner. 2015-03-02 12:22:47 +01:00
Steffen Fündgens
2fecf21509 Adjusted the size of switch_inner so it does not move to the sides. 2015-03-02 12:16:29 +01:00
Faerbit
813d50ee94 Tried to further improve the rendering of the flame; didn't quite work. 2015-03-01 23:28:36 +01:00
Faerbit
805a5f19b5 Corrected flame normals. 2015-03-01 22:22:48 +01:00