Commit Graph

54 Commits

Author SHA1 Message Date
Faerbit
370135fca8 Made heightmap path configurable from level. 2015-03-14 13:00:47 +01:00
Faerbit
70b7289a43 Changing textuer because of clearer licensing. 2015-03-14 09:22:39 +01:00
Faerbit
534405ffdf Changing night texture for copyright reasons. 2015-03-11 23:22:18 +01:00
Faerbit
5966a54a1c Moving textures from cgtextures into their own folder. 2015-03-11 11:16:17 +01:00
sfroitzheim
2b90ca6d3c Added a few torches and changed the hinttorches to green 2015-03-09 18:32:48 +01:00
Jasper
8d5ce5cf18 modified light intensity 2015-03-09 17:06:47 +01:00
Jasper
be21855e1d Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 17:03:28 +01:00
Jasper
28119ea906 modified marbel rolling and box to allow somewhat easier movement 2015-03-09 17:01:14 +01:00
Fabian Klemp
b03520f1e7 Increasing terrain ambient factor be better visible on the beamer. 2015-03-09 17:01:14 +01:00
Fabian Klemp
3ae3c84a39 Changed a few material parameters. 2015-03-09 16:01:03 +01:00
Jasper
f71f9e0590 Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 15:46:10 +01:00
Jasper
caf5d3cf22 changed ambient factors 2015-03-09 15:45:49 +01:00
Fabian Klemp
abb8c981bc Changed a few parameters corresponding with the sunrise. 2015-03-09 15:43:12 +01:00
Jasper
67c1c812a5 Merge branch 'master' of github.com:Faerbit/swp 2015-03-09 14:40:51 +01:00
sfroitzheim
936ab87ba0 Added a half transparent water texture to files and scene 2015-03-09 14:13:27 +01:00
Jasper
251048bbd0 modified starting sunhight + sunrise functions 2015-03-09 13:58:48 +01:00
Faerbit
6e8d3c36df Gave sun rise more different colors. 2015-03-09 00:39:59 +01:00
Steffen Fündgens
7d480d654f Merging level.cc und level.hh. 2015-03-06 17:49:21 +01:00
Steffen Fündgens
5778696d29 Added a reset for the second moveable box. 2015-03-06 17:44:34 +01:00
Jasper
7288ff6fc9 ./ruMerge branch 'master' of github.com:Faerbit/swp 2015-03-06 16:57:50 +01:00
Jasper
49f612fe67 changed waterlevel 2015-03-06 16:57:10 +01:00
sfroitzheim
9a4cb335a0 Added torches to the scene 2015-03-06 16:44:24 +01:00
sfroitzheim
49f041341a Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-06 16:29:05 +01:00
sfroitzheim
c3a9652cf1 Added the exit to models and scene 2015-03-06 16:28:38 +01:00
Jasper
e328298474 Merge branch 'master' of github.com:Faerbit/swp 2015-03-06 16:20:18 +01:00
Jasper
cb762be52b Added endgame. 2015-03-06 16:19:57 +01:00
Steffen Fündgens
a835604a5a Merge branch 'master' of github.com:Faerbit/swp 2015-03-06 15:24:49 +01:00
Steffen Fündgens
b7fa9ee5a1 Added waterPlane.(with skydome texture) 2015-03-06 15:24:02 +01:00
sfroitzheim
e34d9e4e38 Added the loading screen to the data plus replaced switch-torches with braziers 2015-03-06 15:19:28 +01:00
Steffen Fündgens
62e7c42ec6 Adjusted constraints and triggers to lowered switches. 2015-03-06 13:39:04 +01:00
Steffen Fündgens
f1526fd389 Finished lua script for the sunrise and added triggers to call it. 2015-03-06 13:22:04 +01:00
Faerbit
3e86b70778 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
2c333773b2 Removed hardcoded obj file name from skydome. 2015-03-04 21:05:24 +01:00
Steffen Fündgens
6af54ab02f Merge branch 'master' of github.com:Faerbit/swp 2015-03-04 18:11:38 +01:00
Steffen Fündgens
8224250867 Made the block for the switches lighter and adjusted the triggers. 2015-03-04 18:11:32 +01:00
sfroitzheim
4b0c875504 Merge branch 'master' of https://github.com/Faerbit/swp 2015-03-04 17:09:25 +01:00
sfroitzheim
d17ed99d96 Added torches for the switches plus added the hint to the scene 2015-03-04 17:08:53 +01:00
Fabian Klemp
6004651adc Using new skydome texture. 2015-03-04 16:10:15 +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
sfroitzheim
88d5229b35 adjusted height for first blockswitch 2015-03-04 15:41:25 +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
e043fe482a Added scripts and triggers to open the second door. 2015-03-02 17:20:02 +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
81d5f86db1 Added position constraints for all switch_inner. 2015-03-02 12:22:47 +01:00
Steffen Fündgens
7f8150d5ed Integrated Simons Level1.png changes from the .xcf. 2015-02-27 17:21:52 +01:00
Steffen Fündgens
eab9270b94 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
9f19d74c2a 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
Faerbit
174fafe5bc Removing flame offset from Level.xml because it should be in the Compositions.xml. 2015-02-24 15:28:53 +01:00
Faerbit
510001b943 Adding flame. 2015-02-24 12:56:55 +01:00
Steffen Fündgens
320b765951 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