Steffen Fündgens
|
5eb3aed1ce
|
Corrected spaces.
|
2015-01-23 16:41:56 +01:00 |
|
Steffen Fündgens
|
9765f03d88
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-23 16:04:13 +01:00 |
|
Steffen Fündgens
|
cb1b152452
|
Converter can now reuse IDs of deleted compositions.
|
2015-01-23 16:02:50 +01:00 |
|
Steffen Fündgens
|
8c7f557eb0
|
Added more exits after errors.
|
2015-01-23 16:02:10 +01:00 |
|
sfroitzheim
|
77d481abcc
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-01-23 14:56:19 +01:00 |
|
sfroitzheim
|
0def453bc0
|
Added some walls to the scene properly (weird physics bugs are apparent)
|
2015-01-23 14:56:02 +01:00 |
|
Steffen Fündgens
|
f240572c8e
|
Fixed a drawing bug for the pointlight shadows.
|
2015-01-23 14:33:04 +01:00 |
|
Steffen Fündgens
|
834b919786
|
Removed unnecessary bind and clear calls.
|
2015-01-23 14:22:24 +01:00 |
|
sfroitzheim
|
df8e7ac124
|
Fixed merge conflicts.
|
2015-01-23 14:10:35 +01:00 |
|
sfroitzheim
|
f730b83e1c
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-01-23 14:08:38 +01:00 |
|
Steffen Fündgens
|
e21f234f2c
|
Forgot one thing.
|
2015-01-23 14:08:30 +01:00 |
|
sfroitzheim
|
d95bf040ea
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-01-23 14:07:29 +01:00 |
|
sfroitzheim
|
637568fd26
|
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
|
62ba9d69e0
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-23 14:01:06 +01:00 |
|
Steffen Fündgens
|
8429280aee
|
Fixed mirroring of shadows by inverting coordinates instead of blitting framebuffers(performance...).
|
2015-01-23 14:00:26 +01:00 |
|
sfroitzheim
|
e2c3be7d5d
|
Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
Levels/ObjectSetups/Level1.xml
|
2015-01-23 13:56:40 +01:00 |
|
Jasper
|
59fc940e4f
|
prepare for peoples
|
2015-01-23 13:31:19 +01:00 |
|
Jasper
|
81c09eb33a
|
constraints work. Why? because i said so!
|
2015-01-23 12:59:28 +01:00 |
|
Jasper
|
13df9c14a8
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-23 12:06:26 +01:00 |
|
Jasper
|
0a5e6ba941
|
readding button -> box
|
2015-01-23 12:05:43 +01:00 |
|
Faerbit
|
4ae832f31c
|
Made progress on point light shadows. Not quite sure what is happening.
|
2015-01-22 21:21:09 +01:00 |
|
Faerbit
|
812321edec
|
Increased mininum camera distance because the marble got scaled up.
|
2015-01-20 08:45:52 +01:00 |
|
Faerbit
|
9598a86ffe
|
Added slides for milestone 3.
|
2015-01-20 00:53:55 +01:00 |
|
Jasper
|
d827948747
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 18:30:12 +01:00 |
|
Jasper
|
bbc8c03e53
|
Added physics type button.
|
2015-01-19 18:30:07 +01:00 |
|
Jasper
|
bd75820471
|
Added light block and changed physics parameters.
|
2015-01-19 18:28:28 +01:00 |
|
Steffen Fündgens
|
0203bcb326
|
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
|
094549ce85
|
Increased height of the fog, because of new Scaling of the heightmap. -- Fabian
|
2015-01-19 18:21:29 +01:00 |
|
Jasper
|
275f013c2f
|
some quick updates for the camera before working on buttons
|
2015-01-19 17:12:58 +01:00 |
|
Jasper
|
93e5c33dfd
|
prepared camera, level and physics for the new camera
|
2015-01-19 16:51:35 +01:00 |
|
sfroitzheim
|
c9694f0b5a
|
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
|
4e0fe3bee2
|
prepareing modified camera in physics
|
2015-01-19 16:30:11 +01:00 |
|
Steffen Fündgens
|
342a3691c2
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 15:55:18 +01:00 |
|
Steffen Fündgens
|
9e825ccc1e
|
Added rotation in Compompositions.xml.
|
2015-01-19 15:55:03 +01:00 |
|
Jasper
|
cb6fdf19a7
|
small changes to trimesh scaling
|
2015-01-19 15:33:44 +01:00 |
|
Jasper
|
9b52b9badc
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 15:25:08 +01:00 |
|
Jasper
|
8c8655c096
|
added trimesh back to collision
|
2015-01-19 15:24:44 +01:00 |
|
sfroitzheim
|
e7839b3363
|
Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
Levels/ObjectSetups/Level1.xml
|
2015-01-19 15:18:34 +01:00 |
|
sfroitzheim
|
e04aca7841
|
Added improved starting bridge version
|
2015-01-19 15:15:18 +01:00 |
|
Jasper
|
12ee9a4ac5
|
fixed the issue with shpere portruding into blocks
|
2015-01-19 15:11:56 +01:00 |
|
Jasper
|
d25db437bb
|
fixed small bug with balls
|
2015-01-19 14:57:20 +01:00 |
|
Jasper
|
9cb0bbfe56
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 14:01:46 +01:00 |
|
Jasper
|
ca98df63ac
|
added collision masks and button creator
|
2015-01-19 14:01:05 +01:00 |
|
sfroitzheim
|
8d46d98de0
|
Added torch for testing.
|
2015-01-19 13:59:50 +01:00 |
|
Steffen Fündgens
|
2c8c69a5dc
|
Fixing shader; merge was wrong.
|
2015-01-19 13:44:38 +01:00 |
|
Steffen Fündgens
|
1206a7b801
|
Merge branch 'linearized' of github.com:Faerbit/swp
|
2015-01-19 13:16:08 +01:00 |
|
Steffen Fündgens
|
7160330bfd
|
Added more error checking to the converter.
|
2015-01-19 11:15:41 +01:00 |
|
Steffen Fündgens
|
f83099bb2d
|
Fixed the bug that caused the duplicate marble lately.
|
2015-01-19 11:15:06 +01:00 |
|
Faerbit
|
6210d2e35b
|
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
|
955eee5a60
|
Linearization of depth buffer. Didn't change graphics in any way.
|
2015-01-19 00:40:28 +01:00 |
|