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

135 Commits

Author SHA1 Message Date
Jace a35d72cac3 Working skeletal animations!!! 2015-10-15 12:48:28 +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
tleety 471fbacfd6 Changed how the score background is rendered and added some combo numbers 2015-10-14 17:16:16 +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 1b4c38c292 Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-13 17:52:30 +02:00
PlatinumSkink f773458654 Merge branch 'LevelSystemAndSuch' 2015-10-13 17:45:34 +02:00
tleety 1e4e278ef6 Added score background stuff 2015-10-13 17:45:15 +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
tleety 4857e387ad Added some new fonts 2015-10-13 17:02:20 +02:00
viktorljung b8e1f6fcde Added brick break, needs more work with the removal code and particles 2015-10-13 16:18:46 +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 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 6ab144520a Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-09 00:29:26 +02:00
Jace c17501547b Removed level indicator and centered score 2015-10-09 00:28:55 +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 c754d04b63 Kraken GUI 2015-10-09 00:16:16 +02:00
Jace 47493674a8 fixup! After merge fixes 2015-10-09 00:01:56 +02:00
Jace db1baad3c1 After merge fixes 2015-10-08 23:59:26 +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
Jace 7ee0bbc32b Added first stage story 2015-10-08 23:41:59 +02:00
Jace 18e2891621 fixup: Loading frame 2015-10-08 23:40:58 +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
PlatinumSkink 90636a7169 Color Arrays in Vec4 implimented. Have fun. 2015-10-08 22:32:06 +02:00
Jace 4978f204a7 First story frame 2015-10-08 21:52:40 +02:00
Jace 2f09cdce4c Loading frame 2015-10-08 21:52:22 +02:00
PlatinumSkink 7d15be6d6d Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-08 21:52:21 +02:00
Jace 77b54ab988 Created a Storyboard frame that can fade and pan between images 2015-10-08 21:52:09 +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 856053e3f2 Forgot this when moving game GUI to a subfolder... I guess. 2015-10-08 21:51:13 +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
viktorljung d5e7481866 Fixed spelling error 2015-10-08 20:19:57 +02:00
viktorljung a0d6f01ac2 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	src/game/Game/LevelSystem.cpp
 2015-10-08 20:17:24 +02:00
viktorljung 52ab09d0b1 Added brick models and Lifebuoy balance changes 2015-10-08 20:08:42 +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