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

430 Commits

Author SHA1 Message Date
PlatinumSkink 5ba13c3b48 Merge remote-tracking branch 'origin/master' 2015-10-23 16:58:54 +02:00
PlatinumSkink 1beb873efc Fixed so ink does not damage boss, because that breaks current boss battle. 2015-10-23 16:46:45 +02:00
tleety 825a4f5f95 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-23 16:16:26 +02:00
tleety ee413463a3 Kraken arm slider 2015-10-23 16:15:46 +02:00
Stiffly 4f75736747 Merge remote-tracking branch 'origin/master' into water 2015-10-23 15:55:32 +02:00
PlatinumSkink 857eaf4b7f Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-23 15:52:43 +02:00
Stiffly 206b6ee36c Merge remote-tracking branch 'origin/master' into water 2015-10-23 15:49:41 +02:00
Stiffly 90f4d771ac Updated blood effects 2015-10-23 15:49:27 +02:00
Jace 92c9d52de5 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-23 15:47:52 +02:00
Jace 3c6c38b2ce Less slippery controls 2015-10-23 15:47:35 +02:00
PlatinumSkink a630554bb3 Merge branch 'LevelSystemAndSuch' 2015-10-23 15:47:08 +02:00
PlatinumSkink 2681ca8680 Lifebuoy created on brick transform after a small delay. 2015-10-23 15:46:26 +02:00
viktorljung c966db2419 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-23 15:36:33 +02:00
viktorljung 48b9e8fbed Animation fixes 2015-10-23 15:36:23 +02:00
PlatinumSkink b8e27e0cea Corrected Stage. 2015-10-23 15:18:34 +02:00
PlatinumSkink c06c198cda Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-10-23 15:13:50 +02:00
PlatinumSkink fa5cb379ab Skill-Kraken implemented. What do people think...? 2015-10-23 15:12:28 +02:00
Jace 0afb5f2670 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-23 15:05:59 +02:00
Jace 1270500a43 Kraken screen shake! 2015-10-23 15:05:43 +02:00
viktorljung c1ba6481df Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Game/BallSystem.h
	include/Game/ProjectileSystem.h
	src/game/Game/BallSystem.cpp
	src/game/Game/ProjectileSystem.cpp
	src/game/Rendering/AnimationSystem.cpp
 2015-10-23 14:47:04 +02:00
Stiffly 485cdb7b5e Blood in progress. <- period 2015-10-23 14:39:26 +02:00
viktorljung 6206859568 Animations in the game 2015-10-23 14:35:11 +02:00
Jace 9158dd8ef7 Screen shake working 2015-10-23 14:26:08 +02:00
Stiffly 2cf2975437 WIP 2015-10-23 13:39:59 +02:00
PlatinumSkink 3de06991e2 Kraken grows redder with more hits, and uses more dangerous brick-sets. Kraken can change reaction time depending on damage by changing Max/MinSeconds to action in KrakenSystem. 2015-10-23 12:10:09 +02:00
Stiffly 1ed52102d1 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-22 17:06:30 +02:00
Jace f31f0bb771 Merge remote-tracking branch 'origin/master' 
Conflicts:
	src/game/Game/PadSystem.cpp
 2015-10-22 17:06:01 +02:00
viktorljung 67ef462a53 Animations 2015-10-22 17:04:19 +02:00
Stiffly 512f4db1c2 Merge remote-tracking branch 'origin/master' into Sound 2015-10-22 17:02:26 +02:00
Jace d1946d46e2 Kraken arm animations! 2015-10-22 17:01:21 +02:00
Stiffly fb3022e394 current level fix 2015-10-22 17:01:00 +02:00
PlatinumSkink 1d8de95315 Merge branch 'LevelSystemAndSuch' 2015-10-22 16:58:16 +02:00
PlatinumSkink fd569f7a52 Fixed PadSystem 2015-10-22 16:57:10 +02:00
Stiffly e1f628be06 Merge branch 'master' into Sound 
Conflicts:
	src/game/Game/BallSystem.cpp
 2015-10-22 16:45:25 +02:00
Stiffly 33e5ab9a22 Merge remote-tracking branch 'origin/LevelSystemAndSuch' into water 2015-10-22 16:27:42 +02:00
Stiffly 7c2782fe2c Fixed scale issue for power up textures. Added a defaultscale flag. Also removed ugly particleeffect for projectiles. 2015-10-22 16:27:23 +02:00
PlatinumSkink f54af2a240 Merge branch 'LevelSystemAndSuch' 2015-10-22 15:51:45 +02:00
PlatinumSkink fd0618350a Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-10-22 15:51:05 +02:00
viktorljung d75e481e0f life fix 2015-10-22 15:44:09 +02:00
PlatinumSkink 49c80c1c5a Fixed so generated bricks fo not collide with anything. 2015-10-22 15:42:28 +02:00
viktorljung 0900172bf2 Merge branch 'Physics' 2015-10-22 15:36:53 +02:00
Jace 3fb85cd049 Moved registering ShaderProgram resources to Renderer 2015-10-22 15:35:32 +02:00
viktorljung 80ba2a0c32 Merge remote-tracking branch 'origin/master' into Physics 2015-10-22 15:32:59 +02:00
viktorljung 5b5f5b6a62 New kraken boss model 2015-10-22 15:32:36 +02:00
Jace 61801f23d1 fixup! Loading screen that preloads the entire game based on what's in the "PreloadResources" file. The file is filled automatically with resources that are hot-loaded to make the next launch load more complete. 2015-10-22 15:23:29 +02:00
Jace bdb5a76e24 Merge remote-tracking branch 'origin/master' 2015-10-22 14:52:27 +02:00
Jace d0ee438c4c Loading screen that preloads the entire game based on what's in the "PreloadResources" file. The file is filled automatically with resources that are hot-loaded to make the next launch load more complete. 2015-10-22 14:51:34 +02:00
PlatinumSkink eedcc76e92 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-10-22 14:07:32 +02:00
PlatinumSkink fde2ddeafb Failed to stage it all. 2015-10-22 14:05:23 +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