sfroitzheim
|
0d185fd924
|
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 |
|
sfroitzheim
|
16db3fcc72
|
Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
Levels/ObjectSetups/Level1.xml
|
2015-01-23 13:56:40 +01:00 |
|
Jasper
|
6536459359
|
prepare for peoples
|
2015-01-23 13:31:19 +01:00 |
|
Jasper
|
adf355cc46
|
constraints work. Why? because i said so!
|
2015-01-23 12:59:28 +01:00 |
|
Jasper
|
4b63dc0664
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-23 12:06:26 +01:00 |
|
Jasper
|
14462ac8df
|
readding button -> box
|
2015-01-23 12:05:43 +01:00 |
|
Faerbit
|
a5b69a23ca
|
Made progress on point light shadows. Not quite sure what is happening.
|
2015-01-22 21:21:09 +01:00 |
|
Faerbit
|
6248e2e8ec
|
Increased mininum camera distance because the marble got scaled up.
|
2015-01-20 08:45:52 +01:00 |
|
Faerbit
|
466ac8305b
|
Added slides for milestone 3.
|
2015-01-20 00:53:55 +01:00 |
|
Jasper
|
bea8436a8d
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 18:30:12 +01:00 |
|
Jasper
|
bc4b08426b
|
Added physics type button.
|
2015-01-19 18:30:07 +01:00 |
|
Jasper
|
2f980e678c
|
Added light block and changed physics parameters.
|
2015-01-19 18:28:28 +01:00 |
|
Steffen Fündgens
|
92a144d8bb
|
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
|
6bc1a24577
|
Increased height of the fog, because of new Scaling of the heightmap. -- Fabian
|
2015-01-19 18:21:29 +01:00 |
|
Jasper
|
6056663dde
|
some quick updates for the camera before working on buttons
|
2015-01-19 17:12:58 +01:00 |
|
Jasper
|
1a736dd095
|
prepared camera, level and physics for the new camera
|
2015-01-19 16:51:35 +01:00 |
|
sfroitzheim
|
1e6942ae37
|
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
|
393e29c083
|
prepareing modified camera in physics
|
2015-01-19 16:30:11 +01:00 |
|
Steffen Fündgens
|
a4b734ac5b
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 15:55:18 +01:00 |
|
Steffen Fündgens
|
3f33d6cf86
|
Added rotation in Compompositions.xml.
|
2015-01-19 15:55:03 +01:00 |
|
Jasper
|
25c6c6b6e1
|
small changes to trimesh scaling
|
2015-01-19 15:33:44 +01:00 |
|
Jasper
|
b8616609a5
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 15:25:08 +01:00 |
|
Jasper
|
1fdf8fabaf
|
added trimesh back to collision
|
2015-01-19 15:24:44 +01:00 |
|
sfroitzheim
|
8c5d485101
|
Merge branch 'master' of https://github.com/Faerbit/swp
Conflicts:
Levels/ObjectSetups/Level1.xml
|
2015-01-19 15:18:34 +01:00 |
|
sfroitzheim
|
1de9e862d0
|
Added improved starting bridge version
|
2015-01-19 15:15:18 +01:00 |
|
Jasper
|
0d101a3e4b
|
fixed the issue with shpere portruding into blocks
|
2015-01-19 15:11:56 +01:00 |
|
Jasper
|
7d9e65fe13
|
fixed small bug with balls
|
2015-01-19 14:57:20 +01:00 |
|
Jasper
|
ac3136964f
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-19 14:01:46 +01:00 |
|
Jasper
|
94d766e11f
|
added collision masks and button creator
|
2015-01-19 14:01:05 +01:00 |
|
sfroitzheim
|
57fbc655ab
|
Added torch for testing.
|
2015-01-19 13:59:50 +01:00 |
|
Steffen Fündgens
|
defbcc056b
|
Fixing shader; merge was wrong.
|
2015-01-19 13:44:38 +01:00 |
|
Steffen Fündgens
|
7d372b632f
|
Merge branch 'linearized' of github.com:Faerbit/swp
|
2015-01-19 13:16:08 +01:00 |
|
Steffen Fündgens
|
4fa28b2088
|
Added more error checking to the converter.
|
2015-01-19 11:15:41 +01:00 |
|
Steffen Fündgens
|
60f24c762f
|
Fixed the bug that caused the duplicate marble lately.
|
2015-01-19 11:15:06 +01:00 |
|
Faerbit
|
f6a88683b7
|
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
|
ee87a259a3
|
Linearization of depth buffer. Didn't change graphics in any way.
|
2015-01-19 00:40:28 +01:00 |
|
Steffen
|
36ea806c4f
|
Added the option to define initial position constraints in the Level.xml file.
|
2015-01-17 14:07:12 +01:00 |
|
Steffen
|
0184a1684a
|
Updated scripts and added scripts for opening the door in Level1
|
2015-01-17 13:37:09 +01:00 |
|
Steffen
|
698d917d4c
|
Created a moveObject function in the Level class.
|
2015-01-17 13:30:33 +01:00 |
|
Steffen
|
b3f11542d2
|
Removed the lua state from the physics.
|
2015-01-17 13:11:43 +01:00 |
|
Steffen
|
abf382a70e
|
Added new composition
|
2015-01-17 12:38:27 +01:00 |
|
Steffen
|
acd847921d
|
Added ignoreHeightmap option to compositions in Compositions.xml.
|
2015-01-17 12:24:54 +01:00 |
|
Steffen
|
cc2ed4fcf9
|
Added to TARGET_LINK_LIBRARIES, now compiles on my home pc.
|
2015-01-17 12:12:27 +01:00 |
|
Steffen Fündgens
|
7935b6aa0c
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-16 16:52:11 +01:00 |
|
Steffen Fündgens
|
476c40cb00
|
started working on an actual trigger for Level1
|
2015-01-16 16:52:04 +01:00 |
|
Steffen Fündgens
|
956da26624
|
moved the triggered/not triggered information to lua
|
2015-01-16 16:51:36 +01:00 |
|
sfroitzheim
|
44d7d4f107
|
Fixed a few bugs like duplicate marble(bridge will be fixed at monday)
|
2015-01-16 16:47:55 +01:00 |
|
sfroitzheim
|
b5937ce772
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-01-16 16:38:24 +01:00 |
|
sfroitzheim
|
036a9cb365
|
Additional changes with the heightmap
|
2015-01-16 16:37:00 +01:00 |
|
Jasper
|
454e7bb972
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-16 16:19:53 +01:00 |
|