BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
520 Commits 15 Branches 0 Tags
620685956871d2dd5922d8c4e2814201119b9695
Commit Graph

213 Commits

Author SHA1 Message Date
viktorljung 6206859568 Animations in the game 2015-10-23 14:35:11 +02:00
viktorljung 67ef462a53 Animations 2015-10-22 17:04:19 +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
viktorljung 2051c8186c Background fixes 2015-10-22 14:13:38 +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
viktorljung c6071e95c3 Kraken brick and ink brick done 2015-10-22 11:49:08 +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 59c23026d2 Put all LifeStuff into a new LifeSystem. Appears to be working. 2015-10-22 10:34:22 +02:00
PlatinumSkink 1a6f18da94 Random direction upon ResetBall, turn in direction. 2015-10-21 16:53:04 +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
tleety df264fb732 Added a ink brick texture 2015-10-21 15:16:34 +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 e9942dad4a Merge branch 'Tobias' 2015-10-21 14:48:33 +02:00
tleety cbaf300b03 Smallfix 2015-10-21 14:47:36 +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
Stiffly d0668effea Merge remote-tracking branch 'origin/master' into Sound 2015-10-21 13:18:42 +02:00
PlatinumSkink 2954e2cbb3 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-10-20 16:14:55 +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
Jace d197ec07ad Merge branch 'master' into directx 
Conflicts:
	include/Core/Engine.h
 2015-10-20 15:13:20 +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
Jace 4a3575190f DX sprites and stuff I guess 2015-10-19 17:48:07 +02:00
viktorljung 9e8d176999 Animation models and stuff 2015-10-19 16:48:42 +02:00
Stiffly 71521b5b02 Added squid-bounce wav 2015-10-19 16:41:57 +02:00
tleety bbbcc528d3 Levelsystem quickfix 2015-10-19 16:35:12 +02:00
tleety 970201520e Fixed so oilshooter shoots the new particle 2015-10-19 16:32:14 +02:00
tleety c1df5d69a9 Merge remote-tracking branch 'origin' into Tobias 2015-10-19 15:57:41 +02:00
tleety 7b428f2b54 Added a cheatmode setting in config 2015-10-19 15:56:26 +02:00
Stiffly 5802c7f7c4 Merge remote-tracking branch 'origin/master' into water 2015-10-19 15:25:16 +02:00
Stiffly 0688de9dd2 LifeBuoy particle effect on hit. 2015-10-19 15:24:40 +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 3fb741335e Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch. 2015-10-19 13:37:10 +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
Stiffly 2c6ac49e15 Added particle event for each brick debris. poof! 2015-10-16 13:05:33 +02:00
Stiffly bf82e549aa Added VectorInterpolation function. Fixed time bug for particles. 2015-10-16 12:43:40 +02:00
Stiffly 0600230ed4 Merge remote-tracking branch 'origin/master' into water 2015-10-16 11:59:17 +02:00