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

314 Commits

Author SHA1 Message Date
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
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
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
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
Jace cf5b465e0b Fixed ambiguous definition 2015-10-15 12:56:57 +02:00
Jace a35d72cac3 Working skeletal animations!!! 2015-10-15 12:48:28 +02:00
tleety 46f6289720 Fixed so the game does not crash if it cant find data in the config file 2015-10-15 12:35:58 +02:00
tleety 52fe2e697e Added a config file and implemented code for it 2015-10-15 12:15:53 +02:00
Stiffly 46f3a9f72e Refactored CParticle->Radius to CParticle->Scale. Reviewed by Tobias Dahl aka Tleety. 2015-10-14 18:29:43 +02:00
tleety 5da96f40f3 Fixed so 42+ combo particle is shown when you have 42+ combo 2015-10-14 18:19:45 +02:00
tleety 6c41911233 Combos now show up as a particle when it is reset 2015-10-14 18:07:15 +02:00
tleety 471fbacfd6 Changed how the score background is rendered and added some combo numbers 2015-10-14 17:16:16 +02:00
Stiffly e9ca58de64 Merge branch 'master' into water 
Conflicts:
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-10-14 15:43:34 +02:00
PlatinumSkink 8e32574692 Removed unnecessary Cout to avoid annoying others. 2015-10-13 18:37:46 +02:00
PlatinumSkink b94eeac2cd Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-13 18:34:46 +02:00
PlatinumSkink ffea58d41f ScreenShake works as intended at the press of E and upon calling the event. 2015-10-13 18:34:21 +02:00
viktorljung e6cffcb217 Merge remote-tracking branch 'origin/master' into Physics 2015-10-13 18:03:15 +02:00
PlatinumSkink 1b4c38c292 Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-13 17:52:30 +02:00
PlatinumSkink f773458654 Merge branch 'LevelSystemAndSuch' 2015-10-13 17:45:34 +02:00
tleety 1e4e278ef6 Added score background stuff 2015-10-13 17:45:15 +02:00
Stiffly 5955a888d2 Merge remote-tracking branch 'origin/master' into water 
Conflicts:
	src/game/Physics/PhysicsSystem.cpp
 2015-10-13 17:44:05 +02:00
viktorljung 40054cb40f Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	src/game/Game/LevelSystem.cpp
 2015-10-13 17:32:07 +02:00
PlatinumSkink 36d0601dfd Added TravellingSystem for travelling to the next stage. Added incomplete ScreenShake. Ball now starts on pad. 2015-10-13 17:28:31 +02:00
Stiffly 1065d3abc3 Merge remote-tracking branch 'origin/master' into water 
Conflicts:
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-10-13 17:02:31 +02:00
tleety 4857e387ad Added some new fonts 2015-10-13 17:02:20 +02:00
viktorljung b8e1f6fcde Added brick break, needs more work with the removal code and particles 2015-10-13 16:18:46 +02:00
Stiffly 94cac38cc6 "Lightening" particle bugg fixed. Scale and alpha interpolation implemented through ScalarInterpolation-funtion 2015-10-13 15:22:11 +02:00
tleety c20b9a35b3 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-13 15:09:33 +02:00
tleety c431193764 Some debug code 2015-10-13 15:09:00 +02:00
PlatinumSkink 40343744c1 Adjustments to Sticky and Inkblaster made, in addition made StickyAimer partly transparent green. 2015-10-13 14:02:18 +02:00
PlatinumSkink 1a070d8ce8 Merge branch 'master' into LevelSystemAndSuch 2015-10-13 13:37:08 +02:00
PlatinumSkink 32bbf282c9 Aimer for Sticky Works, though stuff. 2015-10-12 18:18:37 +02:00
tleety cd64531307 Merged with master and fixed some small variable things 2015-10-12 17:18:44 +02:00
tleety c2b1211be8 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-12 16:53:08 +02:00