 PlatinumSkink
|
3793515968
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-10-08 20:08:10 +02:00 |
|
|
PlatinumSkink
|
5c2844c137
|
InkBlaster functions as intended! It just needs ink!
|
2015-10-08 20:02:51 +02:00 |
|
 viktorljung
|
b93013fcd8
|
Lifebuoy working
|
2015-10-08 17:22:19 +02:00 |
|
|
viktorljung
|
33ecbaaab3
|
density added in physics Component
|
2015-10-08 11:37:13 +02:00 |
|
|
viktorljung
|
b036357e3b
|
Merge branch 'Physics'
Conflicts:
include/Core/Engine.h
include/Physics/CPhysics.h
include/Physics/PhysicsSystem.h
src/game/Game/BallSystem.cpp
src/game/Physics/PhysicsSystem.cpp
|
2015-10-06 20:16:57 +02:00 |
|
 Jace
|
7173fdf396
|
MSVC12 compiler compability fixes
|
2015-10-06 15:27:11 +02:00 |
|
|
viktorljung
|
dca06a46a5
|
Changed bool CPhysics->Static to enum CPhysics->CollisionType, Which added support for kinematic bodies
|
2015-10-02 14:36:41 +02:00 |
|
|
viktorljung
|
cfb6d1e4b5
|
Falling bricks and collision filters
|
2015-09-25 04:28:46 +02:00 |
|
|
viktorljung
|
d2301594ce
|
Gravity scale per entity
|
2015-09-25 00:01:24 +02:00 |
|
|
PlatinumSkink
|
c829315598
|
Ball hitting bricks destroys bricks! We can PLAY! (kind of)
|
2015-09-11 10:50:49 +02:00 |
|
|
viktorljung
|
9bf0ca0e46
|
ContactListener and contact events
|
2015-09-10 21:25:34 +01:00 |
|