 viktorljung
|
c1ba6481df
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
include/Game/BallSystem.h
include/Game/ProjectileSystem.h
src/game/Game/BallSystem.cpp
src/game/Game/ProjectileSystem.cpp
src/game/Rendering/AnimationSystem.cpp
|
2015-10-23 14:47:04 +02:00 |
|
|
viktorljung
|
67ef462a53
|
Animations
|
2015-10-22 17:04:19 +02:00 |
|
 PlatinumSkink
|
49c80c1c5a
|
Fixed so generated bricks fo not collide with anything.
|
2015-10-22 15:42:28 +02:00 |
|
|
PlatinumSkink
|
54f8fcd185
|
RaiseWater implemented. Set Debug RaiseWater to true to activate it. And fixed second stage crashing.
|
2015-10-22 14:04:36 +02:00 |
|
|
PlatinumSkink
|
5c2844c137
|
InkBlaster functions as intended! It just needs ink!
|
2015-10-08 20:02:51 +02:00 |
|
|
PlatinumSkink
|
6669d91a90
|
Sticky works except graphics. Temporarily colored odd bricks.
|
2015-10-08 15:42:13 +02:00 |
|
|
PlatinumSkink
|
3814c25931
|
Squid does not move until space is pressed. Experimenting with scroll. This shouldn't really be committed, but Visual Studio.
|
2015-10-07 17:09:55 +02:00 |
|
|
PlatinumSkink
|
4d3428f125
|
HitLag has types in strings to send along to affect what systems lag.
|
2015-10-01 14:14:07 +02:00 |
|
|
PlatinumSkink
|
c3b54ef030
|
Implemented Combos which multiply score. Adjusted pad a bit.
|
2015-09-29 14:42:01 +02:00 |
|
|
viktorljung
|
03e2078cfb
|
Pad modifies ball path and ball facing its direction
|
2015-09-23 15:12:18 +02:00 |
|
|
PlatinumSkink
|
5ee5400a28
|
StyleGuide Fix
|
2015-09-15 18:48:26 +02:00 |
|
|
PlatinumSkink
|
88bd96861d
|
Tried to implement lives. Failed. Everything crashes if I try to RemoveEntity in Update.
|
2015-09-15 12:40:23 +02:00 |
|
|
PlatinumSkink
|
bda864ac11
|
Breakout Standard Screen
Meaning bricks, ball, pad, walls bounces, things.
May or may not work as intended.
|
2015-09-11 15:07:00 +02:00 |
|
|
PlatinumSkink
|
1d94338214
|
Added CBall
|
2015-09-10 21:46:03 +02:00 |
|