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

391 Commits

Author SHA1 Message Date
Stiffly 7c2782fe2c Fixed scale issue for power up textures. Added a defaultscale flag. Also removed ugly particleeffect for projectiles. 2015-10-22 16:27:23 +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
PlatinumSkink 83f4da59d4 Merge branch 'LevelSystemAndSuch' 2015-10-21 15:47:54 +02:00
PlatinumSkink ff3813a7cf A metric ton of minifixes! 2015-10-21 15:46:32 +02:00
Jace 17c30ff610 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-10-21 15:38:46 +02:00
Jace 52f7e3f64b Control over animation looping and event on animation completion 2015-10-21 15:38:34 +02:00
Jace e7c1dc20ba HACK: For some reason Blender likes to create a first frame that doesn't start at time 0 2015-10-21 15:37:58 +02:00
PlatinumSkink f0b36c6f12 Fixed Kraken battle. I think. Made it so you do not shoot projectiles or squids when struggling with Kraken. 2015-10-21 15:12:50 +02:00
tleety e9942dad4a Merge branch 'Tobias' 2015-10-21 14:48:33 +02:00
tleety cbaf300b03 Smallfix 2015-10-21 14:47:36 +02:00
tleety 11b792c85a Merge remote-tracking branch 'origin' into Tobias 2015-10-21 14:39:38 +02:00
tleety 726244b043 Combo particle is now more visable and better 2015-10-21 14:39:04 +02:00
Stiffly d0668effea Merge remote-tracking branch 'origin/master' into Sound 2015-10-21 13:18:42 +02:00
PlatinumSkink 2954e2cbb3 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-10-20 16:14:55 +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
PlatinumSkink e26156c093 Kraken Battle Implemented. Feel free to comment. 
To get to battle faster, change CurrentCluster to 0.
 2015-10-20 15:57:06 +02:00
tleety 9ffa8e9609 Kraken arm shows up when you take the powerup 2015-10-20 15:57:02 +02:00
Jace 0fabac14a8 fixup! CMAKE Conditional compilation against DirectX and OpenGL targets 2015-10-20 15:48:13 +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 a4b9521c34 CMAKE Conditional compilation against DirectX and OpenGL targets 
...just don't enable both, okay?
 2015-10-20 14:52:12 +02:00
Jace 80f34b27b9 OpenGL renderer back in working condition 2015-10-20 14:31:12 +02:00
Stiffly ec509358b1 Powerup sound, not done 2015-10-20 14:20:46 +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
Jace 3557b45440 PNG loader now converts RGB to RGBA, because we'd rather treat them the same way when rendering, especially in DirectX 2015-10-20 12:07:30 +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
Stiffly 091895cc85 broken ass shit after projectiles 2015-10-20 11:14:53 +02:00
tleety ce61de1d5c Merge remote-tracking branch 'origin/Physics' into Tobias 2015-10-20 11:03:45 +02:00
tleety f688981b06 Started work on kraken arm powerup visual changes. 2015-10-20 11:03:40 +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
Stiffly 71521b5b02 Added squid-bounce wav 2015-10-19 16:41:57 +02:00
tleety bbbcc528d3 Levelsystem quickfix 2015-10-19 16:35:12 +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
Stiffly 5f8756ce8b Improved EStopSound 2015-10-19 15:11:53 +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