 viktorljung
|
e49a150f55
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
src/game/Game/BallSystem.cpp
src/game/Game/LevelSystem.cpp
|
2015-10-22 14:40:09 +02:00 |
|
|
viktorljung
|
c6071e95c3
|
Kraken brick and ink brick done
|
2015-10-22 11:49:08 +02:00 |
|
 tleety
|
df264fb732
|
Added a ink brick texture
|
2015-10-21 15:16:34 +02:00 |
|
|
viktorljung
|
b8e1f6fcde
|
Added brick break, needs more work with the removal code and particles
|
2015-10-13 16:18:46 +02:00 |
|
|
viktorljung
|
9fe2324913
|
Lifebuoy updated, now dies after 4 hits
|
2015-10-08 21:51:43 +02:00 |
|
|
viktorljung
|
52ab09d0b1
|
Added brick models and Lifebuoy balance changes
|
2015-10-08 20:08:42 +02:00 |
|
|
viktorljung
|
18ffddb2ac
|
White bricks added
|
2015-10-08 14:03:38 +02:00 |
|
|
viktorljung
|
791c3ce69c
|
Some fixes to the brick models
|
2015-10-06 15:30:11 +02:00 |
|
|
viktorljung
|
43e0a5b699
|
Rectangle shape now has the size of the rigidbody, not scale
|
2015-10-06 13:31:23 +02:00 |
|
|
viktorljung
|
005fd40167
|
Added IceBrick and started to remove the scale dependency for physics bodies
|
2015-10-05 16:25:00 +02:00 |
|
|
viktorljung
|
442554812d
|
Collisions kind of working
|
2015-09-17 14:11:09 +01:00 |
|