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 |
|
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 |
|
Steffen
|
d26722595e
|
Added the option to define initial position constraints in the Level.xml file.
|
2015-01-17 14:07:12 +01:00 |
|
Steffen
|
10017bb855
|
Updated scripts and added scripts for opening the door in Level1
|
2015-01-17 13:37:09 +01:00 |
|
Steffen
|
04df8bd22f
|
Created a moveObject function in the Level class.
|
2015-01-17 13:30:33 +01:00 |
|
Steffen
|
f496532126
|
Removed the lua state from the physics.
|
2015-01-17 13:11:43 +01:00 |
|
Steffen
|
b897dc5457
|
Added new composition
|
2015-01-17 12:38:27 +01:00 |
|
Steffen
|
147ae17789
|
Added ignoreHeightmap option to compositions in Compositions.xml.
|
2015-01-17 12:24:54 +01:00 |
|
Steffen
|
02a9cd7559
|
Added to TARGET_LINK_LIBRARIES, now compiles on my home pc.
|
2015-01-17 12:12:27 +01:00 |
|
Steffen Fündgens
|
cba7d170da
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-16 16:52:11 +01:00 |
|
Steffen Fündgens
|
66f892bc15
|
started working on an actual trigger for Level1
|
2015-01-16 16:52:04 +01:00 |
|
Steffen Fündgens
|
ed6e257b69
|
moved the triggered/not triggered information to lua
|
2015-01-16 16:51:36 +01:00 |
|
sfroitzheim
|
ec29499416
|
Fixed a few bugs like duplicate marble(bridge will be fixed at monday)
|
2015-01-16 16:47:55 +01:00 |
|
sfroitzheim
|
f39fd522ce
|
Merge branch 'master' of https://github.com/Faerbit/swp
|
2015-01-16 16:38:24 +01:00 |
|
sfroitzheim
|
a83e6155b3
|
Additional changes with the heightmap
|
2015-01-16 16:37:00 +01:00 |
|
Jasper
|
c7cc43a399
|
Merge branch 'master' of github.com:Faerbit/swp
|
2015-01-16 16:19:53 +01:00 |
|
Jasper
|
a0c73056c6
|
Added position Constraint structure, an add/remove function for them, and added their handeling to the update function
|
2015-01-16 16:17:26 +01:00 |
|
Jasper
|
ed16b4aab7
|
Fixed block so that it doesnt BLOW EVERYTHING UP!
|
2015-01-16 15:40:07 +01:00 |
|
Steffen Fündgens
|
2c0d4424a2
|
changed heightmap scaling
|
2015-01-16 14:02:36 +01:00 |
|
Faerbit
|
5df5d5b974
|
Removing the rest of the binary files from lua.
|
2015-01-15 17:39:20 +01:00 |
|
Faerbit
|
e80a22ebb6
|
Adding libreadline for lua to ubuntu docker image.
|
2015-01-15 17:34:41 +01:00 |
|