 William Moberg
|
90f05442aa
|
Merge branch 'master' into BoxModelCollision
# Conflicts:
# include/Engine/Core/Octree.h
# resources/Schema/Entities/CollisionTestLevel.xml
# src/Engine/Collision/CollisionSystem.cpp
# src/Engine/Core/Octree.cpp
|
2016-01-27 10:52:27 +01:00 |
|
 Jace
|
4245264029
|
Weapon RayZ
Weapon RayZ
|
2016-01-25 11:26:33 +01:00 |
|
|
Jace
|
ca2aab449e
|
Basic movement and camera management between players and editor
|
2016-01-22 16:12:51 +01:00 |
|
|
William Moberg
|
de7c8e9234
|
WIP, collision detects too much, no resolving for most cases.
|
2016-01-21 17:10:36 +01:00 |
|
|
Jace
|
627108c6ee
|
Fixes for #30
# Conflicts:
# src/Game/Game.cpp
|
2016-01-14 18:15:38 +01:00 |
|