Commit Graph

657 Commits

Author SHA1 Message Date
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
1f89ec9e32 Clarifing which offset is meant. 2015-02-24 14:04:56 +01:00
Faerbit
e08eda317c Adding flame. 2015-02-24 12:56:55 +01:00
Faerbit
a2d0133acd Removing flame class and integrate it into light class because it was unpractical. 2015-02-24 12:56:40 +01:00
Faerbit
6115311173 Fixing windows build. Lua now cross compiles. 2015-02-24 11:07:52 +01:00
Faerbit
20b6987d0a While cleaning also clean lua. 2015-02-24 11:02:24 +01:00
Faerbit
fc15047d56 Removing maybe unitiliazed errors. 2015-02-24 10:50:11 +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
Faerbit
e67720650f Removing outdated comment. 2015-02-19 00:30:35 +01:00
Steffen
8c6ae87b83 Now using the xml query functions everywhere in the loader class. 2015-02-18 21:20:29 +01:00
Steffen
2d5fdc488f Added xml query functions to the loader class, using them in loadConfig(). 2015-02-18 20:10:30 +01:00
Steffen Fündgens
5608790231 Added loading of flames. 2015-02-17 12:54:21 +01:00
Steffen Fündgens
aa1287cdaa Added vector of flames to the level. 2015-02-17 12:41:15 +01:00
Steffen Fündgens
25e016d70f Added new flame class. 2015-02-17 12:36:43 +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
877bfae6d0 Give the luaState a proper name. 2015-02-15 19:37:13 +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
Faerbit
f6b2cc938f Removed commented code. 2015-02-15 19:20:21 +01:00
Steffen
775f509464 Changed position constraints so they dont bounce the door up and down. 2015-02-15 16:12:11 +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
243d76ab5b Updated package.sh to fit new directory structure. 2015-02-15 11:20:03 +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
Faerbit
cc35f5c4fc Moved setting of sleepingThreshold of PositionConstraints. 2015-02-14 09:39:16 +01:00
Faerbit
ab155f7e48 Fixed first door not opening. 2015-02-14 00:40:52 +01:00
Steffen Fündgens
e13659b787 Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 19:25:11 +01:00
Steffen Fündgens
0d64f064ed Added a trigger to open the first door, cant close it again cause apparently i have no idea what the difference between global and shared variables in lua is... 2015-02-13 19:24:57 +01:00
sfroitzheim
4113b8010f Merge branch 'master' of https://github.com/Faerbit/swp 2015-02-13 18:18:03 +01:00
sfroitzheim
77d6e16db8 made some extreme level-layout improvements (putting walls properly together etc) 2015-02-13 18:17:47 +01:00
Steffen Fündgens
162a54757b Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 18:10:55 +01:00
Steffen Fündgens
1d2a1a8a02 Added position constraints 2015-02-13 18:10:49 +01:00
Jasper
c2a26cc3ad changed hight of camera and added camera move methode in physics 2015-02-13 17:47:21 +01:00
Jasper
8aab9a64e9 Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 17:36:11 +01:00
Fabian Klemp
18bd1bda49 Fixed updating of lights. 2015-02-13 17:35:56 +01:00
Jasper
73ad91dbc0 Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 17:23:21 +01:00
Jasper
664539b718 added move system and modified the camera for less bobidity 2015-02-13 17:22:01 +01:00
Steffen Fündgens
9e987fdbdf Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 17:14:38 +01:00
Steffen Fündgens
60543a301e Added resetPlayer function to the level. 2015-02-13 17:14:29 +01:00
Fabian Klemp
60a3525f1d Updated Readme.md. 2015-02-13 17:11:47 +01:00
Fabian Klemp
deb691a6c0 maxShadowRenderCount now works correctly. 2015-02-13 17:09:25 +01:00