Commit Graph

  • a843d00f1c Finished lua script for the sunrise and added triggers to call it. Steffen Fündgens 2015-03-06 13:22:04 +0100
  • db18560dbf Added an errorcheck when loading lua files. Steffen Fündgens 2015-03-06 13:18:55 +0100
  • 2c191c75a5 Added an errorcheck when loading lua files. Steffen Fündgens 2015-03-06 13:18:55 +0100
  • 1b8b8125f4 Added shader which could manipulate the color of the flames. Faerbit 2015-03-06 09:21:38 +0100
  • eac0031b0a Added shader which could manipulate the color of the flames. Faerbit 2015-03-06 09:21:38 +0100
  • 00506c6b3e Merge branch 'master' of github.com:Faerbit/swp Faerbit 2015-03-06 09:16:37 +0100
  • f015ec0879 Merge branch 'master' of github.com:Faerbit/swp Faerbit 2015-03-06 09:16:37 +0100
  • e4c9418d4a Gave the flames it's own framebuffer to be able to manipulate it's color. Faerbit 2015-03-06 09:16:29 +0100
  • a82ecad52f Gave the flames it's own framebuffer to be able to manipulate it's color. Faerbit 2015-03-06 09:16:29 +0100
  • 0f7240b047 Added lua scripts for the sunrise. SteffenFuendgens 2015-03-05 18:30:50 +0100
  • 4e99ca2241 Added lua scripts for the sunrise. SteffenFuendgens 2015-03-05 18:30:50 +0100
  • 8d130ee906 Made first attempt at blurring shadows with gaussian blur. Doesn't seem to work right now. Not that important right now. gauss-shadows Faerbit 2015-03-05 16:21:30 +0100
  • 2dd09aff19 Removing unused code. Faerbit 2015-03-05 16:17:21 +0100
  • 8443ab789f Removing unused code. Faerbit 2015-03-05 16:17:21 +0100
  • 95c88979f4 Changed brazier parameters to sensible values. Faerbit 2015-03-05 12:48:32 +0100
  • d6ec0c27f9 Changed brazier parameters to sensible values. Faerbit 2015-03-05 12:48:32 +0100
  • 019c150521 Triangulted faces of brazier. Faerbit 2015-03-05 12:41:31 +0100
  • 60f88a13df Triangulted faces of brazier. Faerbit 2015-03-05 12:41:31 +0100
  • 99995d0745 Fixed brazier model. Faerbit 2015-03-05 12:31:34 +0100
  • dcb5e4e427 Fixed brazier model. Faerbit 2015-03-05 12:31:34 +0100
  • c7358e6efc Changed blur of flames to gaussian blur. gaussian-blur Faerbit 2015-03-05 00:00:31 +0100
  • c57779b921 Implemented poisson sampling for point light shadows. 3d-poisson Faerbit 2015-03-04 23:38:46 +0100
  • d9f0950463 Disabled multisampling because we draw to an offscreen fbo anyway. Faerbit 2015-03-04 23:37:10 +0100
  • 4eb328d09d Disabled multisampling because we draw to an offscreen fbo anyway. Faerbit 2015-03-04 23:37:10 +0100
  • fa8ba1335e Made use of the night texture. Now blends to night texture if the sun vector is pointing down. Faerbit 2015-03-04 21:50:47 +0100
  • 074132b49d Made use of the night texture. Now blends to night texture if the sun vector is pointing down. Faerbit 2015-03-04 21:50:47 +0100
  • 3e86b70778 Gave the skydome it's own class which contains the nightTexture and changed the loader and the level XML. Faerbit 2015-03-04 21:28:46 +0100
  • f3cbfe6133 Gave the skydome it's own class which contains the nightTexture and changed the loader and the level XML. Faerbit 2015-03-04 21:28:46 +0100
  • 2c333773b2 Removed hardcoded obj file name from skydome. Faerbit 2015-03-04 21:05:24 +0100
  • 6c2fb865b6 Removed hardcoded obj file name from skydome. Faerbit 2015-03-04 21:05:24 +0100
  • 6af54ab02f Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-03-04 18:11:38 +0100
  • 62b6f893d6 Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-03-04 18:11:38 +0100
  • 8224250867 Made the block for the switches lighter and adjusted the triggers. Steffen Fündgens 2015-03-04 18:11:32 +0100
  • 5ac6309772 Made the block for the switches lighter and adjusted the triggers. Steffen Fündgens 2015-03-04 18:11:32 +0100
  • 79faa2edea Added 'Safepoints' to the resetPlayer script. Steffen Fündgens 2015-03-04 18:10:49 +0100
  • deb70240d1 Added 'Safepoints' to the resetPlayer script. Steffen Fündgens 2015-03-04 18:10:49 +0100
  • bb30aee8d3 Added a check to catch the error that a typeID does not exist in Compositions.xml. Steffen Fündgens 2015-03-04 18:04:17 +0100
  • 956b59a8b8 Added a check to catch the error that a typeID does not exist in Compositions.xml. Steffen Fündgens 2015-03-04 18:04:17 +0100
  • bed9f09539 Merge branch 'master' of github.com:Faerbit/swp Fabian Klemp 2015-03-04 17:47:41 +0100
  • e922780e71 Merge branch 'master' of github.com:Faerbit/swp Fabian Klemp 2015-03-04 17:47:41 +0100
  • fce73f1285 Added fading to the sun. Fabian Klemp 2015-03-04 17:47:34 +0100
  • 388217648c Added fading to the sun. Fabian Klemp 2015-03-04 17:47:34 +0100
  • b7f95ebb40 Added sun to skydome. Fabian Klemp 2015-03-04 17:09:46 +0100
  • b6c1d94cc3 Added sun to skydome. Fabian Klemp 2015-03-04 17:09:46 +0100
  • 4b0c875504 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-03-04 17:09:25 +0100
  • 2568a2a69f Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-03-04 17:09:25 +0100
  • d17ed99d96 Added torches for the switches plus added the hint to the scene sfroitzheim 2015-03-04 17:08:53 +0100
  • 2c0073eb9f Added torches for the switches plus added the hint to the scene sfroitzheim 2015-03-04 17:08:53 +0100
  • d273d131e2 Increases vertex count of skydome. Fabian Klemp 2015-03-04 17:08:47 +0100
  • b2daa764d5 Increases vertex count of skydome. Fabian Klemp 2015-03-04 17:08:47 +0100
  • 6004651adc Using new skydome texture. Fabian Klemp 2015-03-04 16:10:15 +0100
  • c8f360e1c2 Using new skydome texture. Fabian Klemp 2015-03-04 16:10:15 +0100
  • 98e8d10cdd Merge branch 'master' of github.com:Faerbit/swp Fabian Klemp 2015-03-04 16:08:11 +0100
  • 95fef2448e Merge branch 'master' of github.com:Faerbit/swp Fabian Klemp 2015-03-04 16:08:11 +0100
  • 01a61f43ac Gave skydome it's own shader. Fabian Klemp 2015-03-04 16:08:03 +0100
  • 1ec7f05eca Gave skydome it's own shader. Fabian Klemp 2015-03-04 16:08:03 +0100
  • aa2ed3083a added playermove Jasper 2015-03-04 16:01:55 +0100
  • 5dd03ef9e6 added playermove Jasper 2015-03-04 16:01:55 +0100
  • afae5ccd68 Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-03-04 15:52:39 +0100
  • 6f0e0997e3 Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-03-04 15:52:39 +0100
  • 12f76ddd5a Added a trigger that resets the player when his z value is below 15. Steffen Fündgens 2015-03-04 15:52:28 +0100
  • 47bd2d29df Added a trigger that resets the player when his z value is below 15. Steffen Fündgens 2015-03-04 15:52:28 +0100
  • e14a2305a0 Added new undo parameter for triggers to the converter. Steffen Fündgens 2015-03-04 15:45:48 +0100
  • f3520639c9 Added new undo parameter for triggers to the converter. Steffen Fündgens 2015-03-04 15:45:48 +0100
  • 11322c0446 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-03-04 15:42:51 +0100
  • 16fbe291d1 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-03-04 15:42:51 +0100
  • 88d5229b35 adjusted height for first blockswitch sfroitzheim 2015-03-04 15:41:25 +0100
  • fa577bb9d2 adjusted height for first blockswitch sfroitzheim 2015-03-04 15:41:25 +0100
  • cdde802756 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-03-04 15:33:50 +0100
  • f195d8e017 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-03-04 15:33:50 +0100
  • d827bb8197 fix Jasper 2015-03-04 15:33:31 +0100
  • 3710852841 fix Jasper 2015-03-04 15:33:31 +0100
  • c01ca1a1f2 Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-03-04 15:22:14 +0100
  • 306b4d03bc Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-03-04 15:22:14 +0100
  • 16ba763ddc Added flameHeight and flameWidth with loading from xml. Steffen Fündgens 2015-03-04 15:22:07 +0100
  • c4f106bf86 Added flameHeight and flameWidth with loading from xml. Steffen Fündgens 2015-03-04 15:22:07 +0100
  • 8e1c776f80 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-03-04 15:11:14 +0100
  • db0eda098d Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-03-04 15:11:14 +0100
  • 94cdd16394 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-03-04 15:09:50 +0100
  • c598f0215f Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-03-04 15:09:50 +0100
  • f48d6d4648 Seperated skydome and sun sfroitzheim 2015-03-04 15:06:58 +0100
  • b06d76780d Seperated skydome and sun sfroitzheim 2015-03-04 15:06:58 +0100
  • ef9c089d91 modified the update in level.cc. Now the ball no longer goes bouncy. Jasper 2015-03-04 15:04:46 +0100
  • d03bfb61bc modified the update in level.cc. Now the ball no longer goes bouncy. Jasper 2015-03-04 15:04:46 +0100
  • 20055d7fc5 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-03-04 15:04:32 +0100
  • 764a936361 Merge branch 'master' of https://github.com/Faerbit/swp sfroitzheim 2015-03-04 15:04:32 +0100
  • c0daf67d6a smoothed the alpha in the hintTexture sfroitzheim 2015-03-04 15:04:08 +0100
  • 93fe07678c Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-03-04 14:35:26 +0100
  • 5cd13899d6 Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-03-04 14:35:26 +0100
  • 6fee8a81b1 Changed triggers so the undo function can be in the same lua file. Fixed triggers for the second door. Steffen Fündgens 2015-03-04 14:35:14 +0100
  • 58db26b9da Changed triggers so the undo function can be in the same lua file. Fixed triggers for the second door. Steffen Fündgens 2015-03-04 14:35:14 +0100
  • 8b5f6f9b74 Made the block for the switches heavier so it can activate the switches again. Steffen Fündgens 2015-03-04 13:38:38 +0100
  • 0cb792b415 Made the block for the switches heavier so it can activate the switches again. Steffen Fündgens 2015-03-04 13:38:38 +0100
  • b7718d73e8 modified camera to a directional camera as requested Jasper 2015-03-04 13:37:27 +0100
  • d0b56e3cf1 modified camera to a directional camera as requested Jasper 2015-03-04 13:37:27 +0100
  • a811ed57be Now also blurring the edges of the flames. Faerbit 2015-03-04 12:13:58 +0100
  • f4b9d4dc38 Now also blurring the edges of the flames. Faerbit 2015-03-04 12:13:58 +0100
  • fa47c93b46 Fixed blurring of flames with stencil buffer. Faerbit 2015-03-04 11:25:02 +0100
  • bb3267c72a Fixed blurring of flames with stencil buffer. Faerbit 2015-03-04 11:25:02 +0100
  • 0292ab422a Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-03-04 11:16:22 +0100