Saxum

faerbit/Saxum

Fork 0

Commit Graph

Select branches

Hide Pull Requests

3d-poisson

converter

cube-map-array

debug-shadows

flameColorFragment

flamePostColor

gauss-shadows

gaussian-blur

linearized

loading-screen

master

optimization

renderqueue

shadow-renderqueue

terrain-test

world-space

Milestone1

Milestone2

Milestone3

Release1.0

Release1.1

presentation

1d2a1a8a02 Added position constraints Steffen Fündgens 2015-02-13 18:10:49 +0100
760a7c9d86 changed hight of camera and added camera move methode in physics Jasper 2015-02-13 17:47:21 +0100
c2a26cc3ad changed hight of camera and added camera move methode in physics Jasper 2015-02-13 17:47:21 +0100
3d59fb43c8 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-02-13 17:36:11 +0100
8aab9a64e9 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-02-13 17:36:11 +0100
df230ea677 Fixed updating of lights. Fabian Klemp 2015-02-13 17:35:56 +0100
18bd1bda49 Fixed updating of lights. Fabian Klemp 2015-02-13 17:35:56 +0100
f2bfd12aa5 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-02-13 17:23:21 +0100
73ad91dbc0 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-02-13 17:23:21 +0100
d4fe5e1ae1 added move system and modified the camera for less bobidity Jasper 2015-02-13 17:22:01 +0100
664539b718 added move system and modified the camera for less bobidity Jasper 2015-02-13 17:22:01 +0100
1492a312ed Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-02-13 17:14:38 +0100
9e987fdbdf Merge branch 'master' of github.com:Faerbit/swp Steffen Fündgens 2015-02-13 17:14:38 +0100
265c0b2ce5 Added resetPlayer function to the level. Steffen Fündgens 2015-02-13 17:14:29 +0100
60543a301e Added resetPlayer function to the level. Steffen Fündgens 2015-02-13 17:14:29 +0100
5e07aec885 Updated Readme.md. Fabian Klemp 2015-02-13 17:11:47 +0100
60a3525f1d Updated Readme.md. Fabian Klemp 2015-02-13 17:11:47 +0100
fd1f32be6a maxShadowRenderCount now works correctly. Fabian Klemp 2015-02-13 17:09:25 +0100
deb691a6c0 maxShadowRenderCount now works correctly. Fabian Klemp 2015-02-13 17:09:25 +0100
377902a255 Now also ignoring *.swp files. Fabian Klemp 2015-02-13 17:02:36 +0100
69936ae15c Now also ignoring *.swp files. Fabian Klemp 2015-02-13 17:02:36 +0100
3f1616adf1 corrected camera position for specular lighting Jasper 2015-02-13 16:35:35 +0100
02aea1f297 corrected camera position for specular lighting Jasper 2015-02-13 16:35:35 +0100
818178e665 Camera now with less jitter! Jasper 2015-02-13 16:34:39 +0100
851159828a Camera now with less jitter! Jasper 2015-02-13 16:34:39 +0100
51e9b26379 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-02-13 16:22:06 +0100
6ffc1809ff Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-02-13 16:22:06 +0100
281466ebd5 Added maxShadowRenderCount. Controls how many shadows get rendered. Fabian Klemp 2015-02-13 16:20:22 +0100
d7d45682a0 Added maxShadowRenderCount. Controls how many shadows get rendered. Fabian Klemp 2015-02-13 16:20:22 +0100
98718b517e Fixed non rotating objects Jasper 2015-02-13 16:09:18 +0100
8a273777a1 Fixed non rotating objects Jasper 2015-02-13 16:09:18 +0100
599c849bb0 Merge branch 'debug-shadows' Fabian Klemp 2015-02-13 16:02:12 +0100
30284977da Merge branch 'debug-shadows' Fabian Klemp 2015-02-13 16:02:12 +0100
71ce1721c8 Updated how shadows are applied. Looks nice now. debug-shadows Fabian Klemp 2015-02-13 15:51:49 +0100
55434daa24 Updated how shadows are applied. Looks nice now. Fabian Klemp 2015-02-13 15:51:49 +0100
0c6c06fe00 Updated how shadows are applied. Looks nice now. Fabian Klemp 2015-02-13 15:51:49 +0100
9049458ad5 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-02-13 15:46:46 +0100
818af2769b Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-02-13 15:46:46 +0100
75792a5723 added debug Camear (keys L and K to switch) Jasper 2015-02-13 15:46:00 +0100
dc628f3fc8 added debug Camear (keys L and K to switch) Jasper 2015-02-13 15:46:00 +0100
3fc8e9c11a Undid something i did not want to include in the last commit. Steffen Fündgens 2015-02-13 15:38:43 +0100
22232ff7dc Undid something i did not want to include in the last commit. Steffen Fündgens 2015-02-13 15:38:43 +0100
d55bb3465c Reenabled zooming with the mouse wheel. Steffen Fündgens 2015-02-13 15:20:32 +0100
7a7b8d07c6 Reenabled zooming with the mouse wheel. Steffen Fündgens 2015-02-13 15:20:32 +0100
38d4ef8125 changed heightmap to incorporate the whole vague level layout sfroitzheim 2015-02-13 14:35:48 +0100
c50e1b2547 changed heightmap to incorporate the whole vague level layout sfroitzheim 2015-02-13 14:35:48 +0100
e91d045a37 Code rework. Basically cleaned up a mess of tabs and whitespaces. Steffen Fündgens 2015-02-13 13:46:41 +0100
47fded52ce Code rework. Basically cleaned up a mess of tabs and whitespaces. Steffen Fündgens 2015-02-13 13:46:41 +0100
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. Steffen Fündgens 2015-02-13 13:00:47 +0100
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. Steffen Fündgens 2015-02-13 13:00:47 +0100
6ee8af58e3 Made it possible again to move the camera upwards. Steffen Fündgens 2015-02-13 12:47:34 +0100
cb6f535382 Made it possible again to move the camera upwards. Steffen Fündgens 2015-02-13 12:47:34 +0100
d02a7fa02f Changed position constraints to be less bouncy. Steffen Fündgens 2015-02-13 12:15:54 +0100
012d117c7e Changed position constraints to be less bouncy. Steffen Fündgens 2015-02-13 12:15:54 +0100
133bce57c8 Fixing parameters. Faerbit 2015-02-12 16:28:24 +0100
1ac9e4e270 Fixing parameters. Faerbit 2015-02-12 16:28:24 +0100
f41c286504 Fixing parameters. Faerbit 2015-02-12 16:28:24 +0100
84d52fbaf2 Another syntax fix. Faerbit 2015-02-12 01:38:18 +0100
91048e09f8 Another syntax fix. Faerbit 2015-02-12 01:38:18 +0100
aaadcbe413 Syntax fix. Faerbit 2015-02-12 01:28:26 +0100
294a8544f9 Syntax fix. Faerbit 2015-02-12 01:28:26 +0100
de960237a4 Fixing CI system. Faerbit 2015-02-12 01:19:34 +0100
e1bc49b41e Fixing CI system. Faerbit 2015-02-12 01:19:34 +0100
e956c69e6b Now only using the 32 closest light sources. Faerbit 2015-02-12 01:13:26 +0100
1d8bbba1ca Now only using the 32 closest light sources. Faerbit 2015-02-12 01:13:26 +0100
d6d934277f Now only using the 32 closest light sources. Faerbit 2015-02-12 01:13:26 +0100
4eb0f89b96 Completed shadows for now. Lighting model is still a little bit off. Faerbit 2015-02-10 18:19:26 +0100
ba2cada6dc Completed shadows for now. Lighting model is still a little bit off. Faerbit 2015-02-10 18:19:26 +0100
91dbc280e0 Completed shadows for now. Lighting model is still a little bit off. Faerbit 2015-02-10 18:19:26 +0100
d1173ba903 Fixed directional shadows. Faerbit 2015-02-10 00:27:13 +0100
9afb3595d0 Fixed directional shadows. Faerbit 2015-02-10 00:27:13 +0100
3d51da73f9 Fixed directional shadows. Faerbit 2015-02-10 00:27:13 +0100
49b7cb34fe Got multiple shadows working. The really ugly way. Faerbit 2015-02-09 21:29:44 +0100
282eb32267 Got multiple shadows working. The really ugly way. Faerbit 2015-02-09 21:29:44 +0100
0664ae9760 Got multiple shadows working. The really ugly way. Faerbit 2015-02-09 21:29:44 +0100
705d9e3875 Changed cube map shadows sampler to a sampler array. Faerbit 2015-02-09 14:26:04 +0100
c28b35667f Changed cube map shadows sampler to a sampler array. Faerbit 2015-02-09 14:26:04 +0100
b4419b88d2 Changed cube map shadows sampler to a sampler array. Faerbit 2015-02-09 14:26:04 +0100
8cc467a806 Now loading the resolution of the shadow cube maps from config.xml. Steffen 2015-02-07 20:24:11 +0100
9297aa69a4 Now loading the resolution of the shadow cube maps from config.xml. Steffen 2015-02-07 20:24:11 +0100
2b4a8885b5 Moved loading of the config.xml to the loader class. Steffen 2015-02-07 20:08:59 +0100
dbf5a88ddb Moved loading of the config.xml to the loader class. Steffen 2015-02-07 20:08:59 +0100
096cf12df0 Changed the switch object, its graphics and physics should work now(untested). Objects without physics also do not need damping values anymore. Steffen 2015-02-07 19:34:40 +0100
b6a9e2f180 Changed the switch object, its graphics and physics should work now(untested). Objects without physics also do not need damping values anymore. Steffen 2015-02-07 19:34:40 +0100
d132cdd233 Made None an available physicsType for objects without physics. Steffen 2015-02-07 19:23:27 +0100
3e8689aae2 Made None an available physicsType for objects without physics. Steffen 2015-02-07 19:23:27 +0100
7647c5f1c0 objectData now has a new value called renderable, if it is false the object will not get rendered. Steffen 2015-02-07 19:09:49 +0100
e39adf56ed objectData now has a new value called renderable, if it is false the object will not get rendered. Steffen 2015-02-07 19:09:49 +0100
21d94a420f Merged physics.cc. Steffen Fündgens 2015-02-06 18:04:20 +0100
ff5bd0dae1 Merged physics.cc. Steffen Fündgens 2015-02-06 18:04:20 +0100
d2cf4f0003 Added loading from config.xml, then debuged it for more than three hours... Steffen Fündgens 2015-02-06 18:00:14 +0100
2bfad25510 Added loading from config.xml, then debuged it for more than three hours... Steffen Fündgens 2015-02-06 18:00:14 +0100
44153cd554 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-02-06 17:32:30 +0100
bcc798ad79 Merge branch 'master' of github.com:Faerbit/swp Jasper 2015-02-06 17:32:30 +0100
c4bed4c506 addede max camera speed Jasper 2015-02-06 17:31:52 +0100
644a4a3571 addede max camera speed Jasper 2015-02-06 17:31:52 +0100
a669c83943 Finally fixed wall and gate physics plus made some heightmap modifications sfroitzheim 2015-02-06 16:31:21 +0100
4978869f82 Finally fixed wall and gate physics plus made some heightmap modifications sfroitzheim 2015-02-06 16:31:21 +0100
017c96bd55 got the marble to no longer jitter all over the place Jasper 2015-02-06 16:26:22 +0100
72e3fdea69 got the marble to no longer jitter all over the place Jasper 2015-02-06 16:26:22 +0100