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 |
|
Steffen
|
3e8689aae2
|
Made None an available physicsType for objects without physics.
|
2015-02-07 19:23:27 +01:00 |
|
Steffen
|
e39adf56ed
|
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
|
ff5bd0dae1
|
Merged physics.cc.
|
2015-02-06 18:04:20 +01:00 |
|
Steffen Fündgens
|
2bfad25510
|
Added loading from config.xml, then debuged it for more than three hours...
|
2015-02-06 18:00:14 +01:00 |
|
Jasper
|
bcc798ad79
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-02-06 17:32:30 +01:00 |
|
Jasper
|
644a4a3571
|
addede max camera speed
|
2015-02-06 17:31:52 +01:00 |
|
sfroitzheim
|
4978869f82
|
Finally fixed wall and gate physics plus made some heightmap modifications
|
2015-02-06 16:31:21 +01:00 |
|
Jasper
|
72e3fdea69
|
got the marble to no longer jitter all over the place
|
2015-02-06 16:26:22 +01:00 |
|
Steffen Fündgens
|
f29678867f
|
Implemented loading of config.xml, the loaded values are not used yet.
|
2015-02-06 13:37:42 +01:00 |
|
Steffen Fündgens
|
bffbe8250f
|
Added config.xml, not using it yet.
|
2015-02-06 13:06:42 +01:00 |
|
Steffen Fündgens
|
df7c5ffe3d
|
Moved loading of the terrain to the loader, now also reading parameters for it from xml.
|
2015-02-06 12:51:53 +01:00 |
|
Steffen Fündgens
|
8be350c713
|
Added terrain parameters to the xml.
|
2015-02-06 12:37:00 +01:00 |
|
Faerbit
|
486713683d
|
Added non-linearization to get rid of fragments.
|
2015-02-05 13:19:51 +01:00 |
|