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

86 Commits

Author SHA1 Message Date
PlatinumSkink c222383b6f KRAKEN ATTACK! At a press of K! KrakenAttackBricks exist, too, just add number to level. 2015-10-08 23:52:48 +02:00
PlatinumSkink 90636a7169 Color Arrays in Vec4 implimented. Have fun. 2015-10-08 22:32:06 +02:00
PlatinumSkink 7d15be6d6d Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-08 21:52:21 +02:00
PlatinumSkink f6f74c659f Getting Sticky after Ink Blaster now works. 2015-10-08 21:51:27 +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
viktorljung a0d6f01ac2 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	src/game/Game/LevelSystem.cpp
 2015-10-08 20:17:24 +02:00
viktorljung 52ab09d0b1 Added brick models and Lifebuoy balance changes 2015-10-08 20:08:42 +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
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 040b0f9461 Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch 2015-10-08 15:47:27 +02:00
PlatinumSkink 6669d91a90 Sticky works except graphics. Temporarily colored odd bricks. 2015-10-08 15:42:13 +02:00
viktorljung c57181fb83 working on Lifebuoy 2015-10-08 14:25:20 +02:00
viktorljung 544a45d21d Merge remote-tracking branch 'origin/LevelSystemAndSuch' into Physics 2015-10-08 14:04:03 +02:00
viktorljung 18ffddb2ac White bricks added 2015-10-08 14:03:38 +02:00
PlatinumSkink 566b440d80 Lifebuoy added. Incomplete, but it appears. 2015-10-08 14:00:26 +02:00
PlatinumSkink 1a49e9d1b0 Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch 2015-10-08 11:52:32 +02:00
PlatinumSkink b5ae490b23 Prepared for Lifebuoy PowerUp. 2015-10-08 11:51:13 +02:00
viktorljung f085e6a387 Water can now collide with the bricks, added new ship model 2015-10-08 11:27:17 +02:00
PlatinumSkink 07e59bd0e2 Scroll to next stage works! 2015-10-07 19:19:55 +02:00
PlatinumSkink 3814c25931 Squid does not move until space is pressed. Experimenting with scroll. This shouldn't really be committed, but Visual Studio. 2015-10-07 17:09:55 +02:00
PlatinumSkink b7696b8776 Merge branch 'LevelSystemAndSuch', and adjusted ball size. 2015-10-06 20:35:44 +02:00
viktorljung b036357e3b Merge branch 'Physics' 
Conflicts:
	include/Core/Engine.h
	include/Physics/CPhysics.h
	include/Physics/PhysicsSystem.h
	src/game/Game/BallSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-10-06 20:16:57 +02:00
PlatinumSkink 902098a72d Fixed all bugs I know of. MultiBall appear upon ice falling in water. 2015-10-06 19:41:24 +02:00
PlatinumSkink a3b21581e2 Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch 2015-10-06 18:33:49 +02:00
PlatinumSkink 6205e84ff1 Fixed minor things 2015-10-06 18:33:18 +02:00
viktorljung fb8d6f210a Merge remote-tracking branch 'origin/LevelSystemAndSuch' into Physics 
Conflicts:
	include/Core/Engine.h
	include/Physics/PhysicsSystem.h
	src/game/Game/BallSystem.cpp
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-10-06 16:13:17 +02:00
PlatinumSkink 4617dd95b7 Correction: Not Stable! 2015-10-06 15:38:15 +02:00
PlatinumSkink 5b425f27ae 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
viktorljung 791c3ce69c Some fixes to the brick models 2015-10-06 15:30:11 +02:00
Jace 7173fdf396 MSVC12 compiler compability fixes 2015-10-06 15:27:11 +02:00
viktorljung 43e0a5b699 Rectangle shape now has the size of the rigidbody, not scale 2015-10-06 13:31:23 +02:00
PlatinumSkink a8219e2129 Doesn't work right now. Cloning bricks kills makes balls stop bouncing on them. 2015-10-05 17:55:02 +02:00
viktorljung 1d42e107de Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Core/Engine.h
	include/Physics/PhysicsSystem.h
	src/game/Game/PadSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-10-05 17:02:42 +02:00
PlatinumSkink 56086d6061 Implemented GetNextLevel function with hard-coded levels. 2015-10-05 16:35:37 +02:00
viktorljung 005fd40167 Added IceBrick and started to remove the scale dependency for physics bodies 2015-10-05 16:25:00 +02:00
viktorljung dca06a46a5 Changed bool CPhysics->Static to enum CPhysics->CollisionType, Which added support for kinematic bodies 2015-10-02 14:36:41 +02:00
PlatinumSkink 4d3428f125 HitLag has types in strings to send along to affect what systems lag. 2015-10-01 14:14:07 +02:00
PlatinumSkink c63ec035a7 HitLagSystem implemented. 2015-09-30 16:42:35 +02:00
PlatinumSkink c31ff4cfcb P-button pauses, H-button does 0.3 second HitLag. 2015-09-30 15:19:45 +02:00
PlatinumSkink 45e68c51a3 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-09-29 14:44:50 +02:00
PlatinumSkink c3b54ef030 Implemented Combos which multiply score. Adjusted pad a bit. 2015-09-29 14:42:01 +02:00
Stiffly cb70cdfc5d Merge remote-tracking branch 'origin/master' into Sound 2015-09-29 12:04:52 +02:00
PlatinumSkink 94fc7c1ce6 Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch. 2015-09-29 11:21:35 +02:00
Jace edd87ddf58 Fixed critical warnings for Linux build 2015-09-28 20:40:28 +02:00
Stiffly a97dae542d Merge remote-tracking branch 'origin/master' into Sound 
Conflicts:
	src/game/Sound/SoundSystem.cpp
 2015-09-28 18:14:06 +02:00
PlatinumSkink 7b7277509e CreateBall clones the original ball rather than create new balls. 2015-09-28 18:09:55 +02:00