KoffeinFlummi f16f282abd Merge remote-tracking branch 'origin/release' into master-fix ...

Conflicts:
	addons/medical/functions/fnc_handleDamage.sqf
	extensions/common/p3d/animation.cpp
	extensions/common/p3d/compressed.cpp
	extensions/common/p3d/compressed.hpp
	extensions/common/pbo/archive.cpp
	extensions/common/pbo/search.cpp
	extensions/common/pbo/search.hpp
	extensions/common/shared.hpp
	extensions/common/simplepipe_win32.cpp
	extensions/common/simplepipe_win32.hpp
	extensions/common/simulation/object.cpp
	extensions/common/simulation/object.hpp
	extensions/common/targetver.h
	extensions/common/vector.hpp

2015-05-20 19:31:55 +02:00

..

directx

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

glm

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

p3d

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

pbo

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

simulation

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

ace_common.cpp

Cmake framework for cross-platform extensions and building.

2015-04-03 13:46:53 -07:00

ace_common.h

Added versioning to build process and automated version/git integration.

2015-04-21 16:49:30 -07:00

ace_version_win32.rc.in

Added versioning to build process and automated version/git integration.

2015-04-21 16:49:30 -07:00

ace_version.hpp.in

Added versioning to build process and automated version/git integration.

2015-04-21 16:49:30 -07:00

arguments.hpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

CMakeLists.txt

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

dispatch.hpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

easyloggingc++.hpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

logging.hpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

lzoconf.h

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

lzodefs.h

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

membuf.hpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

minilzo.c

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

minilzo.h

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

shared.cpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

shared.hpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

simplepipe_win32.cpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

simplepipe_win32.hpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

singleton.hpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

targetver.h

Merge remote-tracking branch 'origin/release' into master-fix

2015-05-20 19:31:55 +02:00

transform_matrix.hpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

vector.cpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00

vector.hpp

initial pick from vehicledamage for new extension build process.

2015-05-18 20:58:32 +02:00