Commit Graph

21 Commits

Author SHA1 Message Date
Stiffly 206b6ee36c Merge remote-tracking branch 'origin/master' into water 2015-10-23 15:49:41 +02:00
Stiffly 90f4d771ac Updated blood effects 2015-10-23 15:49:27 +02:00
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
Jace 1270500a43 Kraken screen shake! 2015-10-23 15:05:43 +02:00
Stiffly 485cdb7b5e Blood in progress. <- period 2015-10-23 14:39:26 +02:00
PlatinumSkink e9a71a6ff7 Oh, and lives now swim around in a sinus wave. All bricks break when Kraken is defeated. 2015-10-23 12:17:19 +02:00
PlatinumSkink 3de06991e2 Kraken grows redder with more hits, and uses more dangerous brick-sets. Kraken can change reaction time depending on damage by changing Max/MinSeconds to action in KrakenSystem. 2015-10-23 12:10:09 +02:00
Stiffly e1f628be06 Merge branch 'master' into Sound
Conflicts:
	src/game/Game/BallSystem.cpp
2015-10-22 16:45:25 +02:00
viktorljung 5b5f5b6a62 New kraken boss model 2015-10-22 15:32:36 +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
Stiffly bee4a05670 Merge remote-tracking branch 'origin/master' into Sound 2015-10-21 15:52:29 +02:00
PlatinumSkink ff3813a7cf A metric ton of minifixes! 2015-10-21 15:46:32 +02:00
Stiffly 59dbe97191 Boss fight sounds. bgm, boss-hit, init roar 2015-10-21 15:42:11 +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 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
PlatinumSkink fbdd3536f3 Kraken shows up on last stage. Created WaterSystem for possible future use. 2015-10-20 11:43:39 +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 bd59cd4108 Implimented the basis for Kraken encounter. 2015-10-15 15:08:05 +02:00
PlatinumSkink 927c96d863 TravellingSystem uses EMove. EMove and ERotate copied from Returngeance into TransportSystem. 2015-10-15 13:44:16 +02:00