Commit Graph

18 Commits

Author SHA1 Message Date
PabstMirror
4a8344e1a4 Merge branch 'master' into userActionPrototype
Conflicts:
	addons/interact_menu/ACE_Settings.hpp
	addons/interact_menu/stringtable.xml
	extensions/CMakeLists.txt
2015-06-13 15:05:57 -05:00
PabstMirror
78dec5debc Merge branch 'master' into userActionPrototype
Conflicts:
	addons/interact_menu/XEH_preInit.sqf
2015-05-16 22:49:09 -05:00
Glowbal
b68f02333e Merge branch 'master' into medicalExtension 2015-05-14 16:27:41 +02:00
jaynus
bf732a2a02 Changed: Disable snprintf_s usage to get around auto-vectorization in the 2015 STL strnlen implementation 2015-05-13 11:17:43 -07:00
jaynus
9f3a57bf32 Changed: checkFiles extension check prints version returned by extension
Changed: Build changed to SSE2 instead of defaulting to AVX.
2015-05-13 09:57:24 -07:00
jaynus
3ff9ea230a initial pick from vehicledamage for new extension build process. 2015-05-13 08:34:14 -07:00
PabstMirror
e6889f1634 Merge branch 'master' into userActionPrototype 2015-05-04 14:21:49 -05:00
Glowbal
c2388aa80c Initial work on medical extension 2015-05-04 00:02:39 +02:00
PabstMirror
bdc967d3a9 Extension to parse text for image path 2015-05-03 13:44:02 -05:00
jaynus
433bb21ccc ACE clipboard extension to bypass clipboard limit of arma. Close #991 2015-05-02 13:13:24 -07:00
KoffeinFlummi
984a1fe337 Rename breakLine to break_line 2015-05-01 02:14:23 +02:00
jaynus
93bcf7e9a1 Added versioning to build process and automated version/git integration. 2015-04-21 16:49:30 -07:00
firefly2442
c81fa61f2e match to exact directory name (case-sensitive) 2015-04-14 22:34:58 -05:00
esteldunedain
6f4bb48489 Merge branch 'master' into linearMenuExperiment
Conflicts:
	addons/attach/stringtable.xml
	addons/interact_menu/stringtable.xml
	addons/interaction/stringtable.xml
	addons/laser_selfdesignate/stringtable.xml
	addons/magazinerepack/stringtable.xml
	addons/overheating/stringtable.xml
	extensions/CMakeLists.txt
2015-04-14 19:09:57 -03:00
esteldunedain
d06e1b4a2a Break line extension 2015-04-11 22:22:19 -03:00
jaynus
2261225ad3 Extension moved into cmake, extensions rebuilt. 2015-04-09 09:52:57 -07:00
jaynus
1ae6f2daba Why doesnt flummi's work? 2015-04-03 15:41:29 -07:00
jaynus
caecf9b21b Cmake framework for cross-platform extensions and building. 2015-04-03 13:46:53 -07:00