Steffen Fündgens
|
2873d300a8
|
Added position constraints
|
2015-02-13 18:10:49 +01:00 |
|
Jasper
|
760a7c9d86
|
changed hight of camera and added camera move methode in physics
|
2015-02-13 17:47:21 +01:00 |
|
Jasper
|
3d59fb43c8
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 17:36:11 +01:00 |
|
Fabian Klemp
|
df230ea677
|
Fixed updating of lights.
|
2015-02-13 17:35:56 +01:00 |
|
Jasper
|
f2bfd12aa5
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 17:23:21 +01:00 |
|
Jasper
|
d4fe5e1ae1
|
added move system and modified the camera for less bobidity
|
2015-02-13 17:22:01 +01:00 |
|
Steffen Fündgens
|
1492a312ed
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 17:14:38 +01:00 |
|
Steffen Fündgens
|
265c0b2ce5
|
Added resetPlayer function to the level.
|
2015-02-13 17:14:29 +01:00 |
|
Fabian Klemp
|
5e07aec885
|
Updated Readme.md.
|
2015-02-13 17:11:47 +01:00 |
|
Fabian Klemp
|
fd1f32be6a
|
maxShadowRenderCount now works correctly.
|
2015-02-13 17:09:25 +01:00 |
|
Fabian Klemp
|
377902a255
|
Now also ignoring *.swp files.
|
2015-02-13 17:02:36 +01:00 |
|
Jasper
|
3f1616adf1
|
corrected camera position for specular lighting
|
2015-02-13 16:35:35 +01:00 |
|
Jasper
|
818178e665
|
Camera now with less jitter!
|
2015-02-13 16:34:39 +01:00 |
|
Jasper
|
51e9b26379
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 16:22:06 +01:00 |
|
Fabian Klemp
|
281466ebd5
|
Added maxShadowRenderCount. Controls how many shadows get rendered.
|
2015-02-13 16:20:22 +01:00 |
|
Jasper
|
98718b517e
|
Fixed non rotating objects
|
2015-02-13 16:09:18 +01:00 |
|
Fabian Klemp
|
599c849bb0
|
Merge branch 'debug-shadows'
Conflicts:
graphics.cc
graphics.hh
object.cc
|
2015-02-13 16:02:12 +01:00 |
|
Fabian Klemp
|
55434daa24
|
Updated how shadows are applied. Looks nice now.
|
2015-02-13 15:51:49 +01:00 |
|
Jasper
|
9049458ad5
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-13 15:46:46 +01:00 |
|
Jasper
|
75792a5723
|
added debug Camear (keys L and K to switch)
|
2015-02-13 15:46:00 +01:00 |
|
Steffen Fündgens
|
3fc8e9c11a
|
Undid something i did not want to include in the last commit.
|
2015-02-13 15:38:43 +01:00 |
|
Steffen Fündgens
|
d55bb3465c
|
Reenabled zooming with the mouse wheel.
|
2015-02-13 15:20:32 +01:00 |
|
sfroitzheim
|
38d4ef8125
|
changed heightmap to incorporate the whole vague level layout
|
2015-02-13 14:35:48 +01:00 |
|
Steffen Fündgens
|
e91d045a37
|
Code rework. Basically cleaned up a mess of tabs and whitespaces.
|
2015-02-13 13:46:41 +01:00 |
|
Steffen Fündgens
|
1585195779
|
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
|
6ee8af58e3
|
Made it possible again to move the camera upwards.
|
2015-02-13 12:47:34 +01:00 |
|
Steffen Fündgens
|
d02a7fa02f
|
Changed position constraints to be less bouncy.
|
2015-02-13 12:15:54 +01:00 |
|
Faerbit
|
1ac9e4e270
|
Fixing parameters.
|
2015-02-12 16:28:24 +01:00 |
|
Faerbit
|
84d52fbaf2
|
Another syntax fix.
|
2015-02-12 01:38:18 +01:00 |
|
Faerbit
|
aaadcbe413
|
Syntax fix.
|
2015-02-12 01:28:26 +01:00 |
|
Faerbit
|
de960237a4
|
Fixing CI system.
|
2015-02-12 01:19:34 +01:00 |
|
Faerbit
|
1d8bbba1ca
|
Now only using the 32 closest light sources.
|
2015-02-12 01:13:26 +01:00 |
|
Faerbit
|
ba2cada6dc
|
Completed shadows for now. Lighting model is still a little bit off.
|
2015-02-10 18:19:26 +01:00 |
|
Faerbit
|
9afb3595d0
|
Fixed directional shadows.
|
2015-02-10 00:27:13 +01:00 |
|
Faerbit
|
282eb32267
|
Got multiple shadows working. The really ugly way.
|
2015-02-09 21:29:44 +01:00 |
|
Faerbit
|
c28b35667f
|
Changed cube map shadows sampler to a sampler array.
|
2015-02-09 14:26:04 +01:00 |
|
Steffen
|
8cc467a806
|
Now loading the resolution of the shadow cube maps from config.xml.
|
2015-02-07 20:24:11 +01:00 |
|
Steffen
|
2b4a8885b5
|
Moved loading of the config.xml to the loader class.
|
2015-02-07 20:08:59 +01:00 |
|
Steffen
|
096cf12df0
|
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 |
|
Steffen
|
d132cdd233
|
Made None an available physicsType for objects without physics.
|
2015-02-07 19:23:27 +01:00 |
|
Steffen
|
7647c5f1c0
|
objectData now has a new value called renderable, if it is false the object will not get rendered.
|
2015-02-07 19:09:49 +01:00 |
|
Steffen Fündgens
|
21d94a420f
|
Merged physics.cc.
|
2015-02-06 18:04:20 +01:00 |
|
Steffen Fündgens
|
d2cf4f0003
|
Added loading from config.xml, then debuged it for more than three hours...
|
2015-02-06 18:00:14 +01:00 |
|
Jasper
|
44153cd554
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-06 17:32:30 +01:00 |
|
Jasper
|
c4bed4c506
|
addede max camera speed
|
2015-02-06 17:31:52 +01:00 |
|
sfroitzheim
|
a669c83943
|
Finally fixed wall and gate physics plus made some heightmap modifications
|
2015-02-06 16:31:21 +01:00 |
|
Jasper
|
017c96bd55
|
got the marble to no longer jitter all over the place
|
2015-02-06 16:26:22 +01:00 |
|
Steffen Fündgens
|
a14d3420d5
|
Implemented loading of config.xml, the loaded values are not used yet.
|
2015-02-06 13:37:42 +01:00 |
|
Steffen Fündgens
|
ea58f2fbce
|
Added config.xml, not using it yet.
|
2015-02-06 13:06:42 +01:00 |
|
Steffen Fündgens
|
320c1cb152
|
Moved loading of the terrain to the loader, now also reading parameters for it from xml.
|
2015-02-06 12:51:53 +01:00 |
|