Commit Graph

68 Commits

Author SHA1 Message Date
PabstMirror
3c53a314d4 Merge remote-tracking branch 'refs/remotes/origin/master' into cba-log-macros 2016-09-22 15:10:30 -05:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323)
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
2016-09-04 16:44:22 +02:00
commy2
f76457f48f convert log macros to cba versions 2016-08-22 21:06:52 +02:00
PabstMirror
db78dd53a8 Cleanup Merge and remoteFnc events 2016-06-02 19:59:18 -05:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
jonpas
590d4fa70b Merge branch 'master' into abolishExecRemoteFnc 2016-06-02 14:28:43 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
commy2
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
bux578
b4cb49ffec Merge pull request #3836 from acemod/fix_null_rallypoint
fix rallypoint being objNull, when created via 'createvehicle'
2016-05-29 13:57:44 +02:00
commy2
bc6f756df4 fix rallypoint being objNull, when created via 'createvehicle' 2016-05-29 13:22:49 +02:00
commy2
1bd44e562a replace a comma with semi colon 2016-05-29 11:44:00 +02:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
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
jonpas
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
jonpas
d902d1182a Replace ace_common_fnc_execRemoteFunc with events 2016-05-21 23:55:48 +02:00
commy2
c5275813a4 use 'getUnitLoadout' instead of 'FUNC(getAllGear)' and deprecate it 2016-05-14 10:49:09 +02:00
Cuel
66c2bf0506 Fix dead bodies removal, when forced = 1
- Removed unused(?) GVAR(Module)
- Removed "white space alignment" in module.sqf
2016-05-03 20:10:28 +02:00
commy2
8233661d55 remove unused non API functions 2016-02-24 09:39:39 +01:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
PabstMirror
db50b5313d getName can return raw or sanatized html tags 2015-12-11 12:01:50 -06:00
commy2
a8228f60c2 fix configFile capitalization 2015-11-30 17:23:02 +01:00
commy2
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
commy2
42ce11cfee Merge pull request #2679 from acemod/340missingmags
fix missing magazines after certain scenarios
2015-10-04 11:46:36 +02:00
commy2
f0036fabbb use BIS fnc for time format 2015-10-04 02:15:38 +02:00
commy2
38422e6586 fix missing magazines after certain scenarios 2015-10-04 01:26:38 +02:00
commy2
94eaeb38cc move variable out of params 2015-10-01 21:34:40 +02:00
commy2
7f1f56c121 fix broken time format for rallypoints, fix #2662 2015-10-01 21:28:00 +02:00
commy2
6d9943ff2e fix wrong macro, missing ; 2015-09-26 16:45:39 +02:00
commy2
b1fb7befe8 remove wrong isServer check 2015-09-26 16:32:29 +02:00
commy2
5425836e47 cleanup respawn module, close #2184 2015-09-26 16:28:18 +02:00
commy2
30ba4f5586 this append should've been pushBack 2015-09-18 23:34:49 +02:00
commy2
56f4cbb39e fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513 2015-09-18 23:03:35 +02:00
Michael Braun
a5fb09a7e1 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/repair/functions/fnc_moduleRepairSettings.sqf
2015-09-09 02:55:12 +02:00
bux578
9e1ae58f4f fix restore gear 2015-09-03 18:17:53 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
bux578
3d9b0d527c fix indentation
atom needed the editorconfig package
2015-08-15 18:58:31 +02:00
bux578
675cfc2da7 after respawn select last weapon, muzzle and mode
#2138
2015-08-15 18:54:39 +02:00
PabstMirror
7eb26c8710 #1699 - Rally point object names 2015-07-01 01:27:06 -05:00
PabstMirror
4e8fc49b5e Always remove fakeWeapon after adding
Should fix #1500
2015-06-05 15:38:45 -05:00
jonpas
9fbf256acd Merge branch 'master' into macroSTR
Conflicts:
	addons/hearing/functions/fnc_putInEarplugs.sqf
	addons/interact_menu/ACE_Settings.hpp
2015-06-04 17:13:09 +02:00
bux578
ee85aab791 fix #1439 2015-06-04 14:30:38 +02:00
jonpas
763cb07629 Macro STRING to LSTRING 2015-05-28 21:59:04 +02:00
jonpas
6072e14077 Changed all strings to macros (except external) 2015-05-27 19:04:25 +02:00
commy2
aabe532829 manual merge 2015-04-26 21:26:57 +02:00
commy2
9cb27c8fb2 fix: error when getting killed with FF-messages module, fix #745 2015-04-19 07:08:57 +02:00
PabstMirror
ed2e847247 More Privates 2015-04-17 18:13:09 -05:00
PabstMirror
dce344c85f Ignore Case 2015-04-17 16:51:27 -05:00
commy2
d68cc8f40e sync rallypoint marker on jip 2015-04-15 20:50:03 +02:00
commy2
18be5276a9 rally point moved eh, markers at rallypoint positions 2015-04-15 19:18:42 +02:00
commy2
bf8f9b4818 all I need is a $ 2015-04-15 15:34:01 +02:00