Commit Graph

422 Commits

Author SHA1 Message Date
db78dd53a8 Cleanup Merge and remoteFnc events 2016-06-02 19:59:18 -05:00
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
590d4fa70b Merge branch 'master' into abolishExecRemoteFnc 2016-06-02 14:28:43 +02:00
95573ee711 Stringtable URL (#3855)
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
2016-06-01 23:45:51 +02:00
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +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
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros
Use new quoted function macros
2016-05-30 21:00:23 +02:00
99675417c6 QGVAR and fix events in concertina_wire, disarming and explosives 2016-05-25 01:51:58 +02:00
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +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
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
d902d1182a Replace ace_common_fnc_execRemoteFunc with events 2016-05-21 23:55:48 +02:00
dbe70a7094 Merge pull request #3761 from acemod/cleanupExplosiveSync
Fix explosive sync on dedicated server
2016-05-07 22:46:35 +02:00
b8abec0c61 Fix Capitalization of ACE Settings classes. (#3627) 2016-05-07 22:14:56 +02:00
28c65c4bed Fix explosive sync on dedi 2016-05-05 14:36:56 -05:00
83a8c488d9 Merge pull request #3751 from acemod/wipeoutWhitespace
Cleaned up excessive whitespace
2016-05-04 11:46:56 +02:00
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
7d0fcde9fa CZ Translate - Update
04/30/2016
2016-04-30 00:57:24 +02:00
9bd66bc40f Cleanup scopeCurator 2016-04-21 15:07:13 -05:00
c432ce714e Make explosives helpers hidden in eden. 2016-04-21 13:56:32 -05:00
ccaec31a90 Use new QFUNC and QEFUNC macros 2016-04-08 20:43:26 +02:00
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
076803951d Merge pull request #3628 from alef/translation/15bn/alef
Italian translation
2016-03-31 06:54:31 +02:00
666a4030b5 make FUNC(scriptedExplosive) work in scheduled env, ref #3621 2016-03-29 13:21:13 +02:00
e97c7c0f65 Translation: IT completed (with BOM) 2016-03-27 21:22:15 +02:00
e5a7578f92 Translation: IT completed (no BOM) 2016-03-27 21:20:15 +02:00
daceaa9dd8 Merge branch 'master' into settingsNameDescp 2016-03-18 14:48:11 +01:00
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
b5e95f3945 Add some names/descriptions to settings configs 2016-03-08 01:17:40 -06:00
a9578ab473 Merge pull request #3524 from acemod/fixCancelAction
Fix Cancel (RMB) Action
2016-03-06 19:16:40 +01:00
858c68f8d7 Don't use modifier for rotation where not needed 2016-03-06 16:54:27 +01:00
52007fab6a Add sanity checks, fix explosives checks 2016-03-06 12:06:17 +01:00
9f205b4a54 Merge pull request #3509 from acemod/fix3379
Increase interaction distance with explosives from 1m to 1.5m.
2016-03-05 22:08:31 -03:00
ef95e278f9 Fix Cancel Action by moving it to MouseButtonDown display EH 2016-03-03 17:35:43 +01:00
e0493458c0 Reduce interaction distance for defusing back to 1m 2016-03-02 16:19:38 -03:00
928a9b9485 Increase interaction distance with explosives from 1m to 1.5m. Fix #3379 2016-03-02 15:25:41 -03:00
4918dbacb0 Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH 2016-03-02 17:33:46 +01:00
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
309f48ee0b Added remaining PT-BR translarions 2016-03-01 08:56:43 -03:00
8bb7b072d4 Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro.
This prevents any possible confusion when the GVARs are used in code.
2016-02-28 15:18:15 +01:00
c61e7b5104 Tweaked & added translations
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
188941a9b7 Filter the GVAR(explosivesOrientations) list before sending it 2016-02-27 10:07:51 -03:00
fba1a322ac Yet more fixes 2016-02-27 09:50:44 -03:00
823eb116ae more fixes 2016-02-27 09:37:57 -03:00
8280335d07 Fix event name typo 2016-02-27 09:26:42 -03:00
b9e1028f23 Merge branch 'fix3317' of github.com:KoffeinFlummi/ACE3 into fix3317 2016-02-27 09:14:16 -03:00