Commit Graph

163 Commits

Author SHA1 Message Date
Nicolás Badano
cbafe05f76 Merge pull request #3082 from acemod/deterministicOverheatingX
Deterministic overheating (updated)
2016-02-04 16:03:30 -03:00
PabstMirror
35333cbe9d Merge branch 'cargoCleanup' 2016-02-04 12:51:52 -06:00
PabstMirror
397a12056a Merge branch 'master' into deterministicOverheatingX 2016-02-02 17:11:00 -06:00
PabstMirror
17a882fe4d Add findUnloadPosition integration 2016-01-26 18:01:01 -06:00
esteldunedain
782934c4b2 Add the setApproximateVariablePublic function to common 2016-01-19 16:58:07 -03:00
PabstMirror
7e84a9d9b0 Add getter, readd old public funcs, add blockSprint 2016-01-19 09:39:06 -06:00
PabstMirror
9a3972de76 Unified Status Effect Handler 2016-01-19 09:39:05 -06:00
commy2
abf516aeb1 manual merge 2016-01-06 15:57:09 +01:00
commy2
e6be1537cd replace more private with private keyword in common 2015-12-14 13:17:48 +01:00
commy2
bd3c79f739 add function to retrieve the control of the stamina bar 2015-12-12 20:25:42 +01:00
PabstMirror
0b9044e3c7 Merge pull request #2753 from acemod/showHudSetter
Showhud setter
2015-11-25 11:16:21 -06:00
Thomas Kooi
4a19fcc5a5 Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation
inWater -> isUnderwater
2015-11-20 22:28:43 +01:00
PabstMirror
e0506f29bc Read settings from paramsArray (params in description.ext)
for now just limited to SCALAR/BOOL
2015-11-06 20:46:06 -06:00
commy2
a0bfcdd04c Revert "rename hasHatch to canTurnOut, change description in function header"
This reverts commit 932f09ce60.
2015-10-28 19:01:47 +01:00
commy2
932f09ce60 rename hasHatch to canTurnOut, change description in function header 2015-10-28 18:57:47 +01:00
commy2
643f4d36dc add FUNC(hasHatch) 2015-10-28 08:01:25 +01:00
BaerMitUmlaut
c227f05f8a Deprecated isWater 2015-10-19 23:28:50 +02:00
Glowbal
76efdbcc1c Merge pull request #2257 from jonpas/parseList
Parse List Common Function
2015-10-18 12:14:18 +02:00
PabstMirror
bec884e581 showHud handler 2015-10-15 22:33:05 -05: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
040a63bd8f Merge pull request #2254 from acemod/waitUntilAndExecute
Add WaitUntilAndExecute Function
2015-10-04 11:45:54 +02:00
commy2
38422e6586 fix missing magazines after certain scenarios 2015-10-04 01:26:38 +02:00
commy2
2fe142032e rework modifier key, cleanup sandbags, tripod, ladder, fix #2590 2015-09-26 03:16:55 +02:00
jokoho48
998fbcc403 Merge remote-tracking branch 'remotes/acemod/master' into waitUntilAndExecute
Conflicts:
	addons/common/XEH_postInit.sqf
2015-09-25 13:19:19 +02:00
jonpas
2e3014daa3 Merge branch 'master' into parseList
Conflicts:
	addons/common/functions/fnc_assignObjectsInList.sqf
2015-09-21 22:46:01 +02:00
commy2
8503d15c9b more common code cleanup 2015-09-21 18:37:19 +02:00
commy2
1a4ebdac51 more common code cleanup 2015-09-21 17:32:21 +02:00
commy2
5adca6616d Merge branch '323cleanuphitpoints' into commoncleanup10 2015-09-21 13:24:12 +02:00
commy2
e8ebe87450 more common code cleanup 2015-09-20 15:52:40 +02:00
commy2
1636e3976d more common code cleanup 2015-09-19 20:17:38 +02:00
commy2
c7d636a533 more common code cleanup 2015-09-19 01:50:17 +02:00
commy2
85fd9d9d75 more common code cleanup 2015-09-18 21:46:21 +02:00
commy2
2674310e65 remove another deprecated function 2015-09-18 18:45:41 +02:00
commy2
1fd2fcafb0 remove old, not working functions 2015-09-18 18:34:29 +02:00
commy2
1b96caedc0 more common code cleanup 2015-09-18 18:28:19 +02:00
commy2
7efcfcc8a0 more common cleanup 2015-09-18 15:40:51 +02:00
jonpas
8fc061bfd6 Merge branch 'master' into parseList 2015-09-05 20:16:59 +02:00
PabstMirror
789de9d111 runAfterSettingsInit helper func 2015-09-03 00:11:49 -05:00
PabstMirror
cbccd898ea Run functions after setting init 2015-09-02 23:58:24 -05:00
commy2
c3beee8261 make use of getHitpointsDamage command to drastically speed up some functions about hitpoints 2015-08-30 21:13:29 +02:00
PabstMirror
275f04d876 preInit defines and fix func name 2015-08-25 13:18:59 -05:00
jonpas
ef2924623f Added common parseList function for module list parsing 2015-08-24 21:45:02 +02:00
Glowbal
d3aa6a7f6b Added missing assign modules 2015-08-15 15:49:41 +02:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
ViperMaul
c9d9f78e5b Add headBugFix button to ACE Options Dialog #1738 2015-07-28 15:17:19 +01:00
PabstMirror
b47a17230b Merge branch 'master' into 10digitGrids2 2015-07-16 17:26:19 -05:00
SilentSpike
d036639b46 Adding hideUnit functions to ace_common 2015-07-03 02:14:58 +01:00
PabstMirror
c1dd2df57a Move grid funcs and map long,lat,altitude to common 2015-06-30 12:26:51 -05:00
jonpas
04c06b51ed Fixed #1632 - CheckPBOs kick serverCommand changed to display 46 2015-06-15 20:23:16 +02:00
PabstMirror
6ab8b129fa Merge branch 'master' into multipleDevices
Conflicts:
	addons/common/XEH_postInit.sqf
2015-06-13 12:30:35 -05:00