96ccef6ed8
Merge remote-tracking branch 'origin/master' into water
...
Conflicts:
src/game/Game/LevelSystem.cpp
2015-10-08 21:44:50 +02:00
2545cef90f
temporary particles for demo. trails for bricks, and on brick hit.
2015-10-08 21:41:01 +02:00
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
3793515968
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
2015-10-08 20:08:10 +02:00
5c2844c137
InkBlaster functions as intended! It just needs ink!
2015-10-08 20:02:51 +02:00
143bff2d9e
Added two new particle sprites.
2015-10-08 18:19:15 +02:00
b93013fcd8
Lifebuoy working
2015-10-08 17:22:19 +02:00
210c6a003b
Merge branch 'master' into LevelSystemAndSuch. Fixed so scrolling to next level works again.
2015-10-08 16:11:47 +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
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
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
07e59bd0e2
Scroll to next stage works!
2015-10-07 19:19:55 +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
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
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
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
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
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
005fd40167
Added IceBrick and started to remove the scale dependency for physics bodies
2015-10-05 16:25: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
e120b09b84
Merge branch 'master' into LevelSystemAndSuch
2015-10-01 14:36:12 +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
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
2491dd8b74
Fixed some things, code up to styleguide
2015-09-30 10:29:56 +02:00
7733a44d53
Refactoring and starting to write test for PhysicsSystem
2015-09-29 12:08:13 +02:00
a1c709a2db
Removed wierd glow on water
2015-09-29 11:10:08 +02:00
38d3a8c990
Fixed a bug where you could not have more than one particle group
2015-09-29 10:27:57 +02:00
Jace
5e7e5ec8bb
Fixed precision loss in physics accumulator
2015-09-28 22:55:39 +02:00
1a0201ee98
Style guide fixes
2015-09-28 17:20:23 +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
cfb6d1e4b5
Falling bricks and collision filters
2015-09-25 04:28:46 +02:00
c624c5bcf3
Merge master
2015-09-25 00:03:28 +02:00
d2301594ce
Gravity scale per entity
2015-09-25 00:01:24 +02:00
03e2078cfb
Pad modifies ball path and ball facing its direction
2015-09-23 15:12:18 +02:00
94401a10ee
Water working, might not work for several bodies
2015-09-22 16:06:47 +02:00
1e70e151ee
Continued work on water, can now get 1 particle? maybe? Gotta get rendering to work so i can test it.
2015-09-21 16:00:20 +02:00
b32934dba6
Merge remote-tracking branch 'origin/physics' into water
...
# Conflicts:
# include/Core/Engine.h
# include/Physics/PhysicsSystem.h
# src/game/Game/PadSystem.cpp
# src/game/Physics/PhysicsSystem.cpp
2015-09-17 17:37:58 +02:00
b69413d9c9
Base water set up
2015-09-17 17:35:17 +02:00
c0155b7900
collisions remade
2015-09-17 16:52:43 +02:00
442554812d
Collisions kind of working
2015-09-17 14:11:09 +01:00
Stiffly
PlatinumSkink
viktorljung
Jace
tleety