bb314898ba
Fixing vs build fail
2015-10-08 12:12:21 +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
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
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
Jace
7899750284
Potential fix to crazy memory bug?
2015-10-06 15:54:48 +02:00
Jace
47b5073657
Added debug version of liquidfun library for MSVC12
2015-10-06 15:54:35 +02:00
4617dd95b7
Correction: Not Stable!
2015-10-06 15:38:15 +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
Jace
6feb587380
MSVC12 dependencies
2015-10-06 15:26:44 +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
Stiffly
PlatinumSkink
Jace
viktorljung