Commit Graph

816 Commits

Author SHA1 Message Date
b0352fdeb9 Merge branch 'master' into eol-lf 2016-06-02 17:02:09 +02:00
590d4fa70b Merge branch 'master' into abolishExecRemoteFnc 2016-06-02 14:28:43 +02:00
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
d7b239f487 Merge pull request #3795 from acemod/deprecate-components
Add Deprecate components support
2016-05-31 10:40:24 +02:00
fd26e2e44e Merge pull request #3516 from acemod/cbamissiontime
replace timePFH with CBA_missionTime
2016-05-30 21:23:57 +02:00
7512c4e52e manual merge 2016-05-30 21:14:34 +02:00
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
e7fa02d0d9 Merge pull request #3812 from acemod/cbaDelayedExecFnc
Use new CBA delayed execution functions and deprecate ACE functions
2016-05-30 21:02:29 +02:00
94b5cea3cf Merge pull request #3814 from acemod/cbaBinocularMagazineFnc
Use new binocular magazine CBA functions and deprecate ACE functions
2016-05-30 21:00:43 +02:00
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros
Use new quoted function macros
2016-05-30 21:00:23 +02:00
882aa26ab2 Merge pull request #3813 from acemod/cbaGetItemObjectConfig
Use new CBA get config functions and deprecate ACE functions
2016-05-30 21:00:05 +02:00
816da2aef1 Normalize to LF line endings 2016-05-30 18:37:03 +02:00
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
84eca899a9 Add event renaming system
Allows us to switch event names such that anyone currently using our old event framework and names won't have their code broken until it is deprecated in version 3.8.0
2016-05-23 14:03:55 +01:00
108ff4f644 Replace ACE event system calls with CBA counterparts
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
2016-05-22 16:47:39 +01:00
f0b8da33c4 Deprecate ACE events framework
CBA 2.4.0 entirely replaces the ACE events framework.

Adds wrappers with deprecated warnings to all of the public event framework functions and removes all of the underlying GVARs and code.
2016-05-22 16:09:49 +01:00
bd0e05d7d6 Use CBA config functions, return correct value 2016-05-22 16:18:24 +02:00
38b48390b5 Call CBA binocular functions - leave as wrapper 2016-05-22 16:03:41 +02:00
bbd96f9e71 Call CBA delayed execution functions, remove ACE's PFH for handling them 2016-05-22 16:01:12 +02:00
4b121480bb Use new binocular magazine CBA functions, deprecate ACE functions 2016-05-22 15:48:03 +02:00
d35e89892c Use new get item and object config CBA functions, deprecate ACE functions 2016-05-22 15:36:31 +02:00
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
472e4631d6 Deprecate delayed execution functions 2016-05-22 15:25:59 +02:00
d902d1182a Replace ace_common_fnc_execRemoteFunc with events 2016-05-21 23:55:48 +02:00
c9ea5676ea travis test 2016-05-21 13:29:42 +02:00
e40c814b04 Merge branch 'master' of https://github.com/acemod/ACE3 into improve_getTurretX 2016-05-21 13:27:51 +02:00
d395fcd792 travis pls 2016-05-21 13:22:13 +02:00
aee4d23bdb fullCrew new parameter to improve FUNC(getTurretX) 2016-05-21 13:07:17 +02:00
f69142dd45 Hearing - New XEH, Fix dead effects, Medical var (#3802)
* Hearing - New XEH, Fix dead effects, Medical var

* Use setHearingCapability

* Cleanup dead player vol update

* Don't change global hearing in medical

* Fix exitWith
2016-05-20 11:23:14 -05:00
da70854568 manual merge 2016-05-18 11:48:27 +02:00
473149b8ca revert changes from other PR to make it compatible 2016-05-16 15:22:37 +02:00
cac7b9c0c3 optional param to skip deprecated warning 2016-05-16 15:15:51 +02:00
487400b142 Add different warning messages based on current version of component 2016-05-15 20:13:10 +02:00
3d74c25c97 Add deprecate component solution 2016-05-15 19:38:24 +02:00
c5275813a4 use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it 2016-05-14 10:49:09 +02:00
895bf2580a Merge pull request #3773 from J3aLeiNe/master
fnc_getMGRSdata.sqf update3
2016-05-13 15:59:24 -05:00
dd6241e376 Merge pull request #3778 from acemod/fixGetWeaponState
fix getWeaponState, fix #3777
2016-05-11 22:57:25 +02:00
078c1d585f Add Kerama Islands by "Les Vétérans"
add Kerama Islands by "Les Vétérans" with the correct latitude (default config latitude : 1°)
2016-05-11 00:01:35 +02:00
53c9a96c77 fix getWeaponState, fix #3777 2016-05-10 22:14:01 +02:00
c619bcb5a3 Fix "jacobi" latitude and elevationOffset 2016-05-10 19:39:01 +02:00
29e7dbf757 fnc_getMGRSdata.sqf update3 2016-05-10 12:39:56 +02:00
ed9d05d6dd Merge pull request #3753 from acemod/blockEngine-statusEffect
Add blockEngine status effect
2016-05-07 22:40:05 +02:00
d79cbe0844 Getmgrsdata update2 (#3736)
* correct mildot reticle LRPS/AMS/KHS

correct mildot reticle LRPS/AMS/KHS

* replace 1 tab with 1 space

replace 1 tab with 1 space

* fix tab

* ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes

ace_scope : correct mildot reticle for LRPS and SOS 2D/PiP SFP scopes,
same opticszoommax/min for each scopes : 1µ (1meter for 1000meter) / 4µ
(4meter for 1000meter),
LRPS :  variable magnification / SOS : 2 magnifications

* fnc_getMGRSdata.sqf update2

fnc_getMGRSdata.sqf update2

* fnc_getMGRSdata.sqf update2

add new maps, in alphabetic order now
2016-05-07 22:37:58 +02:00
82f8eb758c Removed remaining usage of player (#3710) 2016-05-07 22:27:33 +02:00
b8abec0c61 Fix Capitalization of ACE Settings classes. (#3627) 2016-05-07 22:14:56 +02:00
e125911c3b Added blockEngine status effect 2016-05-03 20:52:43 +02:00
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
d40735d5c2 Improve synced event error logging 2016-04-25 15:48:24 -05:00
efc956eb99 Merge pull request #3692 from acemod/unloadOnSlopes
Better handle unloading on slopes
2016-04-22 10:40:16 -05:00