Commit Graph

133 Commits

Author SHA1 Message Date
Jasper
dee0d6a3f2 reduced shadow amount 2015-03-09 14:40:29 +01:00
Jasper
565e45c58d modified starting sunhight + sunrise functions 2015-03-09 13:58:48 +01:00
Faerbit
e935b9fb63 Made flickering dependent of the wind power. 2015-03-09 11:13:12 +01:00
Faerbit
808f4deb62 Removing skewing of flame. Rotate looks correct now. 2015-03-09 10:32:25 +01:00
Faerbit
ba6c7fb306 Reexport exit plate because the normals were wrong. 2015-03-09 00:44:27 +01:00
Faerbit
d1c22dddb2 Removing useless mtl file. 2015-03-09 00:42:52 +01:00
Faerbit
dd914a555c Gave sun rise more different colors. 2015-03-09 00:39:59 +01:00
Faerbit
3403f9778d 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
c5a4ee98d5 Fixed parameters for new brazier model. 2015-03-08 16:04:15 +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
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
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
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
Steffen Fündgens
198f8054b7 Merging level.cc und level.hh. 2015-03-06 17:49:21 +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
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
ae1fb3df87 Added the loading screen to the data plus replaced switch-torches with braziers 2015-03-06 15:19:28 +01:00
Steffen Fündgens
f9135a6bc1 Adjusted constraints and triggers to lowered switches. 2015-03-06 13:39:04 +01:00
Steffen Fündgens
a843d00f1c Finished lua script for the sunrise and added triggers to call it. 2015-03-06 13:22:04 +01:00
Faerbit
eac0031b0a Added shader which could manipulate the color of the flames. 2015-03-06 09:21:38 +01:00
Faerbit
f015ec0879 Merge branch 'master' of github.com:Faerbit/swp 2015-03-06 09:16:37 +01:00
Faerbit
a82ecad52f Gave the flames it's own framebuffer to be able to manipulate it's color. 2015-03-06 09:16:29 +01:00
SteffenFuendgens
4e99ca2241 Added lua scripts for the sunrise. 2015-03-05 18:30:50 +01:00
Faerbit
8443ab789f Removing unused code. 2015-03-05 16:17:21 +01:00
Faerbit
d6ec0c27f9 Changed brazier parameters to sensible values. 2015-03-05 12:48:32 +01:00
Faerbit
60f88a13df Triangulted faces of brazier. 2015-03-05 12:41:31 +01:00
Faerbit
dcb5e4e427 Fixed brazier model. 2015-03-05 12:31:34 +01:00
Faerbit
074132b49d 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