Faerbit
|
65e2e326ed
|
Fixed parameters for new brazier model.
|
2015-03-08 16:04:15 +01:00 |
|
Faerbit
|
ea248caa47
|
Changed flame parameters for the braziers.
|
2015-03-08 14:58:51 +01:00 |
|
Faerbit
|
3eeea52f5e
|
Gave flames their own class again. The size of the flames are now respected.
|
2015-03-07 22:48:44 +01:00 |
|
SteffenFuendgens
|
0f8f261d30
|
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
|
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
|
3d5289da45
|
corrrected reset position
|
2015-03-06 16:57:38 +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 |
|
SteffenFuendgens
|
0f7240b047
|
Added lua scripts for the sunrise.
|
2015-03-05 18:30:50 +01:00 |
|
Faerbit
|
95c88979f4
|
Changed brazier parameters to sensible values.
|
2015-03-05 12:48:32 +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 |
|
Steffen Fündgens
|
79faa2edea
|
Added 'Safepoints' to the resetPlayer script.
|
2015-03-04 18:10:49 +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
|
11322c0446
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-04 15:42:51 +01:00 |
|
sfroitzheim
|
88d5229b35
|
adjusted height for first blockswitch
|
2015-03-04 15:41:25 +01:00 |
|
Steffen Fündgens
|
16ba763ddc
|
Added flameHeight and flameWidth with loading from xml.
|
2015-03-04 15:22:07 +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
|
8b5f6f9b74
|
Made the block for the switches heavier so it can activate the switches again.
|
2015-03-04 13:38:38 +01:00 |
|
Faerbit
|
686647fe93
|
Moved torch light up to account for new torch model.
|
2015-03-03 11:05:34 +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
|
c372a2d652
|
Moved unused scripts into a subfolder.
|
2015-03-02 12:42:04 +01:00 |
|
Steffen Fündgens
|
81d5f86db1
|
Added position constraints for all switch_inner.
|
2015-03-02 12:22:47 +01:00 |
|
Steffen Fündgens
|
2fecf21509
|
Adjusted the size of switch_inner so it does not move to the sides.
|
2015-03-02 12:16:29 +01:00 |
|
Faerbit
|
7ecb76dffa
|
Using the color of the lights for the flame color.
|
2015-03-01 18:45:31 +01:00 |
|
Faerbit
|
0489fc81fa
|
Moved flame down a little bit to better fit the new flame.
|
2015-02-28 00:53:23 +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
|
635f6ae546
|
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
|
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
|
134faaa67e
|
prepared switch room for adding braziers
|
2015-02-27 15:47:36 +01:00 |
|
sfroitzheim
|
84a9899516
|
Completed work on the switch room (for now)
|
2015-02-27 15:42:16 +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
|
a77e06f8c8
|
Added simple geometry shader which draws a red triangle which changes it's height over time.
|
2015-02-24 23:30:59 +01:00 |
|