Commit Graph

820 Commits

Author SHA1 Message Date
Faerbit
bcc7767978 Made attempt at scaling loading screen. 2015-03-08 17:05:52 +01:00
Faerbit
c5a4ee98d5 Fixed parameters for new brazier model. 2015-03-08 16:04:15 +01:00
Faerbit
172237f214 Fixed shadow flickering. 2015-03-08 15:59:35 +01:00
Faerbit
11c7552171 Changed flame parameters for the braziers. 2015-03-08 14:58:51 +01:00
Faerbit
a4caa6a402 Disabled directional light if its below the map. 2015-03-08 14:56:18 +01:00
Faerbit
aff784bee8 Added new brazier model. 2015-03-08 14:55:21 +01:00
Faerbit
a1fb876880 Changed torch to smooth shading. 2015-03-08 12:25:01 +01:00
Faerbit
8570a305d4 Increases frequency of flickering. 2015-03-08 11:31:06 +01:00
Faerbit
612c497d5e Made flames transparent. 2015-03-08 11:25:10 +01:00
Faerbit
b6e15f8c4e Improved flicker functions a bit. 2015-03-08 10:50:12 +01:00
Faerbit
8064725f3d Only rendering sun shadows when the sun is actually shining. 2015-03-08 10:36:45 +01:00
Faerbit
b953ae878b Added flickering to lighting shader. 2015-03-08 01:59:38 +01:00
Faerbit
c0e4fce3f0 Added flickering to the geometry shader. 2015-03-08 01:53:00 +01:00
Faerbit
09f4e3655a Flames can now be skewed. 2015-03-08 01:28:34 +01:00
Faerbit
1c25df78d5 Ensuring triggers don't get triggered in the first two seconds. 2015-03-07 23:27:41 +01:00
Faerbit
f87249b879 Removing debug messages. 2015-03-07 23:14:55 +01:00
Faerbit
25f7800c86 Gave flames their own class again. The size of the flames are now respected. 2015-03-07 22:48:44 +01:00
Faerbit
7d0062f270 Added loading screen. Had to restructure quite a bit of the program. 2015-03-07 19:59:52 +01:00
Faerbit
a56d3e078b Removing useless shaders. 2015-03-07 18:57:24 +01:00
Faerbit
d835dbe010 Reintroduced night texture. Throw a bunch of stuff out. 2015-03-07 18:25:14 +01:00
Faerbit
da761b2e72 Added movement to water texture. Movement speed currently hard coded. 2015-03-07 14:56:16 +01:00
Faerbit
4d100fd290 Changed night texture to procedual night sky generation. 2015-03-07 14:39:01 +01:00
Faerbit
7e6b5df51c Merge branch 'master' of github.com:Faerbit/swp 2015-03-07 14:36:12 +01:00
Faerbit
5ed173107c Also generating star sizes. 2015-03-07 14:36:05 +01:00
Faerbit
67784f4364 Improved formatting. 2015-03-07 14:17:15 +01:00
SteffenFuendgens
6045d575ee Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-07 13:42:06 +01:00
SteffenFuendgens
79d14461e6 Added lights that get created and deleted from lua. Scripts dont crash but i cant test it further until monday. 2015-03-07 13:41:35 +01:00
Faerbit
fef4920aba Ignoring *.pyc files. 2015-03-07 13:24:56 +01:00
Faerbit
d6fc2c23e4 Added script which generates star positions. 2015-03-07 13:24:39 +01:00
Faerbit
b27781f093 Moved math scripts in it's own folder. 2015-03-07 12:50:03 +01:00
Faerbit
99cbc32b63 Changed texture coordinates of water plane so that it can use the water texture properly. 2015-03-07 12:48:07 +01:00
Steffen Fündgens
da94182578 Made death animation quicker. 2015-03-06 17:55:01 +01:00
Steffen Fündgens
198f8054b7 Merging level.cc und level.hh. 2015-03-06 17:49:21 +01:00
Steffen Fündgens
dd94e6f63c Changed the camera so it is less likely to go through the heightmap. 2015-03-06 17:45:51 +01:00
Steffen Fündgens
15671202e8 Added a reset for the second moveable box. 2015-03-06 17:44:34 +01:00
Jasper
876df5f793 ./ruMerge branch 'master' of github.com:Faerbit/swp 2015-03-06 16:57:50 +01:00
Jasper
b4c3f753df corrrected reset position 2015-03-06 16:57:38 +01:00
Jasper
63d5af903a changed waterlevel 2015-03-06 16:57:10 +01:00
Jasper
9346cadb0f fixed problem where pressing buttons while respawning would lead to overflow and segmentation fault 2015-03-06 16:56:20 +01:00
sfroitzheim
1e12f2e981 Added torches to the scene 2015-03-06 16:44:24 +01:00
sfroitzheim
c54e7132f4 Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-06 16:29:05 +01:00
sfroitzheim
797d45467b Added the exit to models and scene 2015-03-06 16:28:38 +01:00
Jasper
1d4822160e Merge branch 'master' of github.com:Faerbit/swp 2015-03-06 16:20:18 +01:00
Jasper
25b8960b92 Added endgame. 2015-03-06 16:19:57 +01:00
Jasper
6ae19043fb Fixed y value of the sun. 2015-03-06 16:14:59 +01:00
Steffen Fündgens
b04185d720 Merge branch 'master' of github.com:Faerbit/swp 2015-03-06 15:24:49 +01:00
Steffen Fündgens
3233a5b4f2 Added waterPlane.(with skydome texture) 2015-03-06 15:24:02 +01:00
sfroitzheim
71311f853d Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-06 15:19:45 +01:00
sfroitzheim
ae1fb3df87 Added the loading screen to the data plus replaced switch-torches with braziers 2015-03-06 15:19:28 +01:00
Jasper
d234cafa3c Added smooth respawn in the forcePlayer function 2015-03-06 15:01:22 +01:00