SteffenFuendgens
|
79d14461e6
|
Added lights that get created and deleted from lua. Scripts dont crash but i cant test it further until monday.
|
2015-03-07 13:41:35 +01:00 |
|
Steffen Fündgens
|
198f8054b7
|
Merging level.cc und level.hh.
|
2015-03-06 17:49:21 +01:00 |
|
Steffen Fündgens
|
15671202e8
|
Added a reset for the second moveable box.
|
2015-03-06 17:44:34 +01:00 |
|
Jasper
|
876df5f793
|
./ruMerge branch 'master' of github.com:Faerbit/swp
|
2015-03-06 16:57:50 +01:00 |
|
Jasper
|
b4c3f753df
|
corrrected reset position
|
2015-03-06 16:57:38 +01:00 |
|
Jasper
|
63d5af903a
|
changed waterlevel
|
2015-03-06 16:57:10 +01:00 |
|
sfroitzheim
|
1e12f2e981
|
Added torches to the scene
|
2015-03-06 16:44:24 +01:00 |
|
sfroitzheim
|
c54e7132f4
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-06 16:29:05 +01:00 |
|
sfroitzheim
|
797d45467b
|
Added the exit to models and scene
|
2015-03-06 16:28:38 +01:00 |
|
Jasper
|
1d4822160e
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-06 16:20:18 +01:00 |
|
Jasper
|
25b8960b92
|
Added endgame.
|
2015-03-06 16:19:57 +01:00 |
|
Steffen Fündgens
|
b04185d720
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-06 15:24:49 +01:00 |
|
Steffen Fündgens
|
3233a5b4f2
|
Added waterPlane.(with skydome texture)
|
2015-03-06 15:24:02 +01:00 |
|
sfroitzheim
|
ae1fb3df87
|
Added the loading screen to the data plus replaced switch-torches with braziers
|
2015-03-06 15:19:28 +01:00 |
|
Steffen Fündgens
|
f9135a6bc1
|
Adjusted constraints and triggers to lowered switches.
|
2015-03-06 13:39:04 +01:00 |
|
Steffen Fündgens
|
a843d00f1c
|
Finished lua script for the sunrise and added triggers to call it.
|
2015-03-06 13:22:04 +01:00 |
|
SteffenFuendgens
|
4e99ca2241
|
Added lua scripts for the sunrise.
|
2015-03-05 18:30:50 +01:00 |
|
Faerbit
|
d6ec0c27f9
|
Changed brazier parameters to sensible values.
|
2015-03-05 12:48:32 +01:00 |
|
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
|
62b6f893d6
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 18:11:38 +01:00 |
|
Steffen Fündgens
|
5ac6309772
|
Made the block for the switches lighter and adjusted the triggers.
|
2015-03-04 18:11:32 +01:00 |
|
Steffen Fündgens
|
deb70240d1
|
Added 'Safepoints' to the resetPlayer script.
|
2015-03-04 18:10:49 +01:00 |
|
sfroitzheim
|
2568a2a69f
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-04 17:09:25 +01:00 |
|
sfroitzheim
|
2c0073eb9f
|
Added torches for the switches plus added the hint to the scene
|
2015-03-04 17:08:53 +01:00 |
|
Fabian Klemp
|
c8f360e1c2
|
Using new skydome texture.
|
2015-03-04 16:10:15 +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 |
|
sfroitzheim
|
16fbe291d1
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-04 15:42:51 +01:00 |
|
sfroitzheim
|
fa577bb9d2
|
adjusted height for first blockswitch
|
2015-03-04 15:41:25 +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 Fündgens
|
0cb792b415
|
Made the block for the switches heavier so it can activate the switches again.
|
2015-03-04 13:38:38 +01:00 |
|
Faerbit
|
60c106f863
|
Moved torch light up to account for new torch model.
|
2015-03-03 11:05:34 +01:00 |
|
Steffen Fündgens
|
9ba15227c2
|
Added scripts and triggers to open the second door.
|
2015-03-02 17:20:02 +01:00 |
|
Steffen Fündgens
|
80df2aac41
|
Added lua scripts and triggers for the third door.
|
2015-03-02 12:58:34 +01:00 |
|
Steffen Fündgens
|
cb538cb9ff
|
Moved unused scripts into a subfolder.
|
2015-03-02 12:42:04 +01:00 |
|
Steffen Fündgens
|
39e731fa42
|
Added position constraints for all switch_inner.
|
2015-03-02 12:22:47 +01:00 |
|
Steffen Fündgens
|
08f8eec432
|
Adjusted the size of switch_inner so it does not move to the sides.
|
2015-03-02 12:16:29 +01:00 |
|
Faerbit
|
53557b80c4
|
Using the color of the lights for the flame color.
|
2015-03-01 18:45:31 +01:00 |
|
Faerbit
|
85218c94c5
|
Moved flame down a little bit to better fit the new flame.
|
2015-02-28 00:53:23 +01:00 |
|
Steffen Fündgens
|
3a7dd27d31
|
Integrated Simons Level1.png changes from the .xcf.
|
2015-02-27 17:21:52 +01:00 |
|
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 |
|
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 |
|