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

50 Commits

Author SHA1 Message Date
Jace f31f0bb771 Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/game/Game/PadSystem.cpp
 2015-10-22 17:06:01 +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
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
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
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 0f506bfe35 Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias 2015-10-20 15:57:40 +02:00
tleety 9ffa8e9609 Kraken arm shows up when you take the powerup 2015-10-20 15:57:02 +02:00
PlatinumSkink fbdd3536f3 Kraken shows up on last stage. Created WaterSystem for possible future use. 2015-10-20 11:43:39 +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 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 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 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
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 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 b2399243e3 Merge branch 'master' into LevelSystemAndSuch 2015-10-05 13:26:51 +02:00
Jace b86dc09c82 Merge branch 'master' into gui 2015-10-02 18:18:44 +02:00
Jace c821fbfc25 Futile attempts to fix memory corruption bug 2015-10-01 16:12:53 +02:00
PlatinumSkink c63ec035a7 HitLagSystem implemented. 2015-09-30 16:42:35 +02:00
PlatinumSkink c31ff4cfcb P-button pauses, H-button does 0.3 second HitLag. 2015-09-30 15:19:45 +02:00
PlatinumSkink 2fb16357fa Moved pad-creation to PadSystem. Pad now stops at sides. 2015-09-30 10:32:17 +02:00
PlatinumSkink c3b54ef030 Implemented Combos which multiply score. Adjusted pad a bit. 2015-09-29 14:42:01 +02:00
PlatinumSkink fc41727a5d Transferred Ball-stuff into BallSystem. 2015-09-28 17:24:58 +02:00
tleety c624c5bcf3 Merge master 2015-09-25 00:03:28 +02:00
PlatinumSkink 4e4ba29666 Remove Components upon removing entities, a lot of strange experimenting to remove frozen squid bug. 2015-09-24 18:14:39 +02:00
PlatinumSkink 62b17e3dbf Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge. 2015-09-23 20:46:57 +02:00
PlatinumSkink f6b6f05c37 CPowerUpBrick + CPowerUp exists. Can drop from brick and be grabbed for MultiBall. 2015-09-22 17:55:12 +02:00
PlatinumSkink 761631c4a6 m-button is MultiBall powerup. Still needs fine-tuning. 2015-09-17 18:09:22 +02:00
tleety b69413d9c9 Base water set up 2015-09-17 17:35:17 +02:00
PlatinumSkink 30ee6c2430 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-16 16:29:57 +02:00
tleety 20fc1232d6 Merge remote-tracking branch 'origin/master' into GLrenderer 2015-09-16 14:42:38 +02:00
PlatinumSkink 5ee5400a28 StyleGuide Fix 2015-09-15 18:48:26 +02:00
PlatinumSkink c2d29b6110 Added ScoreEvent, added score to bricks. Stage resets after all bricks are destroyed. 2015-09-15 17:31:22 +02:00
tleety f19f7bf56a Added a few models and removed ortho camera perspectiv. 2015-09-15 17:05:47 +02:00
PlatinumSkink b340cf97bb I forgot to stage in my last commit. 2015-09-15 15:00:47 +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 8d1ad184a6 Modified the pad-and-ball collision code a bit. Hopefully for the better. 2015-09-14 15:39:39 +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 c829315598 Ball hitting bricks destroys bricks! We can PLAY! (kind of) 2015-09-11 10:50:49 +02:00
PlatinumSkink 4890b74f37 Random Commit to get Viktor's stuff 2015-09-10 22:32:09 +02:00
PlatinumSkink 6a81751e56 WIP Level System + Pad 2015-09-10 20:28:48 +02:00
PlatinumSkink 84577cb2c8 Created CPad and PadSystem. Doesn't do very much. 2015-09-10 16:40:49 +02:00