 tleety
|
45711500f7
|
Merged
|
2015-10-01 14:24:06 +02:00 |
|
|
tleety
|
52dec86925
|
Particle system up and running, but with bugged rendering
|
2015-10-01 14:14:51 +02:00 |
|
|
tleety
|
2491dd8b74
|
Fixed some things, code up to styleguide
|
2015-09-30 10:29:56 +02:00 |
|
|
tleety
|
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 |
|
 viktorljung
|
cb48b881b7
|
cool fixes and stuff
|
2015-09-25 05:33:10 +02:00 |
|
|
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
|
effc9ff781
|
Merge and some small fixes
|
2015-09-25 01:49:08 +02:00 |
|
|
tleety
|
c624c5bcf3
|
Merge master
|
2015-09-25 00:03:28 +02:00 |
|
|
viktorljung
|
d2301594ce
|
Gravity scale per entity
|
2015-09-25 00:01:24 +02:00 |
|
|
tleety
|
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 |
|
|
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
|
8ca01ae9c7
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
include/Core/Engine.h
src/game/Game/PadSystem.cpp
src/game/Physics/PhysicsSystem.cpp
|
2015-09-17 17:11:37 +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 |
|
 PlatinumSkink
|
c2d29b6110
|
Added ScoreEvent, added score to bricks. Stage resets after all bricks are destroyed.
|
2015-09-15 17:31:22 +02:00 |
|
|
viktorljung
|
8963e94cd6
|
pad moving with physics velocity
|
2015-09-15 14:27:35 +01:00 |
|
|
PlatinumSkink
|
ce878ac1db
|
Lives kind of work, and so does the demo!
|
2015-09-15 13:35:04 +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
|
586f8d438c
|
changed box size/scale
|
2015-09-11 11:04:22 +01:00 |
|
|
viktorljung
|
6932a22d7a
|
Rotation right this time
|
2015-09-11 10:48:15 +01:00 |
|
|
PlatinumSkink
|
ead7c6c754
|
Merge remote-tracking branch 'origin/master' into LevelSystemAndSuch
|
2015-09-11 10:51:52 +02:00 |
|
|
PlatinumSkink
|
c829315598
|
Ball hitting bricks destroys bricks! We can PLAY! (kind of)
|
2015-09-11 10:50:49 +02:00 |
|
|
viktorljung
|
d0549403ab
|
Probably removes bodies safely
|
2015-09-10 23:10:25 +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 |
|
|
viktorljung
|
0983d76444
|
Working rotations and positions
|
2015-09-10 18:12:15 +01:00 |
|
|
viktorljung
|
a98806d551
|
Make box on entity commit
|
2015-09-10 16:27:14 +01:00 |
|
|
viktorljung
|
ce342f695f
|
Base PhysicsSystem.
|
2015-09-09 20:46:04 +01:00 |
|