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

351 Commits

Author SHA1 Message Date
Jace 9b8546abb2 Fixed your score frames 2015-10-20 16:13:33 +02:00
Jace 14b4fd9813 fixup! CMAKE Conditional compilation against DirectX and OpenGL targets 2015-10-20 15:39:12 +02:00
Jace d197ec07ad Merge branch 'master' into directx 
Conflicts:
	include/Core/Engine.h
 2015-10-20 15:13:20 +02:00
Jace 80f34b27b9 OpenGL renderer back in working condition 2015-10-20 14:31:12 +02:00
Jace aacc194358 Passthrough shader for DirectX GUI 2015-10-20 13:52:07 +02:00
Jace 4175b29653 DirectX GUI rendering 2015-10-20 12:07:40 +02:00
PlatinumSkink b4f098c80d Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-10-20 11:53:05 +02:00
PlatinumSkink b38fdf2183 Merge branch 'master' into LevelSystemAndSuch 2015-10-20 11:44:57 +02:00
PlatinumSkink fbdd3536f3 Kraken shows up on last stage. Created WaterSystem for possible future use. 2015-10-20 11:43:39 +02:00
Jace 4a3575190f DX sprites and stuff I guess 2015-10-19 17:48:07 +02:00
tleety dd6c5443eb Fixed an upper case E into a lowercase so linux hopefully wont have a shitfit 2015-10-19 16:42:39 +02:00
tleety 970201520e Fixed so oilshooter shoots the new particle 2015-10-19 16:32:14 +02:00
tleety c1df5d69a9 Merge remote-tracking branch 'origin' into Tobias 2015-10-19 15:57:41 +02:00
tleety 7b428f2b54 Added a cheatmode setting in config 2015-10-19 15:56:26 +02:00
Stiffly 3f2a1c8d90 Merge branch 'master' into Sound 2015-10-19 15:36:01 +02:00
Stiffly 5802c7f7c4 Merge remote-tracking branch 'origin/master' into water 2015-10-19 15:25:16 +02:00
Stiffly 0688de9dd2 LifeBuoy particle effect on hit. 2015-10-19 15:24:40 +02:00
tleety 36947611d3 Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias 
# Conflicts:
#	include/Core/Engine.h
 2015-10-19 15:14:14 +02:00
PlatinumSkink c83aee9b5d Merge branch 'LevelSystemAndSuch' 2015-10-19 15:05:50 +02:00
Stiffly cda75de366 Subarashii... Subarashiiiii ~ 2015-10-19 14:59:05 +02:00
PlatinumSkink 7aa7e7cbf0 Pause and Resume events completed and game-crashing bug fixed. I think. 2015-10-19 14:56:44 +02:00
tleety 55232a4ec2 water radius now changeable in config file, also improved the look of the water 2015-10-19 14:50:26 +02:00
Stiffly f2dab5bd1b Merge branch 'master' into Sound 2015-10-19 13:54:16 +02:00
Stiffly dc2ec46cfa Playing sound on EGameStart. Menu sounds. 2015-10-19 13:53:42 +02:00
Jace d423239320 All vertex attributes now present in DX shaders 2015-10-19 13:53:12 +02:00
Jace e195e69408 Working DirectX textures 2015-10-19 13:39:00 +02:00
Jace a782e6b40a Successful DirectX context through GLFW, praise Gaben! 2015-10-19 13:39:00 +02:00
Jace 0be663be11 Created interface class for Renderer 2015-10-19 13:38:58 +02:00
Jace 0666e8513f Split model file loading and buffer creation into separate classes 2015-10-19 13:38:46 +02:00
Jace 00f537bc03 Removed OpenGL specifics from RenderQueue 2015-10-19 13:38:12 +02:00
Jace 13360856f9 Separated OpenGL specific code into its own "compilation unit" 2015-10-19 13:37:59 +02:00
PlatinumSkink 3fb741335e Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch. 2015-10-19 13:37:10 +02:00
PlatinumSkink c5d88301ad Implemented a Kraken State Machine that can grab the player, and the Generating Bricks option. 2015-10-19 13:31:38 +02:00
Stiffly bf82e549aa Added VectorInterpolation function. Fixed time bug for particles. 2015-10-16 12:43:40 +02:00
Stiffly 0600230ed4 Merge remote-tracking branch 'origin/master' into water 2015-10-16 11:59:17 +02:00
Stiffly 0180b29544 Merge remote-tracking branch 'origin/master' into Sound 
Conflicts:
	src/game/Sound/SoundSystem.cpp
 2015-10-16 11:53:38 +02:00
Jace f335955396 Animation system now listens to pause events 2015-10-15 18:39:47 +02:00
Jace 862396e0fa Improved config loading to read default options from one file and overrides from another and merge differences properly 2015-10-15 17:55:56 +02:00
PlatinumSkink bd59cd4108 Implimented the basis for Kraken encounter. 2015-10-15 15:08:05 +02:00
Jace 4a031147a6 Added log level to config 2015-10-15 14:57:33 +02:00
Jace 0e4cbf4009 Custom libpng error handlers 2015-10-15 14:57:32 +02:00
Jace 6a6960bd7c Moved LOG_LEVEL_INFO before WARNING 2015-10-15 14:49:48 +02:00
Jace 218de4b02e Custom error functions for PNG 2015-10-15 14:47:08 +02:00
Jace 8ecb1aa8c5 Fixed LOG_LEVEL not being defined correctly and therefore unchangable 2015-10-15 14:36:56 +02:00
Jace 00cac42094 Added video options to config 2015-10-15 14:19:12 +02:00
Jace b754fff9e3 Added volume settings to config file 2015-10-15 14:10:22 +02:00
Jace 2ddb1847c5 Added ability to save to ConfigFile 2015-10-15 14:10:22 +02:00
Stiffly e719a342f2 Master volume init values depends on configfile. 2015-10-15 14:03:06 +02:00
Stiffly 00f804a5f3 Moved default value for config parameters to be a function argument to support other types too... 2015-10-15 14:00:11 +02:00
PlatinumSkink b2127c6c4e Fixed error so you can actually play LevelSystemAndSuch branch. 2015-10-15 13:48:35 +02:00