Commit Graph

828 Commits

Author SHA1 Message Date
Steffen
115e827ef1 Got scripts to work as intended, had to use an ugly hack for it. 2015-02-15 16:11:31 +01:00
Faerbit
243d76ab5b Updated package.sh to fit new directory structure. 2015-02-15 11:20:03 +01:00
Faerbit
e88ff9f1ac Unified how pathes are interpreted in config.xml. 2015-02-14 09:55:43 +01:00
Faerbit
89a73f3776 Restructured directory tree. 2015-02-14 09:49:29 +01:00
Faerbit
cc35f5c4fc Moved setting of sleepingThreshold of PositionConstraints. 2015-02-14 09:39:16 +01:00
Faerbit
ab155f7e48 Fixed first door not opening. 2015-02-14 00:40:52 +01:00
Steffen Fündgens
e13659b787 Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 19:25:11 +01:00
Steffen Fündgens
0d64f064ed Added a trigger to open the first door, cant close it again cause apparently i have no idea what the difference between global and shared variables in lua is... 2015-02-13 19:24:57 +01:00
sfroitzheim
4113b8010f Merge branch 'master' of https://github.com/Faerbit/swp 2015-02-13 18:18:03 +01:00
sfroitzheim
77d6e16db8 made some extreme level-layout improvements (putting walls properly together etc) 2015-02-13 18:17:47 +01:00
Steffen Fündgens
162a54757b Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 18:10:55 +01:00
Steffen Fündgens
1d2a1a8a02 Added position constraints 2015-02-13 18:10:49 +01:00
Jasper
c2a26cc3ad changed hight of camera and added camera move methode in physics 2015-02-13 17:47:21 +01:00
Jasper
8aab9a64e9 Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 17:36:11 +01:00
Fabian Klemp
18bd1bda49 Fixed updating of lights. 2015-02-13 17:35:56 +01:00
Jasper
73ad91dbc0 Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 17:23:21 +01:00
Jasper
664539b718 added move system and modified the camera for less bobidity 2015-02-13 17:22:01 +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
60a3525f1d Updated Readme.md. 2015-02-13 17:11:47 +01:00
Fabian Klemp
deb691a6c0 maxShadowRenderCount now works correctly. 2015-02-13 17:09:25 +01:00
Fabian Klemp
69936ae15c Now also ignoring *.swp files. 2015-02-13 17:02:36 +01:00
Jasper
02aea1f297 corrected camera position for specular lighting 2015-02-13 16:35:35 +01:00
Jasper
851159828a Camera now with less jitter! 2015-02-13 16:34:39 +01:00
Jasper
6ffc1809ff Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 16:22:06 +01:00
Fabian Klemp
d7d45682a0 Added maxShadowRenderCount. Controls how many shadows get rendered. 2015-02-13 16:20:22 +01:00
Jasper
8a273777a1 Fixed non rotating objects 2015-02-13 16:09:18 +01:00
Fabian Klemp
30284977da Merge branch 'debug-shadows'
Conflicts:
	graphics.cc
	graphics.hh
	object.cc
2015-02-13 16:02:12 +01:00
Fabian Klemp
0c6c06fe00 Updated how shadows are applied. Looks nice now. 2015-02-13 15:51:49 +01:00
Jasper
818af2769b Merge branch 'master' of github.com:Faerbit/swp 2015-02-13 15:46:46 +01:00
Jasper
dc628f3fc8 added debug Camear (keys L and K to switch) 2015-02-13 15:46:00 +01:00
Steffen Fündgens
22232ff7dc Undid something i did not want to include in the last commit. 2015-02-13 15:38:43 +01:00
Steffen Fündgens
7a7b8d07c6 Reenabled zooming with the mouse wheel. 2015-02-13 15:20:32 +01:00
sfroitzheim
c50e1b2547 changed heightmap to incorporate the whole vague level layout 2015-02-13 14:35:48 +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 Fündgens
b2398ba643 Reduced camera mass so the camera can practically not move objects anymore. Fixed the scaling of forces on the camera with the (no more inverted) mass. 2015-02-13 13:00:47 +01:00
Steffen Fündgens
cb6f535382 Made it possible again to move the camera upwards. 2015-02-13 12:47:34 +01:00
Steffen Fündgens
012d117c7e Changed position constraints to be less bouncy. 2015-02-13 12:15:54 +01:00
Faerbit
f41c286504 Fixing parameters. 2015-02-12 16:28:24 +01:00
Faerbit
91048e09f8 Another syntax fix. 2015-02-12 01:38:18 +01:00
Faerbit
294a8544f9 Syntax fix. 2015-02-12 01:28:26 +01:00
Faerbit
e1bc49b41e Fixing CI system. 2015-02-12 01:19:34 +01:00
Faerbit
d6d934277f Now only using the 32 closest light sources. 2015-02-12 01:13:26 +01:00
Faerbit
91dbc280e0 Completed shadows for now. Lighting model is still a little bit off. 2015-02-10 18:19:26 +01:00
Faerbit
3d51da73f9 Fixed directional shadows. 2015-02-10 00:27:13 +01:00
Faerbit
0664ae9760 Got multiple shadows working. The really ugly way. 2015-02-09 21:29:44 +01:00
Faerbit
b4419b88d2 Changed cube map shadows sampler to a sampler array. 2015-02-09 14:26:04 +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