 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 |
|
 Stiffly
|
7c2782fe2c
|
Fixed scale issue for power up textures. Added a defaultscale flag. Also removed ugly particleeffect for projectiles.
|
2015-10-22 16:27:23 +02:00 |
|
|
Stiffly
|
0f687a4ba5
|
Merge remote-tracking branch 'origin/master' into water
Conflicts:
src/game/Game/ProjectileSystem.cpp
|
2015-10-22 11:18:35 +02:00 |
|
 PlatinumSkink
|
f0b36c6f12
|
Fixed Kraken battle. I think. Made it so you do not shoot projectiles or squids when struggling with Kraken.
|
2015-10-21 15:12:50 +02:00 |
|
|
PlatinumSkink
|
b4f098c80d
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-10-20 11:53:05 +02:00 |
|
|
PlatinumSkink
|
fbdd3536f3
|
Kraken shows up on last stage. Created WaterSystem for possible future use.
|
2015-10-20 11:43:39 +02:00 |
|
|
Stiffly
|
091895cc85
|
broken ass shit after projectiles
|
2015-10-20 11:14:53 +02:00 |
|
 tleety
|
dd6c5443eb
|
Fixed an upper case E into a lowercase so linux hopefully wont have a shitfit
|
2015-10-19 16:42:39 +02:00 |
|
|
tleety
|
970201520e
|
Fixed so oilshooter shoots the new particle
|
2015-10-19 16:32:14 +02:00 |
|
|
PlatinumSkink
|
7aa7e7cbf0
|
Pause and Resume events completed and game-crashing bug fixed. I think.
|
2015-10-19 14:56:44 +02:00 |
|
|
PlatinumSkink
|
f6f74c659f
|
Getting Sticky after Ink Blaster now works.
|
2015-10-08 21:51:27 +02:00 |
|
|
PlatinumSkink
|
5c2844c137
|
InkBlaster functions as intended! It just needs ink!
|
2015-10-08 20:02:51 +02:00 |
|