Merge remote-tracking branch 'origin/physics' into water

Browse Source

# Conflicts:
#	include/Core/Engine.h
#	include/Physics/PhysicsSystem.h
#	src/game/Game/PadSystem.cpp
#	src/game/Physics/PhysicsSystem.cpp

...

This commit is contained in:

tleety

2015-09-17 17:37:58 +02:00

parent b69413d9c9 442554812d

commit b32934dba6

15 changed files with 47028 additions and 39 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

assets/Textures/Park_1.jpg

BIN

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 3.2 MiB