Commit Graph

28 Commits

Author SHA1 Message Date
Faerbit
f3cbfe6133 Gave the skydome it's own class which contains the nightTexture and changed the loader and the level XML. 2015-03-04 21:28:46 +01:00
Faerbit
6c2fb865b6 Removed hardcoded obj file name from skydome. 2015-03-04 21:05:24 +01:00
Steffen Fündgens
956b59a8b8 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
95fef2448e Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 16:08:11 +01:00
Fabian Klemp
1ec7f05eca Gave skydome it's own shader. 2015-03-04 16:08:03 +01:00
Steffen Fündgens
47bd2d29df 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
c4f106bf86 Added flameHeight and flameWidth with loading from xml. 2015-03-04 15:22:07 +01:00
Steffen Fündgens
58db26b9da 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
91fe9a9b27 Added checks and error messages in case files do not exist. 2015-03-03 18:45:02 +01:00
Steffen Fündgens
319ef672df Fixed a bug with shifting the heightmap. 2015-03-02 17:17:06 +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
fc15047d56 Removing maybe unitiliazed errors. 2015-02-24 10:50:11 +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
Faerbit
23fc196bea Moved setting of package.path in lua to init.lua 2015-02-15 19:32:19 +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
d7d45682a0 Added maxShadowRenderCount. Controls how many shadows get rendered. 2015-02-13 16:20:22 +01:00
Steffen Fündgens
47fded52ce Code rework. Basically cleaned up a mess of tabs and whitespaces. 2015-02-13 13:46:41 +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
dbf5a88ddb Moved loading of the config.xml to the loader class. 2015-02-07 20:08:59 +01:00
Steffen
b6a9e2f180 Changed the switch object, its graphics and physics should work now(untested). Objects without physics also do not need damping values anymore. 2015-02-07 19:34:40 +01:00
Steffen
3e8689aae2 Made None an available physicsType for objects without physics. 2015-02-07 19:23:27 +01:00
Steffen
e39adf56ed objectData now has a new value called renderable, if it is false the object will not get rendered. 2015-02-07 19:09:49 +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
df7c5ffe3d Moved loading of the terrain to the loader, now also reading parameters for it from xml. 2015-02-06 12:51:53 +01:00
Faerbit
d50f624004 Moved loading functionality to loader class. 2015-02-04 17:16:06 +01:00