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
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
1462ca6111
fixes
2015-10-07 14:41:59 +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
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
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
4d3428f125
HitLag has types in strings to send along to affect what systems lag.
2015-10-01 14:14:07 +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
94fc7c1ce6
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch.
2015-09-29 11:21:35 +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
Jace
edd87ddf58
Fixed critical warnings for Linux build
2015-09-28 20:40:28 +02:00
fc41727a5d
Transferred Ball-stuff into BallSystem.
2015-09-28 17:24:58 +02:00
1a0201ee98
Style guide fixes
2015-09-28 17:20:23 +02:00
cb48b881b7
cool fixes and stuff
2015-09-25 05:33:10 +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
effc9ff781
Merge and some small fixes
2015-09-25 01:49:08 +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
d473e3711c
Now render water through it's own buffer. Not currently visable through finaltexture. Also added a white texture to render the water.
2015-09-23 18:01:15 +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
Stiffly
PlatinumSkink
viktorljung
Jace
tleety