 PlatinumSkink
|
5c2844c137
|
InkBlaster functions as intended! It just needs ink!
|
2015-10-08 20:02:51 +02:00 |
|
 viktorljung
|
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 |
|
|
viktorljung
|
b93013fcd8
|
Lifebuoy working
|
2015-10-08 17:22:19 +02:00 |
|
|
PlatinumSkink
|
c76033113d
|
Small edit to temporarily solve a problem.
|
2015-10-08 17:15:48 +02:00 |
|
|
PlatinumSkink
|
3ac6fdce5f
|
Fixes smaller problems
|
2015-10-08 16:53:51 +02:00 |
|
|
PlatinumSkink
|
6669d91a90
|
Sticky works except graphics. Temporarily colored odd bricks.
|
2015-10-08 15:42:13 +02:00 |
|
|
viktorljung
|
c57181fb83
|
working on Lifebuoy
|
2015-10-08 14:25:20 +02:00 |
|
|
PlatinumSkink
|
1a49e9d1b0
|
Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch
|
2015-10-08 11:52:32 +02:00 |
|
|
viktorljung
|
f085e6a387
|
Water can now collide with the bricks, added new ship model
|
2015-10-08 11:27:17 +02:00 |
|
|
PlatinumSkink
|
d038855fb7
|
Minor adjustments.
|
2015-10-08 10:45:01 +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 |
|
|
PlatinumSkink
|
b7696b8776
|
Merge branch 'LevelSystemAndSuch', and adjusted ball size.
|
2015-10-06 20:35:44 +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 |
|
|
PlatinumSkink
|
1f10d24448
|
Commented out couts.
|
2015-10-06 19:57:57 +02:00 |
|
|
PlatinumSkink
|
902098a72d
|
Fixed all bugs I know of. MultiBall appear upon ice falling in water.
|
2015-10-06 19:41:24 +02:00 |
|
|
viktorljung
|
65c01f9b8e
|
Improved collisions with multiple objects in the same frame
|
2015-10-06 19:41:00 +02:00 |
|
|
PlatinumSkink
|
a3b21581e2
|
Merge remote-tracking branch 'origin/Physics' into LevelSystemAndSuch
|
2015-10-06 18:33:49 +02:00 |
|
|
PlatinumSkink
|
6205e84ff1
|
Fixed minor things
|
2015-10-06 18:33:18 +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 |
|
|
PlatinumSkink
|
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 |
|
 Jace
|
7173fdf396
|
MSVC12 compiler compability fixes
|
2015-10-06 15:27:11 +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
|
56086d6061
|
Implemented GetNextLevel function with hard-coded levels.
|
2015-10-05 16:35:37 +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 |
|
|
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
|
c3b54ef030
|
Implemented Combos which multiply score. Adjusted pad a bit.
|
2015-09-29 14:42:01 +02:00 |
|
|
PlatinumSkink
|
94fc7c1ce6
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch.
|
2015-09-29 11:21:35 +02:00 |
|
|
Jace
|
edd87ddf58
|
Fixed critical warnings for Linux build
|
2015-09-28 20:40:28 +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 |
|
|
viktorljung
|
cfb6d1e4b5
|
Falling bricks and collision filters
|
2015-09-25 04:28:46 +02:00 |
|
|
PlatinumSkink
|
62b17e3dbf
|
Adjusted for merge. 10:16 works. Physics works. Game works. Safety copy made before this merge.
|
2015-09-23 20:46:57 +02:00 |
|
|
viktorljung
|
03e2078cfb
|
Pad modifies ball path and ball facing its direction
|
2015-09-23 15:12:18 +02:00 |
|
|
viktorljung
|
c0155b7900
|
collisions remade
|
2015-09-17 16:52:43 +02:00 |
|
|
viktorljung
|
442554812d
|
Collisions kind of working
|
2015-09-17 14:11:09 +01:00 |
|