Faerbit
|
686647fe93
|
Moved torch light up to account for new torch model.
|
2015-03-03 11:05:34 +01:00 |
|
Faerbit
|
6fe51809a0
|
Made bias variable to get smaller bias for smaller shadow maps.
|
2015-03-03 11:04:39 +01:00 |
|
Steffen Fündgens
|
0d8256abe5
|
Removed shift of the physical heightmap, because the graphical heightmap is corect now.
|
2015-03-02 17:27:49 +01:00 |
|
Steffen Fündgens
|
8f0ec319c4
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-02 17:20:16 +01:00 |
|
Steffen Fündgens
|
e043fe482a
|
Added scripts and triggers to open the second door.
|
2015-03-02 17:20:02 +01:00 |
|
Steffen Fündgens
|
d5771f8eea
|
Fixed a bug with shifting the heightmap.
|
2015-03-02 17:17:06 +01:00 |
|
sfroitzheim
|
6140c38813
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-02 16:47:54 +01:00 |
|
sfroitzheim
|
4d0f2d7be5
|
Made a new torch model
|
2015-03-02 16:47:42 +01:00 |
|
Steffen Fündgens
|
48ed278101
|
Recalculated normals because they were wrong.
|
2015-03-02 15:09:29 +01:00 |
|
Steffen Fündgens
|
9555786a09
|
Ignored first two seconds of triggering to give switches time to position themselves.
|
2015-03-02 14:28:19 +01:00 |
|
Steffen Fündgens
|
986ed9ea8e
|
Added lua scripts and triggers for the third door.
|
2015-03-02 12:58:34 +01:00 |
|
Steffen Fündgens
|
c372a2d652
|
Moved unused scripts into a subfolder.
|
2015-03-02 12:42:04 +01:00 |
|
Steffen Fündgens
|
81d5f86db1
|
Added position constraints for all switch_inner.
|
2015-03-02 12:22:47 +01:00 |
|
Steffen Fündgens
|
2fecf21509
|
Adjusted the size of switch_inner so it does not move to the sides.
|
2015-03-02 12:16:29 +01:00 |
|
Faerbit
|
813d50ee94
|
Tried to further improve the rendering of the flame; didn't quite work.
|
2015-03-01 23:28:36 +01:00 |
|
Faerbit
|
805a5f19b5
|
Corrected flame normals.
|
2015-03-01 22:22:48 +01:00 |
|
Faerbit
|
2125243a31
|
Tried adding normals for color calculation seems wrong.
|
2015-03-01 19:40:39 +01:00 |
|
Faerbit
|
7dd4122d44
|
Fixed normals.
|
2015-03-01 18:56:56 +01:00 |
|
Faerbit
|
7ecb76dffa
|
Using the color of the lights for the flame color.
|
2015-03-01 18:45:31 +01:00 |
|
Faerbit
|
bb090fcf91
|
Added another two render calls to further increase the number of vertices of the flame.
|
2015-03-01 18:19:19 +01:00 |
|
Faerbit
|
6e33af8e61
|
Reducing the number of sample from 8 to 4.
|
2015-03-01 17:56:30 +01:00 |
|
Faerbit
|
395803109d
|
Should have been in the last commit.
|
2015-03-01 17:04:13 +01:00 |
|
Faerbit
|
b61e7df089
|
Made two render calls to circumvent vertex limitation of geometry shader.
|
2015-03-01 17:01:41 +01:00 |
|
Faerbit
|
8c34df49b7
|
Enabled multisampling for the window.
|
2015-03-01 16:52:44 +01:00 |
|
Faerbit
|
b9bdb594f0
|
Enabled multisampling for the window.
|
2015-03-01 16:43:03 +01:00 |
|
Faerbit
|
47bcf0bf1c
|
Moved glEnables to graphics.init().
|
2015-03-01 16:41:46 +01:00 |
|
Faerbit
|
4cc21fd378
|
Closing flame at the top.
|
2015-03-01 16:11:43 +01:00 |
|
Faerbit
|
41de72e3a1
|
Fixed popping of directional shadows.
|
2015-02-28 15:53:12 +01:00 |
|
Faerbit
|
97b9eeeac6
|
Mix borders of directional shadow maps.
|
2015-02-28 15:10:14 +01:00 |
|
Faerbit
|
585e40bb8b
|
Reintroduced cascaded shadow mapping while also fixing it. The old bug with popping shadows should be fixed now.
|
2015-02-28 14:40:54 +01:00 |
|
Faerbit
|
0887ff5f46
|
Removed unused code.
|
2015-02-28 13:51:22 +01:00 |
|
Faerbit
|
0489fc81fa
|
Moved flame down a little bit to better fit the new flame.
|
2015-02-28 00:53:23 +01:00 |
|
Faerbit
|
899253b53c
|
Got generation of flame geometry working.
|
2015-02-28 00:52:58 +01:00 |
|
Faerbit
|
8c1369ad2e
|
Cull front faces of flames(normals are backwards).
|
2015-02-28 00:51:20 +01:00 |
|
Faerbit
|
1dad2f589f
|
More output from solver.
|
2015-02-28 00:02:26 +01:00 |
|
Faerbit
|
086713341b
|
Got generation of circular quads working.
|
2015-02-28 00:00:30 +01:00 |
|
Faerbit
|
b974508683
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-27 23:34:33 +01:00 |
|
Faerbit
|
39882d43c3
|
Fixed solver and improved him.
|
2015-02-27 23:34:25 +01:00 |
|
Steffen Fündgens
|
7f8150d5ed
|
Integrated Simons Level1.png changes from the .xcf.
|
2015-02-27 17:21:52 +01:00 |
|
Steffen Fündgens
|
635f6ae546
|
Merge with the worst possible conflicts: png and xml. Think i didnt yet integrate Simons latest png changes.
|
2015-02-27 17:11:44 +01:00 |
|
Steffen Fündgens
|
eab9270b94
|
Turned the heightmap loading around so the level now is like the png. The wall backsides dont seem to have textures...
|
2015-02-27 16:53:46 +01:00 |
|
Steffen Fündgens
|
87b9634703
|
Moved the heightmap, so it nearly fits with the graphical one.
|
2015-02-27 16:20:29 +01:00 |
|
Steffen Fündgens
|
650ad89067
|
Adjusted variable name i forgot earlier.
|
2015-02-27 16:01:59 +01:00 |
|
Jasper
|
a64b1dac00
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-27 16:01:17 +01:00 |
|
Jasper
|
d49baa2a8c
|
added convextrianglemeshshape
|
2015-02-27 15:58:21 +01:00 |
|
sfroitzheim
|
23a3730c37
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-02-27 15:48:39 +01:00 |
|
sfroitzheim
|
134faaa67e
|
prepared switch room for adding braziers
|
2015-02-27 15:47:36 +01:00 |
|
Faerbit
|
272dce8900
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-27 15:43:52 +01:00 |
|
Faerbit
|
eff6cabd09
|
Added solver which helps with selecting a fit function for the flames.
|
2015-02-27 15:43:33 +01:00 |
|
sfroitzheim
|
84a9899516
|
Completed work on the switch room (for now)
|
2015-02-27 15:42:16 +01:00 |
|