 viktorljung
|
f41e126bd6
|
Merge remote-tracking branch 'origin/master' into Physics
|
2015-10-21 15:40:43 +02:00 |
|
|
viktorljung
|
f4ffead4f2
|
Animations and stuff
|
2015-10-21 15:40:19 +02:00 |
|
 tleety
|
0f506bfe35
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
|
2015-10-20 15:57:40 +02:00 |
|
|
viktorljung
|
a85a703991
|
animations!
|
2015-10-20 11:02:03 +02:00 |
|
|
viktorljung
|
9e8d176999
|
Animation models and stuff
|
2015-10-19 16:48:42 +02:00 |
|
 Jace
|
e195e69408
|
Working DirectX textures
|
2015-10-19 13:39:00 +02:00 |
|
|
tleety
|
05f54b5ff9
|
Merge branch 'master' of github.com:teamfisk/AgileBreakOut into Tobias
|
2015-10-16 12:36:08 +02:00 |
|
|
tleety
|
84c3a78275
|
Kraken texture and model added
|
2015-10-16 12:32:55 +02:00 |
|
|
Jace
|
a35d72cac3
|
Working skeletal animations!!!
|
2015-10-15 12:48:28 +02:00 |
|
|
viktorljung
|
b8e1f6fcde
|
Added brick break, needs more work with the removal code and particles
|
2015-10-13 16:18:46 +02:00 |
|
|
viktorljung
|
9fe2324913
|
Lifebuoy updated, now dies after 4 hits
|
2015-10-08 21:51:43 +02:00 |
|
|
viktorljung
|
52ab09d0b1
|
Added brick models and Lifebuoy balance changes
|
2015-10-08 20:08:42 +02:00 |
|
|
viktorljung
|
b93013fcd8
|
Lifebuoy working
|
2015-10-08 17:22:19 +02:00 |
|
|
viktorljung
|
18ffddb2ac
|
White bricks added
|
2015-10-08 14:03:38 +02:00 |
|
|
viktorljung
|
f085e6a387
|
Water can now collide with the bricks, added new ship model
|
2015-10-08 11:27:17 +02:00 |
|
|
viktorljung
|
791c3ce69c
|
Some fixes to the brick models
|
2015-10-06 15:30:11 +02:00 |
|
|
viktorljung
|
43e0a5b699
|
Rectangle shape now has the size of the rigidbody, not scale
|
2015-10-06 13:31:23 +02:00 |
|
|
viktorljung
|
005fd40167
|
Added IceBrick and started to remove the scale dependency for physics bodies
|
2015-10-05 16:25:00 +02:00 |
|
|
viktorljung
|
39f4215c2b
|
Merge remote-tracking branch 'origin/master' into Physics
Conflicts:
include/Physics/PhysicsSystem.h
src/game/Physics/PhysicsSystem.cpp
|
2015-10-01 14:13:51 +02:00 |
|
|
viktorljung
|
cbaca42a3c
|
Changed SquidModel
|
2015-10-01 14:04:21 +02:00 |
|
|
Jace
|
5e0b0f920a
|
Fixed your asset loading fuckups
|
2015-09-28 22:46:35 +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 |
|
|
viktorljung
|
bc6b037923
|
Added submarine pad
|
2015-09-24 20:54:57 +02:00 |
|
|
viktorljung
|
72413dc0a9
|
Added submarine model and texture files
|
2015-09-24 20:31:47 +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
|
442554812d
|
Collisions kind of working
|
2015-09-17 14:11:09 +01:00 |
|
|
tleety
|
5e39ac3629
|
Added a low poly brick model and changed their ingame scale
|
2015-09-15 18:20:26 +02:00 |
|
|
tleety
|
f19f7bf56a
|
Added a few models and removed ortho camera perspectiv.
|
2015-09-15 17:05:47 +02:00 |
|
|
Jace
|
c3f3df3d9f
|
Fixed unit quad with texture coordinates
|
2015-09-10 22:38:44 +02:00 |
|
|
Jace
|
de0b960353
|
Added unit quad to core assets
|
2015-09-10 22:09:42 +02:00 |
|
|
Jace
|
98e363eda6
|
Initial structure
|
2015-09-04 10:02:06 +02:00 |
|