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

99 Commits

Author SHA1 Message Date
tleety 970201520e Fixed so oilshooter shoots the new particle 2015-10-19 16:32:14 +02:00
tleety 13a5af837b Added a oilshot sprite 2015-10-19 16:15:36 +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
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
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
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
tleety 05f54b5ff9 Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias 2015-10-16 12:36:08 +02:00
tleety 84c3a78275 Kraken texture and model added 2015-10-16 12:32:55 +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 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 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 a35d72cac3 Working skeletal animations!!! 2015-10-15 12:48:28 +02:00
Stiffly bb23d5a8c4 Added hover and click sounds. Cleanup in SoundSystem. 2015-10-15 12:33:49 +02:00
tleety 52fe2e697e Added a config file and implemented code for it 2015-10-15 12:15:53 +02:00
tleety 471fbacfd6 Changed how the score background is rendered and added some combo numbers 2015-10-14 17:16:16 +02:00
tleety ccda769116 Added a texture for the score background 2015-10-14 15:46:13 +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
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
tleety 52e2ce567a Power up sprites now show when you hit powerup bricks 2015-10-12 16:48:04 +02:00
tleety 3fef91b8a9 Added RealeaseTheKraken sprite 2015-10-12 15:29:34 +02:00
tleety 88df747741 Added Sticky sprite 2015-10-12 15:12:53 +02:00
tleety 577dad7dad Added lifedonut sprite 2015-10-12 15:04:30 +02:00
tleety 8cc0b70776 Added Ink blaster sprite 2015-10-12 14:48:33 +02:00
tleety 2e8cfe0a92 Friends sprite 2015-10-12 14:47:36 +02:00
Jace 7f344263da Merge branch 'master' into gui 
Conflicts:
	include/Game/GUI/HUD.h
	src/game/Core/Renderer.cpp
 2015-10-08 23:47:25 +02:00
Jace 7ee0bbc32b Added first stage story 2015-10-08 23:41:59 +02:00
viktorljung 9997f3d964 Merge remote-tracking branch 'origin/master' into Physics 2015-10-08 23:19:23 +02:00
viktorljung 95c1f57dd7 GameOver and WinScreen Added 2015-10-08 23:18:54 +02:00
viktorljung 9fe2324913 Lifebuoy updated, now dies after 4 hits 2015-10-08 21:51:43 +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 2545cef90f temporary particles for demo. trails for bricks, and on brick hit. 2015-10-08 21:41:01 +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
viktorljung 52ab09d0b1 Added brick models and Lifebuoy balance changes 2015-10-08 20:08:42 +02:00
Stiffly 143bff2d9e Added two new particle sprites. 2015-10-08 18:19:15 +02:00
viktorljung b93013fcd8 Lifebuoy working 2015-10-08 17:22:19 +02:00
Jace 54fb8bf70a Error texture was WONKY 2015-10-08 16:43:51 +02:00
viktorljung 18ffddb2ac White bricks added 2015-10-08 14:03:38 +02:00
viktorljung f085e6a387 Water can now collide with the bricks, added new ship model 2015-10-08 11:27:17 +02:00
viktorljung 791c3ce69c Some fixes to the brick models 2015-10-06 15:30:11 +02:00
viktorljung 43e0a5b699 Rectangle shape now has the size of the rigidbody, not scale 2015-10-06 13:31:23 +02:00
viktorljung 005fd40167 Added IceBrick and started to remove the scale dependency for physics bodies 2015-10-05 16:25:00 +02:00