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
562a5fa269
fixed more bugs
2015-10-07 15:40:04 +02:00
8b12c1036d
Partycles.
2015-10-06 21:42:54 +02:00
b7696b8776
Merge branch 'LevelSystemAndSuch', and adjusted ball size.
2015-10-06 20:35:44 +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
902098a72d
Fixed all bugs I know of. MultiBall appear upon ice falling in water.
2015-10-06 19:41:24 +02:00
65c01f9b8e
Improved collisions with multiple objects in the same frame
2015-10-06 19:41:00 +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
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
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
a8219e2129
Doesn't work right now. Cloning bricks kills makes balls stop bouncing on them.
2015-10-05 17:55:02 +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
56086d6061
Implemented GetNextLevel function with hard-coded levels.
2015-10-05 16:35:37 +02:00
005fd40167
Added IceBrick and started to remove the scale dependency for physics bodies
2015-10-05 16:25:00 +02:00
Jace
371d21cb35
Buttons are now not clickable when they're hidden
2015-10-05 14:27:27 +02:00
b2399243e3
Merge branch 'master' into LevelSystemAndSuch
2015-10-05 13:26:51 +02:00
Jace
a8b0631379
Improved FPS counter with averaging
2015-10-02 19:01:08 +02:00
Jace
b38580f468
Area and Stage numbers in the right place
2015-10-02 18:30:36 +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
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
Jace
45f1d882ad
Adding these two additional frames make the event broker break
2015-10-01 14:41:55 +02:00
Jace
c821fbfc25
Futile attempts to fix memory corruption bug
2015-10-01 16:12:53 +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
074c53a82b
Merge branch 'master' of https://github.com/teamfisk/AgileBreakOut
2015-10-01 14:14:36 +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
Jace
ff27eafccf
WORKING number frame
2015-10-01 13:09:27 +02:00
Jace
b42a09fce1
Semi-working number frame
2015-10-01 11:01:33 +02:00
Jace
d1dde9459f
Added FPS counter
2015-10-01 11:01:18 +02:00
Jace
e1ff3825ee
Fixed type error in sound loading
2015-10-01 12:51:29 +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
2491dd8b74
Fixed some things, code up to styleguide
2015-09-30 10:29:56 +02:00
45e68c51a3
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-09-29 14:44:50 +02:00
Stiffly
PlatinumSkink
viktorljung
Jace
tleety