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

552 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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 3f8a6d2f68 Fixed resource preloading when format is invalid 2015-10-22 15:19:32 +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
viktorljung e49a150f55 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	src/game/Game/BallSystem.cpp
	src/game/Game/LevelSystem.cpp
 2015-10-22 14:40:09 +02:00
viktorljung 2051c8186c Background fixes 2015-10-22 14:13:38 +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
viktorljung f59f123340 Small fixes 2015-10-22 11:55:02 +02:00
tleety 6b5c153c5d Stopped kraken arm from looping, now it dissapears instead 2015-10-22 11:53:36 +02:00
viktorljung 9b9f959602 Merge remote-tracking branch 'origin/master' into Physics 2015-10-22 11:49:34 +02:00
viktorljung c6071e95c3 Kraken brick and ink brick done 2015-10-22 11:49:08 +02:00
Stiffly 0f687a4ba5 Merge remote-tracking branch 'origin/master' into water 
Conflicts:
	src/game/Game/ProjectileSystem.cpp
 2015-10-22 11:18:35 +02:00
Stiffly 01ff8763b8 WIP added msnu bgm again 2015-10-22 11:12:35 +02:00
tleety d6e0b8a36f Merge remote-tracking branch 'origin' into Tobias 2015-10-22 11:12:23 +02:00
tleety de8209bdda Kraken arm now splashes around when it arrives 2015-10-22 11:12:11 +02:00
Stiffly 16560a86b3 Kraken power down sound. Added Zap sound to story 2015-10-22 10:54:53 +02:00
PlatinumSkink 59c23026d2 Put all LifeStuff into a new LifeSystem. Appears to be working. 2015-10-22 10:34:22 +02:00
PlatinumSkink 1a6f18da94 Random direction upon ResetBall, turn in direction. 2015-10-21 16:53:04 +02:00
Stiffly bee4a05670 Merge remote-tracking branch 'origin/master' into Sound 2015-10-21 15:52:29 +02:00