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

375 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
PlatinumSkink 1b4c38c292 Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-13 17:52:30 +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
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
viktorljung f86dc9a530 Needs some spinfixing 2015-10-13 17:20:32 +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
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 02d724fedd Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-12 16:47:24 +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
tleety 3fef91b8a9 Added RealeaseTheKraken sprite 2015-10-12 15:29:34 +02:00
tleety 88df747741 Added Sticky sprite 2015-10-12 15:12:53 +02:00
tleety 577dad7dad Added lifedonut sprite 2015-10-12 15:04:30 +02:00
tleety 8cc0b70776 Added Ink blaster sprite 2015-10-12 14:48:33 +02:00
tleety 2e8cfe0a92 Friends sprite 2015-10-12 14:47:36 +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
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
Jace a5c5b5eb3e Fixed ResourceManager preloading 2015-10-08 23:39:18 +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
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