Commit Graph

  • aff784bee8 Added new brazier model. Faerbit 2015-03-08 14:55:21 +0100
  • 43aae3e8ec Made an attempt at getting a smooth gradient of the flame color. flameColorFragment Faerbit 2015-03-08 13:52:17 +0100
  • bac8308ae2 Changed torch to smooth shading. Faerbit 2015-03-08 12:25:01 +0100
  • a1fb876880 Changed torch to smooth shading. Faerbit 2015-03-08 12:25:01 +0100
  • 36e262e426 Fixed some stupid stuff. flamePostColor Faerbit 2015-03-08 11:59:23 +0100
  • c89ce83fb3 Increases frequency of flickering. Faerbit 2015-03-08 11:31:06 +0100
  • 8570a305d4 Increases frequency of flickering. Faerbit 2015-03-08 11:31:06 +0100
  • 451a0836cf Made flames transparent. Faerbit 2015-03-08 11:25:10 +0100
  • 612c497d5e Made flames transparent. Faerbit 2015-03-08 11:25:10 +0100
  • ecb88e9140 Improved flicker functions a bit. Faerbit 2015-03-08 10:50:12 +0100
  • b6e15f8c4e Improved flicker functions a bit. Faerbit 2015-03-08 10:50:12 +0100
  • 185371d78c Only rendering sun shadows when the sun is actually shining. Faerbit 2015-03-08 10:36:45 +0100
  • 8064725f3d Only rendering sun shadows when the sun is actually shining. Faerbit 2015-03-08 10:36:45 +0100
  • 93f87cc9c5 Added flickering to lighting shader. Faerbit 2015-03-08 01:59:38 +0100
  • b953ae878b Added flickering to lighting shader. Faerbit 2015-03-08 01:59:38 +0100
  • b68015a6c4 Added flickering to the geometry shader. Faerbit 2015-03-08 01:53:00 +0100
  • c0e4fce3f0 Added flickering to the geometry shader. Faerbit 2015-03-08 01:53:00 +0100
  • bd584c3ce4 Flames can now be skewed. Faerbit 2015-03-08 01:28:34 +0100
  • 09f4e3655a Flames can now be skewed. Faerbit 2015-03-08 01:28:34 +0100
  • b90f03c397 Ensuring triggers don't get triggered in the first two seconds. Faerbit 2015-03-07 23:27:41 +0100
  • 1c25df78d5 Ensuring triggers don't get triggered in the first two seconds. Faerbit 2015-03-07 23:27:41 +0100
  • d64d7ca0dc Removing debug messages. Faerbit 2015-03-07 23:14:55 +0100
  • f87249b879 Removing debug messages. Faerbit 2015-03-07 23:14:55 +0100
  • 3eeea52f5e Gave flames their own class again. The size of the flames are now respected. Faerbit 2015-03-07 22:48:44 +0100
  • 25f7800c86 Gave flames their own class again. The size of the flames are now respected. Faerbit 2015-03-07 22:48:44 +0100
  • d3c812bba3 Added loading screen. Had to restructure quite a bit of the program. Faerbit 2015-03-07 19:59:52 +0100
  • 7d0062f270 Added loading screen. Had to restructure quite a bit of the program. Faerbit 2015-03-07 19:59:52 +0100
  • 48174a4fb5 Removing useless shaders. Faerbit 2015-03-07 18:57:24 +0100
  • a56d3e078b Removing useless shaders. Faerbit 2015-03-07 18:57:24 +0100
  • e02d223574 Reintroduced night texture. Throw a bunch of stuff out. Faerbit 2015-03-07 18:25:14 +0100
  • d835dbe010 Reintroduced night texture. Throw a bunch of stuff out. Faerbit 2015-03-07 18:25:14 +0100
  • d24e70dbdd Added movement to water texture. Movement speed currently hard coded. Faerbit 2015-03-07 14:56:16 +0100
  • da761b2e72 Added movement to water texture. Movement speed currently hard coded. Faerbit 2015-03-07 14:56:16 +0100
  • 86619fd2dd Changed night texture to procedual night sky generation. Faerbit 2015-03-07 14:39:01 +0100
  • 4d100fd290 Changed night texture to procedual night sky generation. Faerbit 2015-03-07 14:39:01 +0100
  • 1ab8bb9a92 Merge branch 'master' of github.com:Faerbit/swp Faerbit 2015-03-07 14:36:12 +0100
  • 7e6b5df51c Merge branch 'master' of github.com:Faerbit/swp Faerbit 2015-03-07 14:36:12 +0100
  • 0b8c426adb Also generating star sizes. Faerbit 2015-03-07 14:36:05 +0100
  • 5ed173107c Also generating star sizes. Faerbit 2015-03-07 14:36:05 +0100
  • 45fce8b464 Improved formatting. Faerbit 2015-03-07 14:17:15 +0100
  • 67784f4364 Improved formatting. Faerbit 2015-03-07 14:17:15 +0100
  • e2078cb4a2 Merge branch 'master' of https://github.com/Faerbit/swp SteffenFuendgens 2015-03-07 13:42:06 +0100
  • 6045d575ee Merge branch 'master' of https://github.com/Faerbit/swp SteffenFuendgens 2015-03-07 13:42:06 +0100
  • 0f8f261d30 Added lights that get created and deleted from lua. Scripts dont crash but i cant test it further until monday. SteffenFuendgens 2015-03-07 13:41:35 +0100
  • 79d14461e6 Added lights that get created and deleted from lua. Scripts dont crash but i cant test it further until monday. SteffenFuendgens 2015-03-07 13:41:35 +0100
  • 4b5e9416a1 Ignoring *.pyc files. Faerbit 2015-03-07 13:24:56 +0100
  • fef4920aba Ignoring *.pyc files. Faerbit 2015-03-07 13:24:56 +0100
  • 5b5b4a8676 Added script which generates star positions. Faerbit 2015-03-07 13:24:39 +0100
  • d6fc2c23e4 Added script which generates star positions. Faerbit 2015-03-07 13:24:39 +0100
  • 376c92d9b0 Moved math scripts in it's own folder. Faerbit 2015-03-07 12:50:03 +0100
  • b27781f093 Moved math scripts in it's own folder. Faerbit 2015-03-07 12:50:03 +0100
  • 736aa50ac6 Changed texture coordinates of water plane so that it can use the water texture properly. Faerbit 2015-03-07 12:48:07 +0100
  • 99cbc32b63 Changed texture coordinates of water plane so that it can use the water texture properly. Faerbit 2015-03-07 12:48:07 +0100
  • f38d57bb70 Made death animation quicker. Steffen Fündgens 2015-03-06 17:55:01 +0100
  • da94182578 Made death animation quicker. Steffen Fündgens 2015-03-06 17:55:01 +0100
  • 7d480d654f Merging level.cc und level.hh. Steffen Fündgens 2015-03-06 17:49:21 +0100
  • 198f8054b7 Merging level.cc und level.hh. Steffen Fündgens 2015-03-06 17:49:21 +0100
  • 5dfa5f89e8 Changed the camera so it is less likely to go through the heightmap. Steffen Fündgens 2015-03-06 17:45:51 +0100
  • dd94e6f63c Changed the camera so it is less likely to go through the heightmap. Steffen Fündgens 2015-03-06 17:45:51 +0100
  • 5778696d29 Added a reset for the second moveable box. Steffen Fündgens 2015-03-06 17:44:34 +0100
  • 15671202e8 Added a reset for the second moveable box. Steffen Fündgens 2015-03-06 17:44:34 +0100
  • 7288ff6fc9 ./ruMerge branch 'master' of github.com:Faerbit/swp Jasper 2015-03-06 16:57:50 +0100
  • 876df5f793 ./ruMerge branch 'master' of github.com:Faerbit/swp Jasper 2015-03-06 16:57:50 +0100
  • 3d5289da45 corrrected reset position Jasper 2015-03-06 16:57:38 +0100
  • b4c3f753df corrrected reset position Jasper 2015-03-06 16:57:38 +0100
  • 49f612fe67 changed waterlevel Jasper 2015-03-06 16:57:10 +0100
  • 63d5af903a changed waterlevel Jasper 2015-03-06 16:57:10 +0100
  • 60a127eefc fixed problem where pressing buttons while respawning would lead to overflow and segmentation fault Jasper 2015-03-06 16:56:20 +0100
  • 9346cadb0f fixed problem where pressing buttons while respawning would lead to overflow and segmentation fault Jasper 2015-03-06 16:56:20 +0100
  • 9a4cb335a0 Added torches to the scene sfroitzheim 2015-03-06 16:44:24 +0100
  • 1e12f2e981 Added torches to the scene sfroitzheim 2015-03-06 16:44:24 +0100
  • 49f041341a Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-03-06 16:29:05 +0100
  • c54e7132f4 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-03-06 16:29:05 +0100
  • c3a9652cf1 Added the exit to models and scene sfroitzheim 2015-03-06 16:28:38 +0100
  • 797d45467b Added the exit to models and scene sfroitzheim 2015-03-06 16:28:38 +0100
  • e328298474 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-03-06 16:20:18 +0100
  • 1d4822160e Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-03-06 16:20:18 +0100
  • cb762be52b Added endgame. Jasper 2015-03-06 16:19:57 +0100
  • 25b8960b92 Added endgame. Jasper 2015-03-06 16:19:57 +0100
  • 39a0883466 Fixed y value of the sun. Jasper 2015-03-06 16:14:59 +0100
  • 6ae19043fb Fixed y value of the sun. Jasper 2015-03-06 16:14:59 +0100
  • a835604a5a Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-03-06 15:24:49 +0100
  • b04185d720 Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-03-06 15:24:49 +0100
  • b7fa9ee5a1 Added waterPlane.(with skydome texture) Steffen Fündgens 2015-03-06 15:24:02 +0100
  • 3233a5b4f2 Added waterPlane.(with skydome texture) Steffen Fündgens 2015-03-06 15:24:02 +0100
  • dfe83042b5 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-03-06 15:19:45 +0100
  • 71311f853d Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-03-06 15:19:45 +0100
  • e34d9e4e38 Added the loading screen to the data plus replaced switch-torches with braziers sfroitzheim 2015-03-06 15:19:28 +0100
  • ae1fb3df87 Added the loading screen to the data plus replaced switch-torches with braziers sfroitzheim 2015-03-06 15:19:28 +0100
  • 1399f6ad7a Added smooth respawn in the forcePlayer function Jasper 2015-03-06 15:01:22 +0100
  • d234cafa3c Added smooth respawn in the forcePlayer function Jasper 2015-03-06 15:01:22 +0100
  • 23f8ea8fa7 modified run amounts Jasper 2015-03-06 14:00:59 +0100
  • 35dc67b14a modified run amounts Jasper 2015-03-06 14:00:59 +0100
  • 0460b463d1 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-03-06 13:58:46 +0100
  • b9ffdabaa8 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-03-06 13:58:46 +0100
  • 522e2f0db5 resized camera object Jasper 2015-03-06 13:58:25 +0100
  • b46b718e2b resized camera object Jasper 2015-03-06 13:58:25 +0100
  • 62e7c42ec6 Adjusted constraints and triggers to lowered switches. Steffen Fündgens 2015-03-06 13:39:04 +0100
  • f9135a6bc1 Adjusted constraints and triggers to lowered switches. Steffen Fündgens 2015-03-06 13:39:04 +0100
  • f1526fd389 Finished lua script for the sunrise and added triggers to call it. Steffen Fündgens 2015-03-06 13:22:04 +0100