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

176 Commits

Author SHA1 Message Date
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
Jace 17c30ff610 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-21 15:38:46 +02:00
Jace 2df78e011a Fixed Renderer trying to play animations when there is no animation component 2015-10-21 15:35:57 +02:00
tleety 0f506bfe35 Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias 2015-10-20 15:57:40 +02:00
Jace d197ec07ad Merge branch 'master' into directx 
Conflicts:
	include/Core/Engine.h
 2015-10-20 15:13:20 +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
viktorljung f5957fc91a Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Core/Engine.h
 2015-10-20 11:01:42 +02:00
Jace 4a3575190f DX sprites and stuff I guess 2015-10-19 17:48:07 +02:00
viktorljung 9e8d176999 Animation models and stuff 2015-10-19 16:48:42 +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
tleety 55232a4ec2 water radius now changeable in config file, also improved the look of the water 2015-10-19 14:50:26 +02:00
Jace d423239320 All vertex attributes now present in DX shaders 2015-10-19 13:53:12 +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
Stiffly 0180b29544 Merge remote-tracking branch 'origin/master' into Sound 
Conflicts:
	src/game/Sound/SoundSystem.cpp
 2015-10-16 11:53:38 +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 00cac42094 Added video options to config 2015-10-15 14:19:12 +02:00
Stiffly e719a342f2 Master volume init values depends on configfile. 2015-10-15 14:03:06 +02:00
Stiffly 64f903a6b6 WIP 2015-10-15 13:48:05 +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
PlatinumSkink 4abce7b17f CTravels replaces Sticky = true. Put "Travels" component on anything that should be moved down during travel sequences. 2015-10-15 11:11:06 +02:00
PlatinumSkink 0650e7c061 Basis of RaiseWater implemented in a way that doesn't work with our amount of lag. 2015-10-15 10:20:05 +02:00
PlatinumSkink 8e32574692 Removed unnecessary Cout to avoid annoying others. 2015-10-13 18:37: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
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
PlatinumSkink 5630771272 Fixed Sticky after Ink bug, fixed directions on Squid after sticky, laser direction is in background. Brick Components implemented, though they do nothing. 2015-10-12 16:45:59 +02:00
Jace db1baad3c1 After merge fixes 2015-10-08 23:59:26 +02:00
Stiffly 96ccef6ed8 Merge remote-tracking branch 'origin/master' into water 
Conflicts:
	src/game/Game/LevelSystem.cpp
 2015-10-08 21:44:50 +02:00
Stiffly 706e720ae8 Merge remote-tracking branch 'origin/master' into water 
Conflicts:
	src/game/Physics/ContactListener.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-10-08 21:39:48 +02:00
PlatinumSkink 3793515968 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-10-08 20:08:10 +02:00
PlatinumSkink 5c2844c137 InkBlaster functions as intended! It just needs ink! 2015-10-08 20:02:51 +02:00
Stiffly 143bff2d9e Added two new particle sprites. 2015-10-08 18:19:15 +02:00
viktorljung 87fd73f249 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	src/game/Game/BallSystem.cpp
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-10-08 17:28:28 +02:00
viktorljung b93013fcd8 Lifebuoy working 2015-10-08 17:22:19 +02:00
PlatinumSkink 3ac6fdce5f Fixes smaller problems 2015-10-08 16:53:51 +02:00
PlatinumSkink 210c6a003b Merge branch 'master' into LevelSystemAndSuch. Fixed so scrolling to next level works again. 2015-10-08 16:11:47 +02:00
viktorljung f147778d4d Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	src/game/Physics/PhysicsSystem.cpp
 2015-10-08 14:29:29 +02:00
viktorljung c57181fb83 working on Lifebuoy 2015-10-08 14:25:20 +02:00
PlatinumSkink 566b440d80 Lifebuoy added. Incomplete, but it appears. 2015-10-08 14:00:26 +02:00
Stiffly 3f0f45f509 Merge remote-tracking branch 'origin/master' into water 
Conflicts:
	include/Core/Engine.h
	src/game/Physics/PhysicsSystem.cpp
 2015-10-08 11:16:31 +02:00
Stiffly 66feadfd04 Fixed physics wrong error message 2015-10-08 11:04:35 +02:00
PlatinumSkink 07e59bd0e2 Scroll to next stage works! 2015-10-07 19:19:55 +02:00
Stiffly ef5882ffbf Vattnet fungerar nu igen. 2015-10-07 19:18:49 +02:00