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

Commit Graph

  • 9b8546abb2 Fixed your score frames Jace 2015-10-20 16:13:33 +02:00
  • c23c7e4d8e Story sound. Tom could be improved. Stiffly 2015-10-20 16:12:55 +02:00
  • c1e4e6c0bd KrakenHit event includes max health, current, and new. PlatinumSkink 2015-10-20 15:58:02 +02:00
  • 0f506bfe35 Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias tleety 2015-10-20 15:57:40 +02:00
  • e26156c093 Kraken Battle Implemented. Feel free to comment. PlatinumSkink 2015-10-20 15:57:06 +02:00
  • 9ffa8e9609 Kraken arm shows up when you take the powerup tleety 2015-10-20 15:57:02 +02:00
  • 0fabac14a8 fixup! CMAKE Conditional compilation against DirectX and OpenGL targets Jace 2015-10-20 15:48:13 +02:00
  • 14b4fd9813 fixup! CMAKE Conditional compilation against DirectX and OpenGL targets Jace 2015-10-20 15:39:12 +02:00
  • d197ec07ad Merge branch 'master' into directx directx Jace 2015-10-20 15:13:20 +02:00
  • a4b9521c34 CMAKE Conditional compilation against DirectX and OpenGL targets Jace 2015-10-20 14:51:40 +02:00
  • 80f34b27b9 OpenGL renderer back in working condition Jace 2015-10-20 14:31:12 +02:00
  • ec509358b1 Powerup sound, not done Stiffly 2015-10-20 14:20:46 +02:00
  • aacc194358 Passthrough shader for DirectX GUI Jace 2015-10-20 13:52:07 +02:00
  • 4175b29653 DirectX GUI rendering Jace 2015-10-20 12:07:40 +02:00
  • 3557b45440 PNG loader now converts RGB to RGBA, because we'd rather treat them the same way when rendering, especially in DirectX Jace 2015-10-20 12:07:30 +02:00
  • b4f098c80d Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch PlatinumSkink 2015-10-20 11:53:05 +02:00
  • b38fdf2183 Merge branch 'master' into LevelSystemAndSuch PlatinumSkink 2015-10-20 11:44:57 +02:00
  • fbdd3536f3 Kraken shows up on last stage. Created WaterSystem for possible future use. PlatinumSkink 2015-10-20 11:43:39 +02:00
  • 091895cc85 broken ass shit after projectiles Stiffly 2015-10-20 11:14:53 +02:00
  • ce61de1d5c Merge remote-tracking branch 'origin/Physics' into Tobias tleety 2015-10-20 11:03:45 +02:00
  • f688981b06 Started work on kraken arm powerup visual changes. tleety 2015-10-20 11:03:40 +02:00
  • a85a703991 animations! viktorljung 2015-10-20 11:02:03 +02:00
  • f5957fc91a Merge remote-tracking branch 'origin/master' into Physics viktorljung 2015-10-20 11:01:42 +02:00
  • b4486c6bf3 Added cheat and water changes to the defaul commit tleety 2015-10-20 10:36:11 +02:00
  • 4a3575190f DX sprites and stuff I guess Jace 2015-10-19 17:47:58 +02:00
  • 9e8d176999 Animation models and stuff viktorljung 2015-10-19 16:48:42 +02:00
  • dd6c5443eb Fixed an upper case E into a lowercase so linux hopefully wont have a shitfit tleety 2015-10-19 16:42:39 +02:00
  • 71521b5b02 Added squid-bounce wav Stiffly 2015-10-19 16:41:57 +02:00
  • bbbcc528d3 Levelsystem quickfix tleety 2015-10-19 16:35:12 +02:00
  • 970201520e Fixed so oilshooter shoots the new particle tleety 2015-10-19 16:32:14 +02:00
  • 13a5af837b Added a oilshot sprite tleety 2015-10-19 16:15:36 +02:00
  • c1df5d69a9 Merge remote-tracking branch 'origin' into Tobias tleety 2015-10-19 15:57:41 +02:00
  • 7b428f2b54 Added a cheatmode setting in config tleety 2015-10-19 15:56:26 +02:00
  • 3f2a1c8d90 Merge branch 'master' into Sound Stiffly 2015-10-19 15:36:01 +02:00
  • 5802c7f7c4 Merge remote-tracking branch 'origin/master' into water Stiffly 2015-10-19 15:25:16 +02:00
  • 0688de9dd2 LifeBuoy particle effect on hit. Stiffly 2015-10-19 15:24:40 +02:00
  • 36947611d3 Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias tleety 2015-10-19 15:14:14 +02:00
  • 5f8756ce8b Improved EStopSound Stiffly 2015-10-19 15:11:53 +02:00
  • c83aee9b5d Merge branch 'LevelSystemAndSuch' PlatinumSkink 2015-10-19 15:05:50 +02:00
  • cda75de366 Subarashii... Subarashiiiii ~ Stiffly 2015-10-19 14:59:05 +02:00
  • 7aa7e7cbf0 Pause and Resume events completed and game-crashing bug fixed. I think. PlatinumSkink 2015-10-19 14:56:44 +02:00
  • 55232a4ec2 water radius now changeable in config file, also improved the look of the water tleety 2015-10-19 14:50:26 +02:00
  • 1abee730ec Moved shaders to separate OpenGL and DirectX folders Jace 2015-10-19 14:08:12 +02:00
  • f2dab5bd1b Merge branch 'master' into Sound Stiffly 2015-10-19 13:54:16 +02:00
  • dc2ec46cfa Playing sound on EGameStart. Menu sounds. Stiffly 2015-10-19 13:53:42 +02:00
  • d423239320 All vertex attributes now present in DX shaders Jace 2015-10-19 13:53:12 +02:00
  • e195e69408 Working DirectX textures Jace 2015-10-13 17:33:12 +02:00
  • a782e6b40a Successful DirectX context through GLFW, praise Gaben! Jace 2015-10-12 14:31:48 +02:00
  • 16ecdb76d3 Added DirectXTK library Jace 2015-10-08 10:25:26 +02:00
  • 0be663be11 Created interface class for Renderer Jace 2015-10-06 20:56:49 +02:00
  • 0666e8513f Split model file loading and buffer creation into separate classes Jace 2015-10-06 20:48:46 +02:00
  • 00f537bc03 Removed OpenGL specifics from RenderQueue Jace 2015-10-06 19:34:31 +02:00
  • 13360856f9 Separated OpenGL specific code into its own "compilation unit" Jace 2015-10-06 19:11:19 +02:00
  • 3fb741335e Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch. PlatinumSkink 2015-10-19 13:37:10 +02:00
  • c5d88301ad Implemented a Kraken State Machine that can grab the player, and the Generating Bricks option. PlatinumSkink 2015-10-19 13:31:38 +02:00
  • 116cfb5759 Merge branch 'water' Stiffly 2015-10-16 13:11:02 +02:00
  • 2c6ac49e15 Added particle event for each brick debris. poof! Stiffly 2015-10-16 13:05:33 +02:00
  • bf82e549aa Added VectorInterpolation function. Fixed time bug for particles. Stiffly 2015-10-16 12:43:40 +02:00
  • 05f54b5ff9 Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias tleety 2015-10-16 12:36:08 +02:00
  • 84c3a78275 Kraken texture and model added tleety 2015-10-16 12:32:55 +02:00
  • 0600230ed4 Merge remote-tracking branch 'origin/master' into water Stiffly 2015-10-16 11:54:35 +02:00
  • 0180b29544 Merge remote-tracking branch 'origin/master' into Sound Stiffly 2015-10-16 11:53:38 +02:00
  • f335955396 Animation system now listens to pause events Jace 2015-10-15 18:39:47 +02:00
  • a9eb3197de Updated deploy scripts to include DefaultConfig.ini Jace 2015-10-15 17:56:30 +02:00
  • 862396e0fa Improved config loading to read default options from one file and overrides from another and merge differences properly Jace 2015-10-15 17:55:56 +02:00
  • f732687347 Fixed huge memory leak reading textures Jace 2015-10-15 17:54:42 +02:00
  • bd59cd4108 Implimented the basis for Kraken encounter. PlatinumSkink 2015-10-15 15:08:05 +02:00
  • 4a031147a6 Added log level to config Jace 2015-10-15 14:57:07 +02:00
  • 4182ba52b8 Changed default log level to INFO Jace 2015-10-15 14:52:59 +02:00
  • 0e4cbf4009 Custom libpng error handlers Jace 2015-10-15 14:50:23 +02:00
  • 6a6960bd7c Moved LOG_LEVEL_INFO before WARNING Jace 2015-10-15 14:49:48 +02:00
  • 218de4b02e Custom error functions for PNG Jace 2015-10-15 14:47:08 +02:00
  • 8ecb1aa8c5 Fixed LOG_LEVEL not being defined correctly and therefore unchangable Jace 2015-10-15 14:33:32 +02:00
  • 00cac42094 Added video options to config Jace 2015-10-15 14:19:12 +02:00
  • b754fff9e3 Added volume settings to config file Jace 2015-10-15 14:08:16 +02:00
  • 2ddb1847c5 Added ability to save to ConfigFile Jace 2015-10-15 14:07:42 +02:00
  • e719a342f2 Master volume init values depends on configfile. Stiffly 2015-10-15 14:03:06 +02:00
  • 00f804a5f3 Moved default value for config parameters to be a function argument to support other types too... Stiffly 2015-10-15 14:00:11 +02:00
  • b2127c6c4e Fixed error so you can actually play LevelSystemAndSuch branch. PlatinumSkink 2015-10-15 13:48:35 +02:00
  • 64f903a6b6 WIP Stiffly 2015-10-15 13:48:05 +02:00
  • 927c96d863 TravellingSystem uses EMove. EMove and ERotate copied from Returngeance into TransportSystem. PlatinumSkink 2015-10-15 13:44:16 +02:00
  • cf5b465e0b Fixed ambiguous definition Jace 2015-10-15 12:56:57 +02:00
  • a35d72cac3 Working skeletal animations!!! Jace 2015-10-15 12:46:23 +02:00
  • 1e3536e060 Taking the root node transform into account when loading model formats containing scene graph information. Needs more work. Jace 2015-10-15 12:45:58 +02:00
  • af8fc118b7 World initialization refactored to register system components and resources BEFORE initializing them all Jace 2015-10-15 12:45:03 +02:00
  • 46f6289720 Fixed so the game does not crash if it cant find data in the config file tleety 2015-10-15 12:35:58 +02:00
  • bb23d5a8c4 Added hover and click sounds. Cleanup in SoundSystem. Stiffly 2015-10-15 11:43:10 +02:00
  • 52fe2e697e Added a config file and implemented code for it tleety 2015-10-15 12:15:53 +02:00
  • 4abce7b17f CTravels replaces Sticky = true. Put "Travels" component on anything that should be moved down during travel sequences. PlatinumSkink 2015-10-15 11:11:06 +02:00
  • 44f2cf72ac Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch PlatinumSkink 2015-10-15 10:24:13 +02:00
  • 0650e7c061 Basis of RaiseWater implemented in a way that doesn't work with our amount of lag. PlatinumSkink 2015-10-15 10:20:05 +02:00
  • 816ff6a8e1 Merge remote-tracking branch 'origin/master' into Sound Stiffly 2015-10-15 10:16:38 +02:00
  • 724d4e7e69 If stuck to pad, do not come into contact with other things. PlatinumSkink 2015-10-14 18:53:45 +02:00
  • 55cc1f5b69 ScreenShakeSystem made. And some other things. PlatinumSkink 2015-10-14 18:52:04 +02:00
  • 46f3a9f72e Refactored CParticle->Radius to CParticle->Scale. Reviewed by Tobias Dahl aka Tleety. Stiffly 2015-10-14 18:29:43 +02:00
  • 5da96f40f3 Fixed so 42+ combo particle is shown when you have 42+ combo tleety 2015-10-14 18:19:45 +02:00
  • 6c41911233 Combos now show up as a particle when it is reset tleety 2015-10-14 18:07:15 +02:00
  • cbb6e7a04f Trail to individual brick debris. Stiffly 2015-10-14 17:40:24 +02:00
  • 471fbacfd6 Changed how the score background is rendered and added some combo numbers tleety 2015-10-14 17:16:16 +02:00
  • ccda769116 Added a texture for the score background tleety 2015-10-14 15:46:13 +02:00