Commit Graph

9 Commits

Author SHA1 Message Date
TheMagnetar
2b80285ad7 Removed pedantic errors. Mainly extra ';' in namespace definitions 2015-09-08 21:53:29 +02:00
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
PabstMirror
d6946f6e8f Fix min/max defines in extensions
Error C2589 '(': illegal token on right side of '::' from std::min
because windows.h defines
2015-05-18 22:15:16 -05:00
jaynus
e4fb652dd2 initial pick from vehicledamage for new extension build process. 2015-05-18 20:58:32 +02:00
jaynus-linux
1dd8dc3bfb cross platform macros and port added for linux for all extensions. Should be transparent 2015-05-17 10:10:02 -07:00
jaynus
99c04d0ed3 Fixed: shared_ptr vs. unique_ptr behavior in VS2013 2015-05-14 07:42:21 -07:00
jaynus
3ff9ea230a initial pick from vehicledamage for new extension build process. 2015-05-13 08:34:14 -07:00
jaynus
93bcf7e9a1 Added versioning to build process and automated version/git integration. 2015-04-21 16:49:30 -07:00
jaynus
caecf9b21b Cmake framework for cross-platform extensions and building. 2015-04-03 13:46:53 -07:00