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

304 Commits

Author SHA1 Message Date
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
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 44f2cf72ac Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-10-15 10:24:13 +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 724d4e7e69 If stuck to pad, do not come into contact with other things. 2015-10-14 18:53:45 +02:00
PlatinumSkink 55cc1f5b69 ScreenShakeSystem made. And some other things. 2015-10-14 18:52:04 +02:00
tleety 5da96f40f3 Fixed so 42+ combo particle is shown when you have 42+ combo 2015-10-14 18:19:45 +02:00
tleety 6c41911233 Combos now show up as a particle when it is reset 2015-10-14 18:07:15 +02:00
PlatinumSkink b94eeac2cd Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-13 18:34:46 +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
viktorljung e6cffcb217 Merge remote-tracking branch 'origin/master' into Physics 2015-10-13 18:03:15 +02:00
PlatinumSkink 8762fe3513 Fixed minor sticky bug. 2015-10-13 18:01:10 +02:00
viktorljung 8b218a0103 Next level now working 2015-10-13 17:51:37 +02:00
viktorljung a5cb1ed77a Spin fixed 2015-10-13 17:47:53 +02:00
PlatinumSkink f773458654 Merge branch 'LevelSystemAndSuch' 2015-10-13 17:45:34 +02:00
viktorljung 40054cb40f Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	src/game/Game/LevelSystem.cpp
 2015-10-13 17:32:07 +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
viktorljung f86dc9a530 Needs some spinfixing 2015-10-13 17:20:32 +02:00
viktorljung b8e1f6fcde Added brick break, needs more work with the removal code and particles 2015-10-13 16:18:46 +02:00
tleety c20b9a35b3 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-13 15:09:33 +02:00
tleety c431193764 Some debug code 2015-10-13 15:09:00 +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 1a070d8ce8 Merge branch 'master' into LevelSystemAndSuch 2015-10-13 13:37:08 +02:00
PlatinumSkink 32bbf282c9 Aimer for Sticky Works, though stuff. 2015-10-12 18:18:37 +02:00
tleety cd64531307 Merged with master and fixed some small variable things 2015-10-12 17:18:44 +02:00
tleety c2b1211be8 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-12 16:53:08 +02:00
tleety 52e2ce567a Power up sprites now show when you hit powerup bricks 2015-10-12 16:48:04 +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 8f2af7ca8f Fixed so you don't randomly lose lives upon stage cleared. I think. 2015-10-09 08:57:05 +02:00
Jace 89779fa6ee Added Kraken to level 5 2015-10-09 00:38:34 +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
viktorljung 46fca005bf Merge remote-tracking branch 'origin/LevelSystemAndSuch' into Physics 2015-10-08 23:53: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
Jace 7f344263da Merge branch 'master' into gui 
Conflicts:
	include/Game/GUI/HUD.h
	src/game/Core/Renderer.cpp
 2015-10-08 23:47:25 +02:00
tleety 848efa19ac Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias 2015-10-08 23:37:14 +02:00
tleety 1efdca9d23 Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias 
# Conflicts:
#	src/game/Game/LevelSystem.cpp
 2015-10-08 23:35:53 +02:00
viktorljung 3609ca9123 pause on win 2015-10-08 23:21:03 +02:00
viktorljung 9997f3d964 Merge remote-tracking branch 'origin/master' into Physics 2015-10-08 23:19:23 +02:00
viktorljung 95c1f57dd7 GameOver and WinScreen Added 2015-10-08 23:18:54 +02:00
tleety f6a760ad87 Finetuned level setup 2015-10-08 22:52:26 +02:00
PlatinumSkink 90636a7169 Color Arrays in Vec4 implimented. Have fun. 2015-10-08 22:32:06 +02:00
PlatinumSkink 7d15be6d6d Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-08 21:52:21 +02:00
viktorljung 9fe2324913 Lifebuoy updated, now dies after 4 hits 2015-10-08 21:51:43 +02:00
PlatinumSkink f6f74c659f Getting Sticky after Ink Blaster now works. 2015-10-08 21:51:27 +02:00
Jace c91cb1c3b7 Fixed GUI color fading in renderer 2015-10-08 21:49:45 +02:00
Stiffly 96ccef6ed8 Merge remote-tracking branch 'origin/master' into water 
Conflicts:
	src/game/Game/LevelSystem.cpp
 2015-10-08 21:44:50 +02:00
Stiffly 2545cef90f temporary particles for demo. trails for bricks, and on brick hit. 2015-10-08 21:41:01 +02:00
Stiffly 706e720ae8 Merge remote-tracking branch 'origin/master' into water 
Conflicts:
	src/game/Physics/ContactListener.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-10-08 21:39:48 +02:00