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

139 Commits

Author SHA1 Message Date
tleety 825a4f5f95 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-23 16:16:26 +02:00
tleety ee413463a3 Kraken arm slider 2015-10-23 16:15:46 +02:00
viktorljung e2190630c5 Merge branch 'Physics' 2015-10-23 16:12:14 +02:00
viktorljung d91ad72a34 Jump fix 2015-10-23 16:11:45 +02:00
Stiffly 206b6ee36c Merge remote-tracking branch 'origin/master' into water 2015-10-23 15:49:41 +02:00
Stiffly 90f4d771ac Updated blood effects 2015-10-23 15:49:27 +02:00
viktorljung 037adf3299 Bigger more beautiful eyes! (づ｡◕‿‿◕｡)づ 2015-10-23 15:45:03 +02:00
viktorljung 48b9e8fbed Animation fixes 2015-10-23 15:36:23 +02:00
viktorljung c1ba6481df Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Game/BallSystem.h
	include/Game/ProjectileSystem.h
	src/game/Game/BallSystem.cpp
	src/game/Game/ProjectileSystem.cpp
	src/game/Rendering/AnimationSystem.cpp
 2015-10-23 14:47:04 +02:00
viktorljung 6206859568 Animations in the game 2015-10-23 14:35:11 +02:00
Jace aa0aff9002 Added missing config options 2015-10-23 13:39:33 +02:00
Jace d8a4c398f2 Who doesn't understand line endings? 2015-10-23 13:37:41 +02:00
viktorljung 67ef462a53 Animations 2015-10-22 17:04:19 +02:00
Stiffly e1f628be06 Merge branch 'master' into Sound 
Conflicts:
	src/game/Game/BallSystem.cpp
 2015-10-22 16:45:25 +02:00
Stiffly 33e5ab9a22 Merge remote-tracking branch 'origin/LevelSystemAndSuch' into water 2015-10-22 16:27:42 +02:00
viktorljung 5b5f5b6a62 New kraken boss model 2015-10-22 15:32:36 +02:00
viktorljung e49a150f55 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	src/game/Game/BallSystem.cpp
	src/game/Game/LevelSystem.cpp
 2015-10-22 14:40:09 +02:00
viktorljung 2051c8186c Background fixes 2015-10-22 14:13:38 +02:00
viktorljung c6071e95c3 Kraken brick and ink brick done 2015-10-22 11:49:08 +02:00
Stiffly 0f687a4ba5 Merge remote-tracking branch 'origin/master' into water 
Conflicts:
	src/game/Game/ProjectileSystem.cpp
 2015-10-22 11:18:35 +02:00
Stiffly 16560a86b3 Kraken power down sound. Added Zap sound to story 2015-10-22 10:54:53 +02:00
Stiffly bee4a05670 Merge remote-tracking branch 'origin/master' into Sound 2015-10-21 15:52:29 +02:00
Stiffly 784b2e1d58 life lost sound 2015-10-21 15:52:10 +02:00
Stiffly 59dbe97191 Boss fight sounds. bgm, boss-hit, init roar 2015-10-21 15:42:11 +02:00
viktorljung f41e126bd6 Merge remote-tracking branch 'origin/master' into Physics 2015-10-21 15:40:43 +02:00
viktorljung f4ffead4f2 Animations and stuff 2015-10-21 15:40:19 +02:00
tleety df264fb732 Added a ink brick texture 2015-10-21 15:16:34 +02:00
tleety e9942dad4a Merge branch 'Tobias' 2015-10-21 14:48:33 +02:00
Stiffly d0668effea Merge remote-tracking branch 'origin/master' into Sound 2015-10-21 13:18:42 +02:00
Stiffly c23c7e4d8e Story sound. Tom could be improved. 2015-10-20 16:12:55 +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
Stiffly ec509358b1 Powerup sound, not done 2015-10-20 14:20:46 +02:00
tleety ce61de1d5c Merge remote-tracking branch 'origin/Physics' into Tobias 2015-10-20 11:03:45 +02:00
viktorljung a85a703991 animations! 2015-10-20 11:02:03 +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
tleety b4486c6bf3 Added cheat and water changes to the defaul commit 2015-10-20 10:36:11 +02:00
viktorljung 9e8d176999 Animation models and stuff 2015-10-19 16:48:42 +02:00
Stiffly 71521b5b02 Added squid-bounce wav 2015-10-19 16:41:57 +02:00
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
Jace e195e69408 Working DirectX textures 2015-10-19 13:39:00 +02:00