BTH/squidout
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Files
a3354b856dbfeb0a378018ac96bc90f5e2c15bb3
squidout/include/Game
T
History
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
..
Bricks
Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.
2015-09-23 20:46:57 +02:00
GUI
Merge remote-tracking branch 'origin/master'
2015-10-22 14:52:27 +02:00
BallSystem.h
Merge remote-tracking branch 'origin/master' into Physics
2015-10-23 14:47:04 +02:00
BrickComponents.h
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
CBackground.h
TravellingSystem uses EMove. EMove and ERotate copied from Returngeance into TransportSystem.
2015-10-15 13:44:16 +02:00
CBall.h
Merge remote-tracking branch 'origin/master' into Physics
2015-10-23 14:47:04 +02:00
CBrick.h
Fixed so generated bricks fo not collide with anything.
2015-10-22 15:42:28 +02:00
CBrickPart.h
RaiseWater implemented. Set Debug RaiseWater to true to activate it. And fixed second stage crashing.
2015-10-22 14:04:36 +02:00
CInkBlasterBrick.h
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
CKraken.h
Kraken grows redder with more hits, and uses more dangerous brick-sets. Kraken can change reaction time depending on damage by changing Max/MinSeconds to action in KrakenSystem.
2015-10-23 12:10:09 +02:00
CKrakenAttackBrick.h
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
CLife.h
Kraken grows redder with more hits, and uses more dangerous brick-sets. Kraken can change reaction time depending on damage by changing Max/MinSeconds to action in KrakenSystem.
2015-10-23 12:10:09 +02:00
CLifebuoy.h
Lifebuoy updated, now dies after 4 hits
2015-10-08 21:51:43 +02:00
CLifebuoyBrick.h
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
CMultiBallBrick.h
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
CNewWaterVolume.h
RaiseWater implemented. Set Debug RaiseWater to true to activate it. And fixed second stage crashing.
2015-10-22 14:04:36 +02:00
CPad.h
Fixed invisible item bug, maybe. Put 0.1 sec hitlag on impact with pad. Stable level loading?
2015-10-06 15:31:48 +02:00
CPowerUp.h
Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.
2015-09-23 20:46:57 +02:00
CProjectile.h
Kraken shows up on last stage. Created WaterSystem for possible future use.
2015-10-20 11:43:39 +02:00
CStandardBrick.h
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
CStickyAim.h
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
CStickyBrick.h
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
CTravels.h
TravellingSystem uses EMove. EMove and ERotate copied from Returngeance into TransportSystem.
2015-10-15 13:44:16 +02:00
CWall.h
ScreenShakeSystem made. And some other things.
2015-10-14 18:52:04 +02:00
EActionButton.h
InkBlaster functions as intended! It just needs ink!
2015-10-08 20:02:51 +02:00
EArrivedAtNewStage.h
Aimer for Sticky Works, though stuff.
2015-10-12 18:18:37 +02:00
EBreakAllBricks.h
Kraken grows redder with more hits, and uses more dangerous brick-sets. Kraken can change reaction time depending on damage by changing Max/MinSeconds to action in KrakenSystem.
2015-10-23 12:10:09 +02:00
EBrickGenerating.h
Kraken grows redder with more hits, and uses more dangerous brick-sets. Kraken can change reaction time depending on damage by changing Max/MinSeconds to action in KrakenSystem.
2015-10-23 12:10:09 +02:00
EClusterClear.h
Kraken shows up on last stage. Created WaterSystem for possible future use.
2015-10-20 11:43:39 +02:00
EComboEvent.h
Implemented Combos which multiply score. Adjusted pad a bit.
2015-09-29 14:42:01 +02:00
ECreatePowerUp.h
Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.
2015-09-23 20:46:57 +02:00
EGameOver.h
Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.
2015-09-23 20:46:57 +02:00
EGameStart.h
Playing sound on EGameStart. Menu sounds.
2015-10-19 13:53:42 +02:00
EHitLag.h
P-button pauses, H-button does 0.3 second HitLag.
2015-09-30 15:19:45 +02:00
EHitPad.h
InkBlaster functions as intended! It just needs ink!
2015-10-08 20:02:51 +02:00
EInkBlaster.h
Kraken shows up on last stage. Created WaterSystem for possible future use.
2015-10-20 11:43:39 +02:00
EInkBlasterOver.h
Getting Sticky after Ink Blaster now works.
2015-10-08 21:51:27 +02:00
EKrakenAppear.h
Implimented the basis for Kraken encounter.
2015-10-15 15:08:05 +02:00
EKrakenAttack.h
KRAKEN ATTACK! At a press of K! KrakenAttackBricks exist, too, just add number to level.
2015-10-08 23:52:48 +02:00
EKrakenAttackEnd.h
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
EKrakenDefeated.h
Kraken shows up on last stage. Created WaterSystem for possible future use.
2015-10-20 11:43:39 +02:00
EKrakenHit.h
KrakenHit event includes max health, current, and new.
2015-10-20 15:58:02 +02:00
ELifebuoy.h
InkBlaster functions as intended! It just needs ink!
2015-10-08 20:02:51 +02:00
ELifebuoyHit.h
Lifebuoy updated, now dies after 4 hits
2015-10-08 21:51:43 +02:00
ELifeLost.h
Added ScoreEvent, added score to bricks. Stage resets after all bricks are destroyed.
2015-09-15 17:31:22 +02:00
EMultiBall.h
MultiBalls appear depending on pad's position
2015-09-21 13:25:20 +02:00
EMultiBallLost.h
Transferred Ball-stuff into BallSystem.
2015-09-28 17:24:58 +02:00
EPause.h
HitLag has types in strings to send along to affect what systems lag.
2015-10-01 14:14:07 +02:00
EPowerUpTaken.h
Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.
2015-09-23 20:46:57 +02:00
ERaiseWater.h
Kraken shows up on last stage. Created WaterSystem for possible future use.
2015-10-20 11:43:39 +02:00
ERaiseWaterWall.h
Kraken shows up on last stage. Created WaterSystem for possible future use.
2015-10-20 11:43:39 +02:00
ERelevantObjectCreated.h
Kraken shows up on last stage. Created WaterSystem for possible future use.
2015-10-20 11:43:39 +02:00
EResetAll.h
ScreenShakeSystem made. And some other things.
2015-10-14 18:52:04 +02:00
EResetBall.h
Added ScoreEvent, added score to bricks. Stage resets after all bricks are destroyed.
2015-09-15 17:31:22 +02:00
EResume.h
Pause and Resume events completed and game-crashing bug fixed. I think.
2015-10-19 14:56:44 +02:00
EScoreEvent.h
StyleGuide Fix
2015-09-15 18:48:26 +02:00
EScreenShake.h
ScreenShake works as intended at the press of E and upon calling the event.
2015-10-13 18:34:21 +02:00
EStageCleared.h
Kraken shows up on last stage. Created WaterSystem for possible future use.
2015-10-20 11:43:39 +02:00
EStartedNewLevel.h
Kraken shows up on last stage. Created WaterSystem for possible future use.
2015-10-20 11:43:39 +02:00
EStickyAttachedToPad.h
Aimer for Sticky Works, though stuff.
2015-10-12 18:18:37 +02:00
EStickyPad.h
Adjustments to Sticky and Inkblaster made, in addition made StickyAimer partly transparent green.
2015-10-13 14:02:18 +02:00
HitLagSystem.h
Pause and Resume events completed and game-crashing bug fixed. I think.
2015-10-19 14:56:44 +02:00
KrakenSystem.h
Kraken grows redder with more hits, and uses more dangerous brick-sets. Kraken can change reaction time depending on damage by changing Max/MinSeconds to action in KrakenSystem.
2015-10-23 12:10:09 +02:00
LevelSystem.h
Animations in the game
2015-10-23 14:35:11 +02:00
LifebuoySystem.h
Merge remote-tracking branch 'origin/master' into water
2015-10-19 15:25:16 +02:00
LifeSystem.h
Kraken grows redder with more hits, and uses more dangerous brick-sets. Kraken can change reaction time depending on damage by changing Max/MinSeconds to action in KrakenSystem.
2015-10-23 12:10:09 +02:00
PadSystem.h
Merge remote-tracking branch 'origin/master'
2015-10-22 17:06:01 +02:00
ProjectileSystem.h
Merge remote-tracking branch 'origin/master' into Physics
2015-10-23 14:47:04 +02:00
ScreenShakeSystem.h
Kraken grows redder with more hits, and uses more dangerous brick-sets. Kraken can change reaction time depending on damage by changing Max/MinSeconds to action in KrakenSystem.
2015-10-23 12:10:09 +02:00
TravellingSystem.h
RaiseWater implemented. Set Debug RaiseWater to true to activate it. And fixed second stage crashing.
2015-10-22 14:04:36 +02:00
WaterSystem.h
Failed to stage it all.
2015-10-22 14:05:23 +02:00