Commit Graph

127 Commits

Author SHA1 Message Date
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
sfroitzheim
90fa31cbc9 prepared switch room for adding braziers 2015-02-27 15:47:36 +01:00
sfroitzheim
c04d8105bb Completed work on the switch room (for now) 2015-02-27 15:42:16 +01:00
sfroitzheim
5cb28c8440 Added an example of bridges meeting properly to the scene (in the big switch room where are no switches yet) 2015-02-26 17:11:02 +01:00
sfroitzheim
9fe37ee2d8 Added the hidden hint model 2015-02-26 15:50:36 +01:00
sfroitzheim
0ad57ec682 Added a brazier model 2015-02-26 15:49:34 +01:00
Faerbit
b0b2c71139 Added simple geometry shader which draws a red triangle which changes it's height over time. 2015-02-24 23:30:59 +01:00
Faerbit
a21aa613bd Removing flame offset from Level.xml because it should be in the Compositions.xml. 2015-02-24 15:28:53 +01:00
Faerbit
e08eda317c Adding flame. 2015-02-24 12:56:55 +01:00
Steffen Fündgens
c569e5099d Adjusted the converter to be robust against IDs being overwritten with zeros in the png. Sucessfully ran it. 2015-02-20 15:06:43 +01:00
Steffen Fündgens
a8e4472367 Unified object and texture filenames. 2015-02-20 13:56:40 +01:00
Steffen Fündgens
0db6590f85 Updated Level0 to be runable. 2015-02-20 13:40:59 +01:00
Steffen Fündgens
7ad9965c74 Updated currently unused scripts. 2015-02-20 13:26:09 +01:00
Steffen Fündgens
a20a55dc79 Now using xml query functions in the converter. Also adjusted the converter to use config.xml. Running the converter would delete all triggers and position constraints though, because the IDs in the png were manually overwritten with zeros. 2015-02-20 13:11:05 +01:00
Steffen Fündgens
5608790231 Added loading of flames. 2015-02-17 12:54:21 +01:00
Steffen Fündgens
a209acc6c9 Adjusted the mass of switchInner and the force that keeps it in place. The movableBlock can now push the switch down. 2015-02-17 12:25:12 +01:00
Steffen Fündgens
d5223ae540 Adjusted the size of the movableBlock. 2015-02-17 12:04:15 +01:00
Faerbit
397d2729e8 Do not implicitly set extensions of script files. 2015-02-15 19:34:15 +01:00
Faerbit
23fc196bea Moved setting of package.path in lua to init.lua 2015-02-15 19:32:19 +01:00
Steffen
115e827ef1 Got scripts to work as intended, had to use an ugly hack for it. 2015-02-15 16:11:31 +01:00
Faerbit
e88ff9f1ac Unified how pathes are interpreted in config.xml. 2015-02-14 09:55:43 +01:00
Faerbit
89a73f3776 Restructured directory tree. 2015-02-14 09:49:29 +01:00
Fabian Klemp
d7d45682a0 Added maxShadowRenderCount. Controls how many shadows get rendered. 2015-02-13 16:20:22 +01:00
Steffen
9297aa69a4 Now loading the resolution of the shadow cube maps from config.xml. 2015-02-07 20:24:11 +01:00
Steffen Fündgens
2bfad25510 Added loading from config.xml, then debuged it for more than three hours... 2015-02-06 18:00:14 +01:00
Steffen Fündgens
bffbe8250f Added config.xml, not using it yet. 2015-02-06 13:06:42 +01:00