706e720ae8
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
src/game/Physics/ContactListener.cpp
src/game/Physics/PhysicsSystem.cpp
2015-10-08 21:39:48 +02:00
143bff2d9e
Added two new particle sprites.
2015-10-08 18:19:15 +02:00
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
b93013fcd8
Lifebuoy working
2015-10-08 17:22:19 +02:00
c76033113d
Small edit to temporarily solve a problem.
2015-10-08 17:15:48 +02:00
3ac6fdce5f
Fixes smaller problems
2015-10-08 16:53:51 +02:00
74d7e1feb7
Slight calibration so Travelling doesn't necessarily kill the process just because something is Sticky.
2015-10-08 16:13:30 +02:00
210c6a003b
Merge branch 'master' into LevelSystemAndSuch. Fixed so scrolling to next level works again.
2015-10-08 16:11:47 +02:00
040b0f9461
Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch
2015-10-08 15:47:27 +02:00
6669d91a90
Sticky works except graphics. Temporarily colored odd bricks.
2015-10-08 15:42:13 +02:00
f147778d4d
Merge remote-tracking branch 'origin/master' into Physics
...
Conflicts:
src/game/Physics/PhysicsSystem.cpp
2015-10-08 14:29:29 +02:00
c57181fb83
working on Lifebuoy
2015-10-08 14:25:20 +02:00
544a45d21d
Merge remote-tracking branch 'origin/LevelSystemAndSuch' into Physics
2015-10-08 14:04:03 +02:00
18ffddb2ac
White bricks added
2015-10-08 14:03:38 +02:00
566b440d80
Lifebuoy added. Incomplete, but it appears.
2015-10-08 14:00:26 +02:00
51cc45fbf0
Merge branch 'master' into water
2015-10-08 13:36:01 +02:00
bb314898ba
Fixing vs build fail
2015-10-08 12:12:21 +02:00
1a49e9d1b0
Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch
2015-10-08 11:52:32 +02:00
b5ae490b23
Prepared for Lifebuoy PowerUp.
2015-10-08 11:51:13 +02:00
33ecbaaab3
density added in physics Component
2015-10-08 11:37:13 +02:00
f085e6a387
Water can now collide with the bricks, added new ship model
2015-10-08 11:27:17 +02:00
3f0f45f509
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
include/Core/Engine.h
src/game/Physics/PhysicsSystem.cpp
2015-10-08 11:16:31 +02:00
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
d038855fb7
Minor adjustments.
2015-10-08 10:45:01 +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
Jace
bfa8545483
Visual Studio build now outputs all binaries to the same folder regardless of build configuration
2015-10-07 15:48:52 +02:00
Jace
d3c3e3c035
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
2015-10-07 15:46:17 +02:00
Jace
129ef1f779
Corrected FrameTest
2015-10-07 15:46:07 +02:00
71fe786b04
even more bug fixes
2015-10-07 15:45:50 +02:00
892fe5e666
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
2015-10-07 15:40:14 +02:00
562a5fa269
fixed more bugs
2015-10-07 15:40:04 +02:00
Jace
80625a2b55
Merge branch 'master' of github.com:teamfisk/AgileBreakOut
2015-10-07 15:34:44 +02:00
Jace
4db9995dc1
Removed CMake Boost debug output crap
2015-10-07 15:34:30 +02:00
9ef845955b
removed unfinished physicstest
2015-10-07 14:45:32 +02:00
1462ca6111
fixes
2015-10-07 14:41:59 +02:00
Jace
3f44547d25
NO MERCY, BITCHERS
2015-10-07 14:29:28 +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
1f10d24448
Commented out couts.
2015-10-06 19:57: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
a3b21581e2
Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch
2015-10-06 18:33:49 +02:00
6205e84ff1
Fixed minor things
2015-10-06 18:33:18 +02:00
Stiffly
viktorljung
PlatinumSkink
Jace