Commit Graph

1062 Commits

Author SHA1 Message Date
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
Faerbit
736aa50ac6 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
f38d57bb70 Made death animation quicker. 2015-03-06 17:55:01 +01:00
Steffen Fündgens
7d480d654f Merging level.cc und level.hh. 2015-03-06 17:49:21 +01:00
Steffen Fündgens
5dfa5f89e8 Changed the camera so it is less likely to go through the heightmap. 2015-03-06 17:45:51 +01:00
Steffen Fündgens
5778696d29 Added a reset for the second moveable box. 2015-03-06 17:44:34 +01:00
Jasper
7288ff6fc9 ./ruMerge branch 'master' of github.com:Faerbit/swp 2015-03-06 16:57:50 +01:00
Jasper
3d5289da45 corrrected reset position 2015-03-06 16:57:38 +01:00
Jasper
49f612fe67 changed waterlevel 2015-03-06 16:57:10 +01:00
Jasper
60a127eefc fixed problem where pressing buttons while respawning would lead to overflow and segmentation fault 2015-03-06 16:56:20 +01:00
sfroitzheim
9a4cb335a0 Added torches to the scene 2015-03-06 16:44:24 +01:00
sfroitzheim
49f041341a Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-06 16:29:05 +01:00
sfroitzheim
c3a9652cf1 Added the exit to models and scene 2015-03-06 16:28:38 +01:00
Jasper
e328298474 Merge branch 'master' of github.com:Faerbit/swp 2015-03-06 16:20:18 +01:00
Jasper
cb762be52b Added endgame. 2015-03-06 16:19:57 +01:00
Jasper
39a0883466 Fixed y value of the sun. 2015-03-06 16:14:59 +01:00
Steffen Fündgens
a835604a5a Merge branch 'master' of github.com:Faerbit/swp 2015-03-06 15:24:49 +01:00
Steffen Fündgens
b7fa9ee5a1 Added waterPlane.(with skydome texture) 2015-03-06 15:24:02 +01:00
sfroitzheim
dfe83042b5 Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-06 15:19:45 +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
Jasper
1399f6ad7a Added smooth respawn in the forcePlayer function 2015-03-06 15:01:22 +01:00
Jasper
23f8ea8fa7 modified run amounts 2015-03-06 14:00:59 +01:00
Jasper
0460b463d1 Merge branch 'master' of github.com:Faerbit/swp 2015-03-06 13:58:46 +01:00
Jasper
522e2f0db5 resized camera object 2015-03-06 13:58:25 +01:00
Steffen Fündgens
62e7c42ec6 Adjusted constraints and triggers to lowered switches. 2015-03-06 13:39:04 +01:00
Steffen Fündgens
f1526fd389 Finished lua script for the sunrise and added triggers to call it. 2015-03-06 13:22:04 +01:00
Steffen Fündgens
db18560dbf Added an errorcheck when loading lua files. 2015-03-06 13:18:55 +01:00
Faerbit
1b8b8125f4 Added shader which could manipulate the color of the flames. 2015-03-06 09:21:38 +01:00