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

573 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 037adf3299 Bigger more beautiful eyes! (づ｡◕‿‿◕｡)づ 2015-10-23 15:45:03 +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
Jace ce0b95cd47 Added a background to prevent white borders during screen shake 2015-10-23 14:51:14 +02:00
viktorljung a3354b856d removed error message 2015-10-23 14:49:45 +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 525868e228 Merge remote-tracking branch 'origin/master' into water 2015-10-23 13:40:18 +02:00
Stiffly 2cf2975437 WIP 2015-10-23 13:39:59 +02:00
Jace aa0aff9002 Added missing config options 2015-10-23 13:39:33 +02:00
Jace d8a4c398f2 Who doesn't understand line endings? 2015-10-23 13:37:41 +02:00
PlatinumSkink e9a71a6ff7 Oh, and lives now swim around in a sinus wave. All bricks break when Kraken is defeated. 2015-10-23 12:17:19 +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
Jace 3e10d75d75 Animations now pause correctly when not looping 2015-10-22 17:01:14 +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
Jace c7bef473d9 Merge remote-tracking branch 'origin/master' 2015-10-22 15:40:21 +02:00
Jace 86f823b52f fixup! Moved registering ShaderProgram resources to Renderer 2015-10-22 15:39:55 +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