Faerbit
|
2a82f9f2e2
|
Made first attempt at blurring flames. Conceptually bad, looks very bad.
|
2015-03-04 00:55:01 +01:00 |
|
Faerbit
|
e54ee77557
|
Removed now useless stuff from the flame shader.
|
2015-03-03 23:32:43 +01:00 |
|
Faerbit
|
35b77c9c01
|
Introduced flame post processing shader.
|
2015-03-03 23:27:41 +01:00 |
|
Steffen
|
91fe9a9b27
|
Added checks and error messages in case files do not exist.
|
2015-03-03 18:45:02 +01:00 |
|
Steffen
|
99d77a0e9e
|
Changed array initialization because it did not compile under windows.
|
2015-03-03 17:37:03 +01:00 |
|
Faerbit
|
60c106f863
|
Moved torch light up to account for new torch model.
|
2015-03-03 11:05:34 +01:00 |
|
Faerbit
|
7597b068cb
|
Made bias variable to get smaller bias for smaller shadow maps.
|
2015-03-03 11:04:39 +01:00 |
|
Steffen Fündgens
|
e07e2a5b14
|
Removed shift of the physical heightmap, because the graphical heightmap is corect now.
|
2015-03-02 17:27:49 +01:00 |
|
Steffen Fündgens
|
0bc98c7026
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-02 17:20:16 +01:00 |
|
Steffen Fündgens
|
9ba15227c2
|
Added scripts and triggers to open the second door.
|
2015-03-02 17:20:02 +01:00 |
|
Steffen Fündgens
|
319ef672df
|
Fixed a bug with shifting the heightmap.
|
2015-03-02 17:17:06 +01:00 |
|
sfroitzheim
|
0dd10f423a
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-02 16:47:54 +01:00 |
|
sfroitzheim
|
d73e092747
|
Made a new torch model
|
2015-03-02 16:47:42 +01:00 |
|
Steffen Fündgens
|
262241f559
|
Recalculated normals because they were wrong.
|
2015-03-02 15:09:29 +01:00 |
|
Steffen Fündgens
|
1ad25ef8cb
|
Ignored first two seconds of triggering to give switches time to position themselves.
|
2015-03-02 14:28:19 +01:00 |
|
Steffen Fündgens
|
80df2aac41
|
Added lua scripts and triggers for the third door.
|
2015-03-02 12:58:34 +01:00 |
|
Steffen Fündgens
|
cb538cb9ff
|
Moved unused scripts into a subfolder.
|
2015-03-02 12:42:04 +01:00 |
|
Steffen Fündgens
|
39e731fa42
|
Added position constraints for all switch_inner.
|
2015-03-02 12:22:47 +01:00 |
|
Steffen Fündgens
|
08f8eec432
|
Adjusted the size of switch_inner so it does not move to the sides.
|
2015-03-02 12:16:29 +01:00 |
|
Faerbit
|
4bdf64c35a
|
Tried to further improve the rendering of the flame; didn't quite work.
|
2015-03-01 23:28:36 +01:00 |
|
Faerbit
|
014b2e508a
|
Corrected flame normals.
|
2015-03-01 22:22:48 +01:00 |
|
Faerbit
|
40e7dda14a
|
Tried adding normals for color calculation seems wrong.
|
2015-03-01 19:40:39 +01:00 |
|
Faerbit
|
51d78583d7
|
Fixed normals.
|
2015-03-01 18:56:56 +01:00 |
|
Faerbit
|
53557b80c4
|
Using the color of the lights for the flame color.
|
2015-03-01 18:45:31 +01:00 |
|
Faerbit
|
f5fd73fd1d
|
Added another two render calls to further increase the number of vertices of the flame.
|
2015-03-01 18:19:19 +01:00 |
|
Faerbit
|
f94fb3eff5
|
Reducing the number of sample from 8 to 4.
|
2015-03-01 17:56:30 +01:00 |
|
Faerbit
|
47db474d4a
|
Should have been in the last commit.
|
2015-03-01 17:04:13 +01:00 |
|
Faerbit
|
416784539b
|
Made two render calls to circumvent vertex limitation of geometry shader.
|
2015-03-01 17:01:41 +01:00 |
|
Faerbit
|
584e84277d
|
Enabled multisampling for the window.
|
2015-03-01 16:52:44 +01:00 |
|
Faerbit
|
f46d665e17
|
Enabled multisampling for the window.
|
2015-03-01 16:43:03 +01:00 |
|
Faerbit
|
ca2ac08a82
|
Moved glEnables to graphics.init().
|
2015-03-01 16:41:46 +01:00 |
|
Faerbit
|
9150c628b4
|
Closing flame at the top.
|
2015-03-01 16:11:43 +01:00 |
|
Faerbit
|
81d2de5344
|
Fixed popping of directional shadows.
|
2015-02-28 15:53:12 +01:00 |
|
Faerbit
|
e6251f8cba
|
Mix borders of directional shadow maps.
|
2015-02-28 15:10:14 +01:00 |
|
Faerbit
|
2da70f156d
|
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
|
7ff11e1105
|
Removed unused code.
|
2015-02-28 13:51:22 +01:00 |
|
Faerbit
|
85218c94c5
|
Moved flame down a little bit to better fit the new flame.
|
2015-02-28 00:53:23 +01:00 |
|
Faerbit
|
90b33907b2
|
Got generation of flame geometry working.
|
2015-02-28 00:52:58 +01:00 |
|
Faerbit
|
5fc86f8914
|
Cull front faces of flames(normals are backwards).
|
2015-02-28 00:51:20 +01:00 |
|
Faerbit
|
1431940135
|
More output from solver.
|
2015-02-28 00:02:26 +01:00 |
|
Faerbit
|
8fe1482dfb
|
Got generation of circular quads working.
|
2015-02-28 00:00:30 +01:00 |
|
Faerbit
|
3807e2d869
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-27 23:34:33 +01:00 |
|
Faerbit
|
fa73b01026
|
Fixed solver and improved him.
|
2015-02-27 23:34:25 +01:00 |
|
Steffen Fündgens
|
3a7dd27d31
|
Integrated Simons Level1.png changes from the .xcf.
|
2015-02-27 17:21:52 +01:00 |
|
Steffen Fündgens
|
049d9f8111
|
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
|
2d872c644e
|
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
|
cf75a9c2a8
|
Moved the heightmap, so it nearly fits with the graphical one.
|
2015-02-27 16:20:29 +01:00 |
|
Steffen Fündgens
|
f9f77efb70
|
Adjusted variable name i forgot earlier.
|
2015-02-27 16:01:59 +01:00 |
|
Jasper
|
53c5d688db
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-27 16:01:17 +01:00 |
|
Jasper
|
f6d57e22c5
|
added convextrianglemeshshape
|
2015-02-27 15:58:21 +01:00 |
|