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

346 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Jace cc9f868d5d Frame is now sized to parent by default 2015-10-08 21:50:04 +02:00
Jace c91cb1c3b7 Fixed GUI color fading in renderer 2015-10-08 21:49:45 +02:00
Jace 08972919ae Fixed texture rendering order when fading 2015-10-08 21:49:32 +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
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
Stiffly 143bff2d9e Added two new particle sprites. 2015-10-08 18:19:15 +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
viktorljung b93013fcd8 Lifebuoy working 2015-10-08 17:22:19 +02:00
PlatinumSkink c76033113d Small edit to temporarily solve a problem. 2015-10-08 17:15:48 +02:00
PlatinumSkink 3ac6fdce5f Fixes smaller problems 2015-10-08 16:53:51 +02:00
Jace 54fb8bf70a Error texture was WONKY 2015-10-08 16:43:51 +02:00
PlatinumSkink 74d7e1feb7 Slight calibration so Travelling doesn't necessarily kill the process just because something is Sticky. 2015-10-08 16:13:30 +02:00
PlatinumSkink 210c6a003b Merge branch 'master' into LevelSystemAndSuch. Fixed so scrolling to next level works again. 2015-10-08 16:11:47 +02:00
PlatinumSkink 040b0f9461 Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch 2015-10-08 15:47:27 +02:00
PlatinumSkink 6669d91a90 Sticky works except graphics. Temporarily colored odd bricks. 2015-10-08 15:42:13 +02:00
viktorljung f147778d4d Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	src/game/Physics/PhysicsSystem.cpp
 2015-10-08 14:29:29 +02:00
viktorljung c57181fb83 working on Lifebuoy 2015-10-08 14:25:20 +02:00
viktorljung 544a45d21d Merge remote-tracking branch 'origin/LevelSystemAndSuch' into Physics 2015-10-08 14:04:03 +02:00