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

146 Commits

Author SHA1 Message Date
PlatinumSkink 07e59bd0e2 Scroll to next stage works! 2015-10-07 19:19:55 +02:00
PlatinumSkink 9bb50067fc Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch 2015-10-07 17:13:05 +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
viktorljung 71fe786b04 even more bug fixes 2015-10-07 15:45:50 +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
viktorljung a2dc76051f Bodies are now removed properly 2015-10-06 18:32:22 +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
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
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 b2399243e3 Merge branch 'master' into LevelSystemAndSuch 2015-10-05 13:26:51 +02:00
Jace b86dc09c82 Merge branch 'master' into gui 2015-10-02 18:18:44 +02:00
Jace e74f1092c7 Fixed crash when events were (un)subscribed while events were processing 2015-10-02 18:12: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
Jace c821fbfc25 Futile attempts to fix memory corruption bug 2015-10-01 16:12:53 +02:00
PlatinumSkink e120b09b84 Merge branch 'master' into LevelSystemAndSuch 2015-10-01 14:36:12 +02:00
PlatinumSkink a4065f734b Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut 2015-10-01 14:26:25 +02:00
tleety 45711500f7 Merged 2015-10-01 14:24:06 +02:00
tleety 52dec86925 Particle system up and running, but with bugged rendering 2015-10-01 14:14:51 +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
viktorljung 39f4215c2b Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Physics/PhysicsSystem.h
	src/game/Physics/PhysicsSystem.cpp
 2015-10-01 14:13:51 +02:00
viktorljung cbaca42a3c Changed SquidModel 2015-10-01 14:04:21 +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 2fb16357fa Moved pad-creation to PadSystem. Pad now stops at sides. 2015-09-30 10:32:17 +02:00
tleety 2491dd8b74 Fixed some things, code up to styleguide 2015-09-30 10:29:56 +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
viktorljung 7733a44d53 Refactoring and starting to write test for PhysicsSystem 2015-09-29 12:08:13 +02:00
Stiffly cb70cdfc5d Merge remote-tracking branch 'origin/master' into Sound 2015-09-29 12:04:52 +02:00
tleety 38d3a8c990 Fixed a bug where you could not have more than one particle group 2015-09-29 10:27:57 +02:00
Jace d472e2ae88 Added ignore rule for .orig files, since nobody seem to be able to look at what they commit... 2015-09-28 21:56:11 +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
PlatinumSkink fc41727a5d Transferred Ball-stuff into BallSystem. 2015-09-28 17:24:58 +02:00
Jace be60464bb5 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-09-25 05:47:37 +02:00
Jace 17f8905696 Removed the HUD from the menu screen 2015-09-25 05:47:20 +02:00
viktorljung cb48b881b7 cool fixes and stuff 2015-09-25 05:33:10 +02:00
viktorljung a730a1ce16 Merge remote-tracking branch 'origin/master' into Physics 2015-09-25 05:16:58 +02:00
viktorljung 96511c63b1 Merge remote-tracking branch 'origin/master' into Physics 
Conflicts:
	include/Core/Engine.h
	include/Physics/PhysicsSystem.h
	src/game/Game/LevelSystem.cpp
	src/game/Physics/PhysicsSystem.cpp
 2015-09-25 05:16:32 +02:00
tleety 2af9567722 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-09-25 04:40:51 +02:00
viktorljung cfb6d1e4b5 Falling bricks and collision filters 2015-09-25 04:28:46 +02:00
tleety b77c357990 Changed some lighting and the background pipe scale 2015-09-25 03:33:30 +02:00
Jace 186e06bc22 Fixed bug where render queue wouldn't get cleared if the world wasn't running 2015-09-25 03:23:42 +02:00
Jace c0f77dd32a fixup! Merge branch 'master' of github.com:teamfisk/AgileBreakOut 2015-09-25 03:10:47 +02:00
Jace 8b3d9eb842 WIP HUD 2015-09-25 03:04:37 +02:00
Jace ecfa666a22 Merge branch 'master' of github.com:teamfisk/AgileBreakOut 
# Conflicts:
#	include/Core/Engine.h
 2015-09-25 03:04:13 +02:00
Stiffly b0c19c74f2 Merge remote-tracking branch 'origin/master' into EGameStart 
Conflicts:
	include/Core/Engine.h
 2015-09-25 02:49:50 +02:00
Stiffly 650c7ec47c EStartGame up and running. Moved BGM-play from soundsystem init to EGameStart. 2015-09-25 02:43:34 +02:00