 viktorljung
|
d5e7481866
|
Fixed spelling error
|
2015-10-08 20:19:57 +02:00 |
|
|
viktorljung
|
52ab09d0b1
|
Added brick models and Lifebuoy balance changes
|
2015-10-08 20:08:42 +02:00 |
|
|
viktorljung
|
87fd73f249
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
src/game/Game/BallSystem.cpp
src/game/Game/LevelSystem.cpp
src/game/Physics/PhysicsSystem.cpp
|
2015-10-08 17:28:28 +02:00 |
|
|
viktorljung
|
b93013fcd8
|
Lifebuoy working
|
2015-10-08 17:22:19 +02:00 |
|
 PlatinumSkink
|
566b440d80
|
Lifebuoy added. Incomplete, but it appears.
|
2015-10-08 14:00:26 +02:00 |
|