Commit Graph

144 Commits

Author SHA1 Message Date
Fabian Klemp
21593c8fad Changed green flame parameters. They don't clip anymore. 2015-03-09 16:53:26 +01:00
Fabian Klemp
3c3ba3e524 Corrected bias calculation for point light shadows. 2015-03-09 16:41:12 +01:00
Fabian Klemp
8dab0b313d Changed a few material parameters. 2015-03-09 16:01:03 +01:00
Jasper
a78d97e3e1 Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 15:46:10 +01:00
Jasper
5f48e4ad87 changed ambient factors 2015-03-09 15:45:49 +01:00
Fabian Klemp
4881b11f41 Made sunrise last longer. 2015-03-09 15:43:44 +01:00
Fabian Klemp
330ce60564 Changed a few parameters corresponding with the sunrise. 2015-03-09 15:43:12 +01:00
Jasper
cd9952fdeb Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 14:40:51 +01:00
Jasper
dee0d6a3f2 reduced shadow amount 2015-03-09 14:40:29 +01:00
Fabian Klemp
5d9df519a6 Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 14:14:22 +01:00
Fabian Klemp
53636d1182 Added wind simulation. 2015-03-09 14:14:17 +01:00
sfroitzheim
4d28ceebed Added a half transparent water texture to files and scene 2015-03-09 14:13:27 +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