faerbit/Saxum
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 2 Wiki Activity
1,062 Commits 16 Branches 6 Tags 174 MiB
master
Commit Graph

206 Commits

Author SHA1 Message Date
Faerbit
0b6df8ef5a Removing useless files. 2015-03-11 10:59:28 +01:00
Faerbit
15a0d4aefb Moving gimp files to their own folder. 2015-03-11 10:58:49 +01:00
Faerbit
5616e9ce7b Removing now useless files. 2015-03-11 10:57:23 +01:00
Jasper
c74d2c8b89 report fixes 2015-03-10 16:15:01 +01:00
Faerbit
8349f8594e Made fog stay red longer. 2015-03-10 08:13:45 +01:00
Faerbit
3090c5e0f9 Making sun color dependent on angle. 2015-03-10 08:09:02 +01:00
Faerbit
428c9df4ea Decreased bias for point light shadows. 2015-03-09 22:33:10 +01:00
Faerbit
1b3fa3eed3 Changed on what sun angle shadows get rendered. 2015-03-09 22:31:45 +01:00
sfroitzheim
2b90ca6d3c Added a few torches and changed the hinttorches to green 2015-03-09 18:32:48 +01:00
Steffen Fündgens
71decbd5b3 Fixed the broken hint model 2015-03-09 17:36:46 +01:00
Jasper
8d5ce5cf18 modified light intensity 2015-03-09 17:06:47 +01:00
Jasper
be21855e1d Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 17:03:28 +01:00
Jasper
28119ea906 modified marbel rolling and box to allow somewhat easier movement 2015-03-09 17:01:14 +01:00
Fabian Klemp
b03520f1e7 Increasing terrain ambient factor be better visible on the beamer. 2015-03-09 17:01:14 +01:00
Fabian Klemp
b4f20affeb Changed green flame parameters. They don't clip anymore. 2015-03-09 16:53:26 +01:00
Fabian Klemp
7359e95d4c Corrected bias calculation for point light shadows. 2015-03-09 16:41:12 +01:00
Fabian Klemp
3ae3c84a39 Changed a few material parameters. 2015-03-09 16:01:03 +01:00
Jasper
f71f9e0590 Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 15:46:10 +01:00
Jasper
caf5d3cf22 changed ambient factors 2015-03-09 15:45:49 +01:00
Fabian Klemp
f3887390a9 Made sunrise last longer. 2015-03-09 15:43:44 +01:00
Fabian Klemp
abb8c981bc Changed a few parameters corresponding with the sunrise. 2015-03-09 15:43:12 +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
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
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
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
65e2e326ed Fixed parameters for new brazier model. 2015-03-08 16:04:15 +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
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
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
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
Steffen Fündgens
7d480d654f Merging level.cc und level.hh. 2015-03-06 17:49:21 +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
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
e34d9e4e38 Added the loading screen to the data plus replaced switch-torches with braziers 2015-03-06 15:19:28 +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
Faerbit
1b8b8125f4 Added shader which could manipulate the color of the flames. 2015-03-06 09:21:38 +01:00
Faerbit
00506c6b3e Merge branch 'master' of github.com:Faerbit/swp 2015-03-06 09:16:37 +01:00
Faerbit
e4c9418d4a Gave the flames it's own framebuffer to be able to manipulate it's color. 2015-03-06 09:16:29 +01:00
SteffenFuendgens
0f7240b047 Added lua scripts for the sunrise. 2015-03-05 18:30:50 +01:00
Faerbit
2dd09aff19 Removing unused code. 2015-03-05 16:17:21 +01:00
Faerbit
95c88979f4 Changed brazier parameters to sensible values. 2015-03-05 12:48:32 +01:00
Faerbit
019c150521 Triangulted faces of brazier. 2015-03-05 12:41:31 +01:00
Faerbit
99995d0745 Fixed brazier model. 2015-03-05 12:31:34 +01:00
Faerbit
fa8ba1335e Made use of the night texture. Now blends to night texture if the sun vector is pointing down. 2015-03-04 21:50:47 +01:00
Faerbit
3e86b70778 Gave the skydome it's own class which contains the nightTexture and changed the loader and the level XML. 2015-03-04 21:28:46 +01:00
Faerbit
2c333773b2 Removed hardcoded obj file name from skydome. 2015-03-04 21:05:24 +01:00
Steffen Fündgens
6af54ab02f Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 18:11:38 +01:00
Steffen Fündgens
8224250867 Made the block for the switches lighter and adjusted the triggers. 2015-03-04 18:11:32 +01:00
Steffen Fündgens
79faa2edea Added 'Safepoints' to the resetPlayer script. 2015-03-04 18:10:49 +01:00
Fabian Klemp
bed9f09539 Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 17:47:41 +01:00
Fabian Klemp
fce73f1285 Added fading to the sun. 2015-03-04 17:47:34 +01:00
Fabian Klemp
b7f95ebb40 Added sun to skydome. 2015-03-04 17:09:46 +01:00
sfroitzheim
4b0c875504 Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-04 17:09:25 +01:00
sfroitzheim
d17ed99d96 Added torches for the switches plus added the hint to the scene 2015-03-04 17:08:53 +01:00
Fabian Klemp
d273d131e2 Increases vertex count of skydome. 2015-03-04 17:08:47 +01:00
Fabian Klemp
6004651adc Using new skydome texture. 2015-03-04 16:10:15 +01:00
Fabian Klemp
98e8d10cdd Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 16:08:11 +01:00
Fabian Klemp
01a61f43ac Gave skydome it's own shader. 2015-03-04 16:08:03 +01:00
Steffen Fündgens
12f76ddd5a Added a trigger that resets the player when his z value is below 15. 2015-03-04 15:52:28 +01:00
sfroitzheim
11322c0446 Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-04 15:42:51 +01:00
sfroitzheim
88d5229b35 adjusted height for first blockswitch 2015-03-04 15:41:25 +01:00
Steffen Fündgens
c01ca1a1f2 Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 15:22:14 +01:00
Steffen Fündgens
16ba763ddc Added flameHeight and flameWidth with loading from xml. 2015-03-04 15:22:07 +01:00
sfroitzheim
f48d6d4648 Seperated skydome and sun 2015-03-04 15:06:58 +01:00
Steffen Fündgens
93fe07678c Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 14:35:26 +01:00
Steffen Fündgens
6fee8a81b1 Changed triggers so the undo function can be in the same lua file. Fixed triggers for the second door. 2015-03-04 14:35:14 +01:00
Steffen Fündgens
8b5f6f9b74 Made the block for the switches heavier so it can activate the switches again. 2015-03-04 13:38:38 +01:00
Faerbit
a811ed57be Now also blurring the edges of the flames. 2015-03-04 12:13:58 +01:00
Faerbit
fa47c93b46 Fixed blurring of flames with stencil buffer. 2015-03-04 11:25:02 +01:00