Commit Graph

839 Commits

Author SHA1 Message Date
Fabian Klemp
0a75dd030a Chaging executable name to game name. 2015-03-09 15:16:18 +01:00
Fabian Klemp
c2d669e5b3 Fixing waterPlane not being rendered last, leading to incorrect alpha. 2015-03-09 14:59:22 +01:00
Jasper
67c1c812a5 Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 14:40:51 +01:00
Jasper
95de9295e7 reduced shadow amount 2015-03-09 14:40:29 +01:00
Steffen Fündgens
4992292563 Merge branch 'loading-screen' 2015-03-09 14:36:17 +01:00
Fabian Klemp
8694025e08 Do not render shadows for waterPlane. 2015-03-09 14:28:09 +01:00
Fabian Klemp
3ad7ddf1cd Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 14:14:22 +01:00
Fabian Klemp
2fce9296a7 Added wind simulation. 2015-03-09 14:14:17 +01:00
sfroitzheim
936ab87ba0 Added a half transparent water texture to files and scene 2015-03-09 14:13:27 +01:00
Jasper
251048bbd0 modified starting sunhight + sunrise functions 2015-03-09 13:58:48 +01:00
Steffen Fündgens
bfd8b25a7d Fixed loading screen resizing. 2015-03-09 13:41:34 +01:00
Jasper
4bfcc282a1 modified death 2015-03-09 12:30:50 +01:00
Faerbit
b313bd0645 Made flickering dependent of the wind power. 2015-03-09 11:13:12 +01:00
Faerbit
9609c50335 Removing skewing of flame. Rotate looks correct now. 2015-03-09 10:32:25 +01:00
Faerbit
5599a39eff Reenabling multisampling. 2015-03-09 08:21:44 +01:00
Faerbit
4a7c552508 Reexport exit plate because the normals were wrong. 2015-03-09 00:44:27 +01:00
Faerbit
86fa3b1c66 Removing useless mtl file. 2015-03-09 00:42:52 +01:00
Faerbit
6e8d3c36df Gave sun rise more different colors. 2015-03-09 00:39:59 +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
528108e7bc Switched flame function to cosine. 2015-03-08 22:11:49 +01:00
Faerbit
371cccb273 Made attempt at scaling loading screen. 2015-03-08 17:05:52 +01:00
Faerbit
65e2e326ed Fixed parameters for new brazier model. 2015-03-08 16:04:15 +01:00
Faerbit
3ee8cfdbad Fixed shadow flickering. 2015-03-08 15:59:35 +01:00
Faerbit
ea248caa47 Changed flame parameters for the braziers. 2015-03-08 14:58:51 +01:00
Faerbit
abca7c9f1e Disabled directional light if its below the map. 2015-03-08 14:56:18 +01:00
Faerbit
b8538be749 Added new brazier model. 2015-03-08 14:55:21 +01:00
Faerbit
bac8308ae2 Changed torch to smooth shading. 2015-03-08 12:25:01 +01:00
Faerbit
c89ce83fb3 Increases frequency of flickering. 2015-03-08 11:31:06 +01:00
Faerbit
451a0836cf Made flames transparent. 2015-03-08 11:25:10 +01:00
Faerbit
ecb88e9140 Improved flicker functions a bit. 2015-03-08 10:50:12 +01:00
Faerbit
185371d78c Only rendering sun shadows when the sun is actually shining. 2015-03-08 10:36:45 +01:00
Faerbit
93f87cc9c5 Added flickering to lighting shader. 2015-03-08 01:59:38 +01:00
Faerbit
b68015a6c4 Added flickering to the geometry shader. 2015-03-08 01:53:00 +01:00
Faerbit
bd584c3ce4 Flames can now be skewed. 2015-03-08 01:28:34 +01:00
Faerbit
b90f03c397 Ensuring triggers don't get triggered in the first two seconds. 2015-03-07 23:27:41 +01:00
Faerbit
d64d7ca0dc Removing debug messages. 2015-03-07 23:14:55 +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
Faerbit
d3c812bba3 Added loading screen. Had to restructure quite a bit of the program. 2015-03-07 19:59:52 +01:00
Faerbit
48174a4fb5 Removing useless shaders. 2015-03-07 18:57:24 +01:00
Faerbit
e02d223574 Reintroduced night texture. Throw a bunch of stuff out. 2015-03-07 18:25:14 +01:00
Faerbit
d24e70dbdd Added movement to water texture. Movement speed currently hard coded. 2015-03-07 14:56:16 +01:00
Faerbit
86619fd2dd Changed night texture to procedual night sky generation. 2015-03-07 14:39:01 +01:00
Faerbit
1ab8bb9a92 Merge branch 'master' of github.com:Faerbit/swp 2015-03-07 14:36:12 +01:00
Faerbit
0b8c426adb Also generating star sizes. 2015-03-07 14:36:05 +01:00
Faerbit
45fce8b464 Improved formatting. 2015-03-07 14:17:15 +01:00
SteffenFuendgens
e2078cb4a2 Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-07 13:42:06 +01:00
SteffenFuendgens
0f8f261d30 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
4b5e9416a1 Ignoring *.pyc files. 2015-03-07 13:24:56 +01:00
Faerbit
5b5b4a8676 Added script which generates star positions. 2015-03-07 13:24:39 +01:00
Faerbit
376c92d9b0 Moved math scripts in it's own folder. 2015-03-07 12:50:03 +01:00