Steffen Fündgens
|
bb30aee8d3
|
Added a check to catch the error that a typeID does not exist in Compositions.xml.
|
2015-03-04 18:04:17 +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 |
|
Jasper
|
aa2ed3083a
|
added playermove
|
2015-03-04 16:01:55 +01:00 |
|
Steffen Fündgens
|
afae5ccd68
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 15:52:39 +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 |
|
Steffen Fündgens
|
e14a2305a0
|
Added new undo parameter for triggers to the converter.
|
2015-03-04 15:45:48 +01:00 |
|
Jasper
|
cdde802756
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 15:33:50 +01:00 |
|
Jasper
|
d827bb8197
|
fix
|
2015-03-04 15:33:31 +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
|
8e1c776f80
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-04 15:11:14 +01:00 |
|
Jasper
|
94cdd16394
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 15:09:50 +01:00 |
|
sfroitzheim
|
f48d6d4648
|
Seperated skydome and sun
|
2015-03-04 15:06:58 +01:00 |
|
Jasper
|
ef9c089d91
|
modified the update in level.cc. Now the ball no longer goes bouncy.
|
2015-03-04 15:04:46 +01:00 |
|
sfroitzheim
|
20055d7fc5
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-04 15:04:32 +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 |
|
Jasper
|
b7718d73e8
|
modified camera to a directional camera as requested
|
2015-03-04 13:37:27 +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 |
|
Jasper
|
0292ab422a
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 11:16:22 +01:00 |
|
Faerbit
|
a88112d639
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 00:55:11 +01:00 |
|
Faerbit
|
2930a86959
|
Made first attempt at blurring flames. Conceptually bad, looks very bad.
|
2015-03-04 00:55:01 +01:00 |
|
Faerbit
|
f34dbf891c
|
Removed now useless stuff from the flame shader.
|
2015-03-03 23:32:43 +01:00 |
|
Faerbit
|
916c26cda1
|
Introduced flame post processing shader.
|
2015-03-03 23:27:41 +01:00 |
|
Steffen
|
b28f4d3bef
|
Added checks and error messages in case files do not exist.
|
2015-03-03 18:45:02 +01:00 |
|
Steffen
|
dd0afd1978
|
Changed array initialization because it did not compile under windows.
|
2015-03-03 17:37:03 +01:00 |
|
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 |
|