Steffen Fündgens
|
ec7250e937
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-23 16:04:13 +01:00 |
|
Steffen Fündgens
|
a9ab76ea51
|
Converter can now reuse IDs of deleted compositions.
|
2015-01-23 16:02:50 +01:00 |
|
Steffen Fündgens
|
5a860f68c3
|
Added more exits after errors.
|
2015-01-23 16:02:10 +01:00 |
|
sfroitzheim
|
c29ced5210
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-01-23 14:56:19 +01:00 |
|
sfroitzheim
|
89741cfcb3
|
Added some walls to the scene properly (weird physics bugs are apparent)
|
2015-01-23 14:56:02 +01:00 |
|
Steffen Fündgens
|
f2353d670f
|
Fixed a drawing bug for the pointlight shadows.
|
2015-01-23 14:33:04 +01:00 |
|
Steffen Fündgens
|
e9e7fe1f7c
|
Removed unnecessary bind and clear calls.
|
2015-01-23 14:22:24 +01:00 |
|
sfroitzheim
|
db3fab3d35
|
Fixed merge conflicts.
|
2015-01-23 14:10:35 +01:00 |
|
sfroitzheim
|
56f179e5af
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-01-23 14:08:38 +01:00 |
|
Steffen Fündgens
|
a4ae90082a
|
Forgot one thing.
|
2015-01-23 14:08:30 +01:00 |
|
sfroitzheim
|
cfbf1b9208
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-01-23 14:07:29 +01:00 |
|
sfroitzheim
|
bdb92b2cf1
|
Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
Levels/ObjectSetups/Compositions.xml
Levels/ObjectSetups/Level1.png
Levels/ObjectSetups/Level1.xcf
Levels/ObjectSetups/Level1.xml
|
2015-01-23 14:06:20 +01:00 |
|
Steffen Fündgens
|
f7e097029a
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-23 14:01:06 +01:00 |
|
Steffen Fündgens
|
00de8c0e82
|
Fixed mirroring of shadows by inverting coordinates instead of blitting framebuffers(performance...).
|
2015-01-23 14:00:26 +01:00 |
|
sfroitzheim
|
7c1f0e7960
|
Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
Levels/ObjectSetups/Level1.xml
|
2015-01-23 13:56:40 +01:00 |
|
Jasper
|
4c1860429a
|
prepare for peoples
|
2015-01-23 13:31:19 +01:00 |
|
Jasper
|
47b386296a
|
constraints work. Why? because i said so!
|
2015-01-23 12:59:28 +01:00 |
|
Jasper
|
1687a56f87
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-23 12:06:26 +01:00 |
|
Jasper
|
d1a3c3ac3d
|
readding button -> box
|
2015-01-23 12:05:43 +01:00 |
|
Faerbit
|
d41149e29e
|
Made progress on point light shadows. Not quite sure what is happening.
|
2015-01-22 21:21:09 +01:00 |
|
Faerbit
|
9847aa3374
|
Increased mininum camera distance because the marble got scaled up.
|
2015-01-20 08:45:52 +01:00 |
|
Faerbit
|
2c9755209a
|
Added slides for milestone 3.
|
2015-01-20 00:53:55 +01:00 |
|
Jasper
|
099e0c17c7
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 18:30:12 +01:00 |
|
Jasper
|
650d505e4e
|
Added physics type button.
|
2015-01-19 18:30:07 +01:00 |
|
Jasper
|
99217ed399
|
Added light block and changed physics parameters.
|
2015-01-19 18:28:28 +01:00 |
|
Steffen Fündgens
|
cf836b151a
|
Mirrored rendering of pointlight shadows, so that they are at the correct positions now, but occlude everything. -- Fabian
|
2015-01-19 18:22:25 +01:00 |
|
Steffen Fündgens
|
1940b72b00
|
Increased height of the fog, because of new Scaling of the heightmap. -- Fabian
|
2015-01-19 18:21:29 +01:00 |
|
Jasper
|
65a826f2af
|
some quick updates for the camera before working on buttons
|
2015-01-19 17:12:58 +01:00 |
|
Jasper
|
25bd4ba64e
|
prepared camera, level and physics for the new camera
|
2015-01-19 16:51:35 +01:00 |
|
sfroitzheim
|
4ce7464ae7
|
Added some walls and made some fixes (there are too many walls, I will fix this till tomorrow)
|
2015-01-19 16:47:17 +01:00 |
|
Jasper
|
8306f7ff19
|
prepareing modified camera in physics
|
2015-01-19 16:30:11 +01:00 |
|
Steffen Fündgens
|
5070940a94
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 15:55:18 +01:00 |
|
Steffen Fündgens
|
4c71dbfbea
|
Added rotation in Compompositions.xml.
|
2015-01-19 15:55:03 +01:00 |
|
Jasper
|
bcdbb2534c
|
small changes to trimesh scaling
|
2015-01-19 15:33:44 +01:00 |
|
Jasper
|
c3f7b650fb
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 15:25:08 +01:00 |
|
Jasper
|
2edbb196c2
|
added trimesh back to collision
|
2015-01-19 15:24:44 +01:00 |
|
sfroitzheim
|
aeb4b638c7
|
Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
Levels/ObjectSetups/Level1.xml
|
2015-01-19 15:18:34 +01:00 |
|
sfroitzheim
|
65ba8c0249
|
Added improved starting bridge version
|
2015-01-19 15:15:18 +01:00 |
|
Jasper
|
5670d35865
|
fixed the issue with shpere portruding into blocks
|
2015-01-19 15:11:56 +01:00 |
|
Jasper
|
7cb3e3d620
|
fixed small bug with balls
|
2015-01-19 14:57:20 +01:00 |
|
Jasper
|
19f1f0bb44
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 14:01:46 +01:00 |
|
Jasper
|
c2634543dc
|
added collision masks and button creator
|
2015-01-19 14:01:05 +01:00 |
|
sfroitzheim
|
42b65fa9c0
|
Added torch for testing.
|
2015-01-19 13:59:50 +01:00 |
|
Steffen Fündgens
|
a8fee3ad84
|
Fixing shader; merge was wrong.
|
2015-01-19 13:44:38 +01:00 |
|
Steffen Fündgens
|
5dcabf0290
|
Merge branch 'linearized' of github.com:Faerbit/swp
|
2015-01-19 13:16:08 +01:00 |
|
Steffen Fündgens
|
ba14a492f1
|
Added more error checking to the converter.
|
2015-01-19 11:15:41 +01:00 |
|
Steffen Fündgens
|
70dc3f1450
|
Fixed the bug that caused the duplicate marble lately.
|
2015-01-19 11:15:06 +01:00 |
|
Faerbit
|
1cef3d4d0a
|
Removed Cascaded Shadow Mapping because it is not realistic to get it working in the remaining time.
|
2015-01-19 00:52:57 +01:00 |
|
Faerbit
|
7a830a472e
|
Linearization of depth buffer. Didn't change graphics in any way.
|
2015-01-19 00:40:28 +01:00 |
|
Steffen
|
75440f919f
|
Added the option to define initial position constraints in the Level.xml file.
|
2015-01-17 14:07:12 +01:00 |
|