Steffen Fündgens
|
5dfa5f89e8
|
Changed the camera so it is less likely to go through the heightmap.
|
2015-03-06 17:45:51 +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 |
|
Jasper
|
60a127eefc
|
fixed problem where pressing buttons while respawning would lead to overflow and segmentation fault
|
2015-03-06 16:56:20 +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 |
|
Jasper
|
39a0883466
|
Fixed y value of the sun.
|
2015-03-06 16:14:59 +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
|
dfe83042b5
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-03-06 15:19:45 +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 |
|
Jasper
|
1399f6ad7a
|
Added smooth respawn in the forcePlayer function
|
2015-03-06 15:01:22 +01:00 |
|
Jasper
|
23f8ea8fa7
|
modified run amounts
|
2015-03-06 14:00:59 +01:00 |
|
Jasper
|
0460b463d1
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-06 13:58:46 +01:00 |
|
Jasper
|
522e2f0db5
|
resized camera object
|
2015-03-06 13:58:25 +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 |
|
Steffen Fündgens
|
db18560dbf
|
Added an errorcheck when loading lua files.
|
2015-03-06 13:18:55 +01:00 |
|
Faerbit
|
1b8b8125f4
|
Added shader which could manipulate the color of the flames.
|
2015-03-06 09:21:38 +01:00 |
|
Faerbit
|
00506c6b3e
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-06 09:16:37 +01:00 |
|
Faerbit
|
e4c9418d4a
|
Gave the flames it's own framebuffer to be able to manipulate it's color.
|
2015-03-06 09:16:29 +01:00 |
|
SteffenFuendgens
|
0f7240b047
|
Added lua scripts for the sunrise.
|
2015-03-05 18:30:50 +01:00 |
|
Faerbit
|
2dd09aff19
|
Removing unused code.
|
2015-03-05 16:17:21 +01:00 |
|
Faerbit
|
95c88979f4
|
Changed brazier parameters to sensible values.
|
2015-03-05 12:48:32 +01:00 |
|
Faerbit
|
019c150521
|
Triangulted faces of brazier.
|
2015-03-05 12:41:31 +01:00 |
|
Faerbit
|
99995d0745
|
Fixed brazier model.
|
2015-03-05 12:31:34 +01:00 |
|
Faerbit
|
d9f0950463
|
Disabled multisampling because we draw to an offscreen fbo anyway.
|
2015-03-04 23:37:10 +01:00 |
|
Faerbit
|
fa8ba1335e
|
Made use of the night texture. Now blends to night texture if the sun vector is pointing down.
|
2015-03-04 21:50:47 +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 |
|
Steffen Fündgens
|
bb30aee8d3
|
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
|
bed9f09539
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 17:47:41 +01:00 |
|
Fabian Klemp
|
fce73f1285
|
Added fading to the sun.
|
2015-03-04 17:47:34 +01:00 |
|
Fabian Klemp
|
b7f95ebb40
|
Added sun to skydome.
|
2015-03-04 17:09:46 +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
|
d273d131e2
|
Increases vertex count of skydome.
|
2015-03-04 17:08:47 +01:00 |
|
Fabian Klemp
|
6004651adc
|
Using new skydome texture.
|
2015-03-04 16:10:15 +01:00 |
|
Fabian Klemp
|
98e8d10cdd
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 16:08:11 +01:00 |
|
Fabian Klemp
|
01a61f43ac
|
Gave skydome it's own shader.
|
2015-03-04 16:08:03 +01:00 |
|
Jasper
|
aa2ed3083a
|
added playermove
|
2015-03-04 16:01:55 +01:00 |
|
Steffen Fündgens
|
afae5ccd68
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-03-04 15:52:39 +01:00 |
|