 viktorljung
|
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 |
|
|
viktorljung
|
cfb6d1e4b5
|
Falling bricks and collision filters
|
2015-09-25 04:28:46 +02:00 |
|
 tleety
|
c624c5bcf3
|
Merge master
|
2015-09-25 00:03:28 +02:00 |
|
|
viktorljung
|
03e2078cfb
|
Pad modifies ball path and ball facing its direction
|
2015-09-23 15:12:18 +02:00 |
|
|
tleety
|
94401a10ee
|
Water working, might not work for several bodies
|
2015-09-22 16:06:47 +02:00 |
|
|
tleety
|
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 |
|
|
tleety
|
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 |
|
|
tleety
|
b69413d9c9
|
Base water set up
|
2015-09-17 17:35:17 +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 |
|
|
viktorljung
|
8963e94cd6
|
pad moving with physics velocity
|
2015-09-15 14:27:35 +01:00 |
|
 PlatinumSkink
|
88bd96861d
|
Tried to implement lives. Failed. Everything crashes if I try to RemoveEntity in Update.
|
2015-09-15 12:40:23 +02:00 |
|
|
viktorljung
|
2d7b32b7a3
|
impulse list and velocity for physics
|
2015-09-14 16:06:48 +01:00 |
|
|
viktorljung
|
dfef1ec774
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
include/Core/Engine.h
src/game/Physics/PhysicsSystem.cpp
|
2015-09-14 15:37:38 +01:00 |
|
|
viktorljung
|
c7704f62e9
|
fixed timestep working
|
2015-09-14 14:59:39 +01:00 |
|
|
PlatinumSkink
|
bda864ac11
|
Breakout Standard Screen
Meaning bricks, ball, pad, walls bounces, things.
May or may not work as intended.
|
2015-09-11 15:07:00 +02:00 |
|
|
viktorljung
|
6932a22d7a
|
Rotation right this time
|
2015-09-11 10:48:15 +01:00 |
|
|
viktorljung
|
71cdd1f795
|
SetImpulse event
|
2015-09-10 22:43:25 +01:00 |
|
|
viktorljung
|
963e492f9c
|
CircleShape
|
2015-09-10 22:24:19 +01:00 |
|
|
viktorljung
|
9bf0ca0e46
|
ContactListener and contact events
|
2015-09-10 21:25:34 +01:00 |
|