Commit Graph

35 Commits

Author SHA1 Message Date
Faerbit
33c59fc387 Setting mass of column to zero because it doesn't need to move. 2015-03-14 15:01:59 +01:00
Faerbit
70b7289a43 Changing textuer because of clearer licensing. 2015-03-14 09:22:39 +01:00
Faerbit
5966a54a1c Moving textures from cgtextures into their own folder. 2015-03-11 11:16:17 +01:00
sfroitzheim
2b90ca6d3c Added a few torches and changed the hinttorches to green 2015-03-09 18:32:48 +01:00
Jasper
8d5ce5cf18 modified light intensity 2015-03-09 17:06:47 +01:00
Jasper
be21855e1d Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 17:03:28 +01:00
Jasper
28119ea906 modified marbel rolling and box to allow somewhat easier movement 2015-03-09 17:01:14 +01:00
Fabian Klemp
3ae3c84a39 Changed a few material parameters. 2015-03-09 16:01:03 +01:00
Jasper
caf5d3cf22 changed ambient factors 2015-03-09 15:45:49 +01:00
Faerbit
eda952df70 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
65e2e326ed Fixed parameters for new brazier model. 2015-03-08 16:04:15 +01:00
Faerbit
3eeea52f5e Gave flames their own class again. The size of the flames are now respected. 2015-03-07 22:48:44 +01:00
sfroitzheim
c3a9652cf1 Added the exit to models and scene 2015-03-06 16:28:38 +01:00
sfroitzheim
e34d9e4e38 Added the loading screen to the data plus replaced switch-torches with braziers 2015-03-06 15:19:28 +01:00
Faerbit
95c88979f4 Changed brazier parameters to sensible values. 2015-03-05 12:48:32 +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
sfroitzheim
d17ed99d96 Added torches for the switches plus added the hint to the scene 2015-03-04 17:08:53 +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
16ba763ddc Added flameHeight and flameWidth with loading from xml. 2015-03-04 15:22:07 +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
686647fe93 Moved torch light up to account for new torch model. 2015-03-03 11:05:34 +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
2fecf21509 Adjusted the size of switch_inner so it does not move to the sides. 2015-03-02 12:16:29 +01:00
Faerbit
7ecb76dffa Using the color of the lights for the flame color. 2015-03-01 18:45:31 +01:00
Faerbit
0489fc81fa Moved flame down a little bit to better fit the new flame. 2015-02-28 00:53:23 +01:00
Steffen Fündgens
eab9270b94 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
9f19d74c2a 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
a77e06f8c8 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
087d36aa15 Unified object and texture filenames. 2015-02-20 13:56:40 +01:00
Steffen Fündgens
af9f6d6933 Added loading of flames. 2015-02-17 12:54:21 +01:00
Steffen Fündgens
88d31bc68a 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
3764bb5c6a Adjusted the size of the movableBlock. 2015-02-17 12:04:15 +01:00
Faerbit
97329141bc Restructured directory tree. 2015-02-14 09:49:29 +01:00