Commit Graph

22 Commits

Author SHA1 Message Date
sfroitzheim
ae1fb3df87 Added the loading screen to the data plus replaced switch-torches with braziers 2015-03-06 15:19:28 +01:00
Faerbit
d6ec0c27f9 Changed brazier parameters to sensible values. 2015-03-05 12:48:32 +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
sfroitzheim
2c0073eb9f Added torches for the switches plus added the hint to the scene 2015-03-04 17:08:53 +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
0cb792b415 Made the block for the switches heavier so it can activate the switches again. 2015-03-04 13:38:38 +01:00
Faerbit
60c106f863 Moved torch light up to account for new torch model. 2015-03-03 11:05:34 +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
08f8eec432 Adjusted the size of switch_inner so it does not move to the sides. 2015-03-02 12:16:29 +01:00
Faerbit
53557b80c4 Using the color of the lights for the flame color. 2015-03-01 18:45:31 +01:00
Faerbit
85218c94c5 Moved flame down a little bit to better fit the new flame. 2015-02-28 00:53:23 +01:00
Steffen Fündgens
2d872c644e Turned the heightmap loading around so the level now is like the png. The wall backsides dont seem to have textures... 2015-02-27 16:53:46 +01:00
sfroitzheim
5cb28c8440 Added an example of bridges meeting properly to the scene (in the big switch room where are no switches yet) 2015-02-26 17:11:02 +01:00
Faerbit
b0b2c71139 Added simple geometry shader which draws a red triangle which changes it's height over time. 2015-02-24 23:30:59 +01:00
Steffen Fündgens
a8e4472367 Unified object and texture filenames. 2015-02-20 13:56:40 +01:00
Steffen Fündgens
5608790231 Added loading of flames. 2015-02-17 12:54:21 +01:00
Steffen Fündgens
a209acc6c9 Adjusted the mass of switchInner and the force that keeps it in place. The movableBlock can now push the switch down. 2015-02-17 12:25:12 +01:00
Steffen Fündgens
d5223ae540 Adjusted the size of the movableBlock. 2015-02-17 12:04:15 +01:00
Faerbit
89a73f3776 Restructured directory tree. 2015-02-14 09:49:29 +01:00