BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Commit Graph

  • 22349fe0a6 Fixed problems I ran into while playtesting. master finished PlatinumSkink 2015-10-23 17:42:46 +02:00
  • e4aae9779e Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut PlatinumSkink 2015-10-23 16:59:24 +02:00
  • 5ba13c3b48 Merge remote-tracking branch 'origin/master' PlatinumSkink 2015-10-23 16:58:54 +02:00
  • 1beb873efc Fixed so ink does not damage boss, because that breaks current boss battle. PlatinumSkink 2015-10-23 16:46:45 +02:00
  • 04ed2de2c3 saviours viktorljung 2015-10-23 16:45:47 +02:00
  • 965cebf708 WIP water Stiffly 2015-10-23 16:44:37 +02:00
  • 825a4f5f95 Merge branch 'master' of github.com:teamfisk/AgileBreakOut tleety 2015-10-23 16:16:26 +02:00
  • ee413463a3 Kraken arm slider tleety 2015-10-23 16:15:46 +02:00
  • e2190630c5 Merge branch 'Physics' viktorljung 2015-10-23 16:12:14 +02:00
  • d91ad72a34 Jump fix Physics viktorljung 2015-10-23 16:11:45 +02:00
  • a4c120764a Ball rotation fix viktorljung 2015-10-23 16:01:22 +02:00
  • 4f75736747 Merge remote-tracking branch 'origin/master' into water Stiffly 2015-10-23 15:55:32 +02:00
  • 857eaf4b7f Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut PlatinumSkink 2015-10-23 15:52:43 +02:00
  • 206b6ee36c Merge remote-tracking branch 'origin/master' into water Stiffly 2015-10-23 15:49:41 +02:00
  • 90f4d771ac Updated blood effects Stiffly 2015-10-23 15:43:42 +02:00
  • 92c9d52de5 Merge branch 'master' of github.com:teamfisk/AgileBreakOut Jace 2015-10-23 15:47:52 +02:00
  • 3c6c38b2ce Less slippery controls Jace 2015-10-23 15:47:35 +02:00
  • a630554bb3 Merge branch 'LevelSystemAndSuch' PlatinumSkink 2015-10-23 15:47:08 +02:00
  • 2681ca8680 Lifebuoy created on brick transform after a small delay. LevelSystemAndSuch PlatinumSkink 2015-10-23 15:46:26 +02:00
  • 037adf3299 Bigger more beautiful eyes! (づ｡◕‿‿◕｡)づ viktorljung 2015-10-23 15:45:03 +02:00
  • c966db2419 Merge branch 'master' of github.com:teamfisk/AgileBreakOut viktorljung 2015-10-23 15:36:33 +02:00
  • 48b9e8fbed Animation fixes viktorljung 2015-10-23 15:36:23 +02:00
  • b8e27e0cea Corrected Stage. PlatinumSkink 2015-10-23 15:18:34 +02:00
  • c06c198cda Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch PlatinumSkink 2015-10-23 15:13:50 +02:00
  • fa5cb379ab Skill-Kraken implemented. What do people think...? PlatinumSkink 2015-10-23 15:12:28 +02:00
  • 0afb5f2670 Merge branch 'master' of github.com:teamfisk/AgileBreakOut Jace 2015-10-23 15:05:59 +02:00
  • 1270500a43 Kraken screen shake! Jace 2015-10-23 15:05:43 +02:00
  • ce0b95cd47 Added a background to prevent white borders during screen shake Jace 2015-10-23 14:44:07 +02:00
  • a3354b856d removed error message viktorljung 2015-10-23 14:49:45 +02:00
  • c1ba6481df Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-10-23 14:47:04 +02:00
  • 485cdb7b5e Blood in progress. <- period Stiffly 2015-10-23 14:39:26 +02:00
  • 6206859568 Animations in the game viktorljung 2015-10-23 14:35:11 +02:00
  • 9158dd8ef7 Screen shake working Jace 2015-10-23 14:26:08 +02:00
  • 525868e228 Merge remote-tracking branch 'origin/master' into water Stiffly 2015-10-23 13:40:18 +02:00
  • 2cf2975437 WIP Stiffly 2015-10-23 13:39:59 +02:00
  • aa0aff9002 Added missing config options Jace 2015-10-23 13:39:33 +02:00
  • d8a4c398f2 Who doesn't understand line endings? Jace 2015-10-23 13:37:41 +02:00
  • e9a71a6ff7 Oh, and lives now swim around in a sinus wave. All bricks break when Kraken is defeated. PlatinumSkink 2015-10-23 12:17:19 +02:00
  • 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. PlatinumSkink 2015-10-23 12:10:09 +02:00
  • 1ed52102d1 Merge branch 'master' of github.com:teamfisk/AgileBreakOut Stiffly 2015-10-22 17:06:30 +02:00
  • f31f0bb771 Merge remote-tracking branch 'origin/master' Jace 2015-10-22 17:06:01 +02:00
  • 67ef462a53 Animations viktorljung 2015-10-22 17:04:19 +02:00
  • 512f4db1c2 Merge remote-tracking branch 'origin/master' into Sound Sound Stiffly 2015-10-22 17:02:26 +02:00
  • d1946d46e2 Kraken arm animations! Jace 2015-10-22 17:01:21 +02:00
  • 3e10d75d75 Animations now pause correctly when not looping Jace 2015-10-22 17:01:14 +02:00
  • fb3022e394 current level fix Stiffly 2015-10-22 17:01:00 +02:00
  • 1d8de95315 Merge branch 'LevelSystemAndSuch' PlatinumSkink 2015-10-22 16:58:16 +02:00
  • fd569f7a52 Fixed PadSystem PlatinumSkink 2015-10-22 16:57:10 +02:00
  • e1f628be06 Merge branch 'master' into Sound Stiffly 2015-10-22 16:45:25 +02:00
  • 33e5ab9a22 Merge remote-tracking branch 'origin/LevelSystemAndSuch' into water Stiffly 2015-10-22 16:27:42 +02:00
  • 7c2782fe2c Fixed scale issue for power up textures. Added a defaultscale flag. Also removed ugly particleeffect for projectiles. Stiffly 2015-10-22 16:27:23 +02:00
  • f54af2a240 Merge branch 'LevelSystemAndSuch' PlatinumSkink 2015-10-22 15:51:45 +02:00
  • fd0618350a Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch PlatinumSkink 2015-10-22 15:51:05 +02:00
  • d75e481e0f life fix viktorljung 2015-10-22 15:44:09 +02:00
  • 49c80c1c5a Fixed so generated bricks fo not collide with anything. PlatinumSkink 2015-10-22 15:42:28 +02:00
  • c7bef473d9 Merge remote-tracking branch 'origin/master' Jace 2015-10-22 15:40:21 +02:00
  • 86f823b52f fixup! Moved registering ShaderProgram resources to Renderer Jace 2015-10-22 15:39:55 +02:00
  • 0900172bf2 Merge branch 'Physics' viktorljung 2015-10-22 15:36:53 +02:00
  • 3fb85cd049 Moved registering ShaderProgram resources to Renderer Jace 2015-10-22 15:35:32 +02:00
  • 80ba2a0c32 Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-10-22 15:32:59 +02:00
  • 5b5f5b6a62 New kraken boss model viktorljung 2015-10-22 15:32:36 +02:00
  • 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. Jace 2015-10-22 15:23:29 +02:00
  • 3f8a6d2f68 Fixed resource preloading when format is invalid Jace 2015-10-22 15:19:32 +02:00
  • bdb5a76e24 Merge remote-tracking branch 'origin/master' Jace 2015-10-22 14:52:27 +02:00
  • 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. Jace 2015-10-22 14:51:34 +02:00
  • e49a150f55 Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-10-22 14:40:09 +02:00
  • 2051c8186c Background fixes viktorljung 2015-10-22 14:13:38 +02:00
  • eedcc76e92 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch PlatinumSkink 2015-10-22 14:07:32 +02:00
  • fde2ddeafb Failed to stage it all. PlatinumSkink 2015-10-22 14:05:23 +02:00
  • 54f8fcd185 RaiseWater implemented. Set Debug RaiseWater to true to activate it. And fixed second stage crashing. PlatinumSkink 2015-10-22 14:04:36 +02:00
  • f59f123340 Small fixes viktorljung 2015-10-22 11:55:02 +02:00
  • 6b5c153c5d Stopped kraken arm from looping, now it dissapears instead Tobias tleety 2015-10-22 11:53:36 +02:00
  • 9b9f959602 Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-10-22 11:49:34 +02:00
  • c6071e95c3 Kraken brick and ink brick done viktorljung 2015-10-22 11:49:08 +02:00
  • 0f687a4ba5 Merge remote-tracking branch 'origin/master' into water Stiffly 2015-10-22 11:18:35 +02:00
  • 01ff8763b8 WIP added msnu bgm again Stiffly 2015-10-22 11:12:35 +02:00
  • d6e0b8a36f Merge remote-tracking branch 'origin' into Tobias tleety 2015-10-22 11:12:23 +02:00
  • de8209bdda Kraken arm now splashes around when it arrives tleety 2015-10-22 11:12:11 +02:00
  • 16560a86b3 Kraken power down sound. Added Zap sound to story Stiffly 2015-10-22 10:54:53 +02:00
  • 59c23026d2 Put all LifeStuff into a new LifeSystem. Appears to be working. PlatinumSkink 2015-10-22 10:34:22 +02:00
  • 1a6f18da94 Random direction upon ResetBall, turn in direction. PlatinumSkink 2015-10-21 16:53:04 +02:00
  • bee4a05670 Merge remote-tracking branch 'origin/master' into Sound Stiffly 2015-10-21 15:52:29 +02:00
  • 784b2e1d58 life lost sound Stiffly 2015-10-21 15:52:10 +02:00
  • 83f4da59d4 Merge branch 'LevelSystemAndSuch' PlatinumSkink 2015-10-21 15:47:54 +02:00
  • ff3813a7cf A metric ton of minifixes! PlatinumSkink 2015-10-21 15:46:32 +02:00
  • 59dbe97191 Boss fight sounds. bgm, boss-hit, init roar Stiffly 2015-10-21 15:42:11 +02:00
  • f41e126bd6 Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-10-21 15:40:43 +02:00
  • f4ffead4f2 Animations and stuff viktorljung 2015-10-21 15:40:19 +02:00
  • 17c30ff610 Merge branch 'master' of github.com:teamfisk/AgileBreakOut Jace 2015-10-21 15:38:46 +02:00
  • 52f7e3f64b Control over animation looping and event on animation completion Jace 2015-10-21 15:38:34 +02:00
  • e7c1dc20ba HACK: For some reason Blender likes to create a first frame that doesn't start at time 0 Jace 2015-10-21 15:37:49 +02:00
  • 2df78e011a Fixed Renderer trying to play animations when there is no animation component Jace 2015-10-21 15:35:57 +02:00
  • df264fb732 Added a ink brick texture tleety 2015-10-21 15:16:34 +02:00
  • f0b36c6f12 Fixed Kraken battle. I think. Made it so you do not shoot projectiles or squids when struggling with Kraken. PlatinumSkink 2015-10-21 15:12:50 +02:00
  • e9942dad4a Merge branch 'Tobias' tleety 2015-10-21 14:48:33 +02:00
  • cbaf300b03 Smallfix tleety 2015-10-21 14:47:36 +02:00
  • 11b792c85a Merge remote-tracking branch 'origin' into Tobias tleety 2015-10-21 14:39:38 +02:00
  • 726244b043 Combo particle is now more visable and better tleety 2015-10-21 14:39:04 +02:00
  • d0668effea Merge remote-tracking branch 'origin/master' into Sound Stiffly 2015-10-21 13:18:42 +02:00
  • 2954e2cbb3 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch PlatinumSkink 2015-10-20 16:14:55 +02:00