b5785da5d5
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
include/Core/Engine.h
src/game/Physics/PhysicsSystem.cpp
2015-10-08 11:11:56 +02:00
66feadfd04
Fixed physics wrong error message
2015-10-08 11:04:35 +02:00
07e59bd0e2
Scroll to next stage works!
2015-10-07 19:19:55 +02:00
ef5882ffbf
Vattnet fungerar nu igen.
2015-10-07 19:18:49 +02:00
1a1b94477e
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
include/Core/Engine.h
include/Physics/PhysicsSystem.h
include/Sound/SoundSystem.h
src/game/Physics/PhysicsSystem.cpp
src/game/Sound/SoundSystem.cpp
PS:min teori i förra commiten var sann
2015-10-07 18:34:36 +02:00
db2d6ad6e4
Eventbaserade partiklar. Fick nån krasch i physicssystem efter ett tags spelande, men det hoppas jag löser sig när jag mergar in Viktors senaste fysikfixar :3
2015-10-07 17:22:45 +02:00
9bb50067fc
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-10-07 17:13:05 +02:00
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
71fe786b04
even more bug fixes
2015-10-07 15:45:50 +02:00
8b12c1036d
Partycles.
2015-10-06 21:42:54 +02:00
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
a2dc76051f
Bodies are now removed properly
2015-10-06 18:32:22 +02:00
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
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
ca810743b2
Angle and spread on particle system. Need to make them not collide.
2015-10-06 13:38:40 +02:00
43e0a5b699
Rectangle shape now has the size of the rigidbody, not scale
2015-10-06 13:31:23 +02:00
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
773c6665bd
Particles working, still need some more variables implanted though
2015-10-02 16:35:21 +02:00
dca06a46a5
Changed bool CPhysics->Static to enum CPhysics->CollisionType, Which added support for kinematic bodies
2015-10-02 14:36:41 +02:00
e120b09b84
Merge branch 'master' into LevelSystemAndSuch
2015-10-01 14:36:12 +02:00
a4065f734b
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
2015-10-01 14:26:25 +02:00
45711500f7
Merged
2015-10-01 14:24:06 +02:00
52dec86925
Particle system up and running, but with bugged rendering
2015-10-01 14:14:51 +02:00
4d3428f125
HitLag has types in strings to send along to affect what systems lag.
2015-10-01 14:14:07 +02:00
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
cbaca42a3c
Changed SquidModel
2015-10-01 14:04:21 +02:00
c63ec035a7
HitLagSystem implemented.
2015-09-30 16:42:35 +02:00
c31ff4cfcb
P-button pauses, H-button does 0.3 second HitLag.
2015-09-30 15:19:45 +02:00
2fb16357fa
Moved pad-creation to PadSystem. Pad now stops at sides.
2015-09-30 10:32:17 +02:00
45e68c51a3
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-09-29 14:44:50 +02:00
c3b54ef030
Implemented Combos which multiply score. Adjusted pad a bit.
2015-09-29 14:42:01 +02:00
38d3a8c990
Fixed a bug where you could not have more than one particle group
2015-09-29 10:27:57 +02:00
a97dae542d
Merge remote-tracking branch 'origin/master' into Sound
...
Conflicts:
src/game/Sound/SoundSystem.cpp
2015-09-28 18:14:06 +02:00
7b7277509e
CreateBall clones the original ball rather than create new balls.
2015-09-28 18:09:55 +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
cb48b881b7
cool fixes and stuff
2015-09-25 05:33:10 +02:00
a730a1ce16
Merge remote-tracking branch 'origin/master' into Physics
2015-09-25 05:16:58 +02:00
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
2af9567722
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
2015-09-25 04:40:51 +02:00
cfb6d1e4b5
Falling bricks and collision filters
2015-09-25 04:28:46 +02:00
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
b0c19c74f2
Merge remote-tracking branch 'origin/master' into EGameStart
...
Conflicts:
include/Core/Engine.h
2015-09-25 02:49:50 +02:00
650c7ec47c
EStartGame up and running. Moved BGM-play from soundsystem init to EGameStart.
2015-09-25 02:43:34 +02:00
Jace
d2bc91be48
Merge remote-tracking branch 'origin/master' into gui
...
Conflicts:
include/Core/Engine.h
include/Core/RenderQueue.h
include/Core/Renderer.h
src/game/Core/Renderer.cpp
2015-09-25 02:27:00 +02:00
Stiffly
PlatinumSkink
viktorljung
Jace
tleety