BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
560 Commits 15 Branches 0 Tags
2681ca868082de1d42c604f316df98768de312ec
Commit Graph

111 Commits

Author SHA1 Message Date
PlatinumSkink c06c198cda Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-10-23 15:13:50 +02:00
PlatinumSkink fa5cb379ab Skill-Kraken implemented. What do people think...? 2015-10-23 15:12:28 +02:00
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
Jace f31f0bb771 Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/game/Game/PadSystem.cpp
 2015-10-22 17:06:01 +02:00
viktorljung 67ef462a53 Animations 2015-10-22 17:04:19 +02:00
Jace d1946d46e2 Kraken arm animations! 2015-10-22 17:01:21 +02:00
PlatinumSkink fd569f7a52 Fixed PadSystem 2015-10-22 16:57:10 +02:00
viktorljung 5b5f5b6a62 New kraken boss model 2015-10-22 15:32:36 +02:00
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
PlatinumSkink eedcc76e92 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-10-22 14:07:32 +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
viktorljung f59f123340 Small fixes 2015-10-22 11:55:02 +02:00
tleety 6b5c153c5d Stopped kraken arm from looping, now it dissapears instead 2015-10-22 11:53:36 +02:00
viktorljung 9b9f959602 Merge remote-tracking branch 'origin/master' into Physics 2015-10-22 11:49:34 +02:00
tleety d6e0b8a36f Merge remote-tracking branch 'origin' into Tobias 2015-10-22 11:12:23 +02:00
tleety de8209bdda Kraken arm now splashes around when it arrives 2015-10-22 11:12:11 +02:00
PlatinumSkink ff3813a7cf A metric ton of minifixes! 2015-10-21 15:46:32 +02:00
viktorljung f41e126bd6 Merge remote-tracking branch 'origin/master' into Physics 2015-10-21 15:40:43 +02:00
viktorljung f4ffead4f2 Animations and stuff 2015-10-21 15:40:19 +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
tleety 11b792c85a Merge remote-tracking branch 'origin' into Tobias 2015-10-21 14:39:38 +02:00
tleety 726244b043 Combo particle is now more visable and better 2015-10-21 14:39:04 +02:00
tleety 0f506bfe35 Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias 2015-10-20 15:57:40 +02:00
PlatinumSkink e26156c093 Kraken Battle Implemented. Feel free to comment. 
To get to battle faster, change CurrentCluster to 0.
 2015-10-20 15:57:06 +02:00
tleety 9ffa8e9609 Kraken arm shows up when you take the powerup 2015-10-20 15:57:02 +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
tleety ce61de1d5c Merge remote-tracking branch 'origin/Physics' into Tobias 2015-10-20 11:03:45 +02:00
tleety f688981b06 Started work on kraken arm powerup visual changes. 2015-10-20 11:03:40 +02:00
viktorljung f5957fc91a Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Core/Engine.h
 2015-10-20 11:01:42 +02:00
viktorljung 9e8d176999 Animation models and stuff 2015-10-19 16:48:42 +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 c5d88301ad Implemented a Kraken State Machine that can grab the player, and the Generating Bricks option. 2015-10-19 13:31:38 +02:00
PlatinumSkink 927c96d863 TravellingSystem uses EMove. EMove and ERotate copied from Returngeance into TransportSystem. 2015-10-15 13:44:16 +02:00
PlatinumSkink 4abce7b17f CTravels replaces Sticky = true. Put "Travels" component on anything that should be moved down during travel sequences. 2015-10-15 11:11:06 +02:00
PlatinumSkink 0650e7c061 Basis of RaiseWater implemented in a way that doesn't work with our amount of lag. 2015-10-15 10:20:05 +02:00
PlatinumSkink ffea58d41f ScreenShake works as intended at the press of E and upon calling the event. 2015-10-13 18:34:21 +02:00
PlatinumSkink 8762fe3513 Fixed minor sticky bug. 2015-10-13 18:01:10 +02:00
PlatinumSkink 36d0601dfd Added TravellingSystem for travelling to the next stage. Added incomplete ScreenShake. Ball now starts on pad. 2015-10-13 17:28:31 +02:00
PlatinumSkink 40343744c1 Adjustments to Sticky and Inkblaster made, in addition made StickyAimer partly transparent green. 2015-10-13 14:02:18 +02:00
PlatinumSkink 32bbf282c9 Aimer for Sticky Works, though stuff. 2015-10-12 18:18:37 +02:00
PlatinumSkink 5630771272 Fixed Sticky after Ink bug, fixed directions on Squid after sticky, laser direction is in background. Brick Components implemented, though they do nothing. 2015-10-12 16:45:59 +02:00
viktorljung d4c79e338c Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	src/game/Game/LevelSystem.cpp
 2015-10-09 00:22:32 +02:00
PlatinumSkink c222383b6f KRAKEN ATTACK! At a press of K! KrakenAttackBricks exist, too, just add number to level. 2015-10-08 23:52:48 +02:00
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 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 3ac6fdce5f Fixes smaller problems 2015-10-08 16:53:51 +02:00
PlatinumSkink 6669d91a90 Sticky works except graphics. Temporarily colored odd bricks. 2015-10-08 15:42:13 +02:00