Commit Graph

1091 Commits

Author SHA1 Message Date
ab769757d9 Skip Depends Hitpoints - Use HitPoints selPos for wheels
Stuff

Normalize Depends - Skip Glass Repair

Fix spawned wheel/track not having correct damage

getHitpointString robustness, hatchback fuelHitpoint, fix count errors

-

Formatting

local -> private

Fix Stuff
2015-11-20 21:11:50 -06:00
4e93b9c72d 2307 - Repair sub-turrets
Privates

Cleanup debug

Add repair actions for sub turrets

Cleanup

Fix Header

Error Handling

Cleanup setHitpointDamage

Fix common ACE_isEngineer to handle scalar or bool

Claim and release repair objects (wheel/track)

Repair sub-turrets
2015-11-20 21:11:05 -06:00
4a19fcc5a5 Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation
inWater -> isUnderwater
2015-11-20 22:28:43 +01:00
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
d1dff4a24a Merge branch 'master' into fixForEachDeleteAt
# Conflicts:
#	addons/common/XEH_postInit.sqf
2015-11-18 13:27:04 +00:00
49d4f233d9 Revert commit a718c82780 2015-11-18 13:19:12 +00:00
5cbfe4f2a5 local -> private 2015-11-17 14:02:20 -06:00
896615beb1 Merge pull request #2826 from acemod/settingsParamsArray
Read settings from paramsArray (params in description.ext)
2015-11-17 14:01:16 -06:00
5823749f0c Merge branch 'master' into settingsErrorChecking 2015-11-17 14:00:22 -06:00
6d04156f69 local -> private 2015-11-17 13:56:55 -06:00
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
a718c82780 Implement nice index deletion iteration solution
Previously when iterating over an array and modifying the same array via deletion of the current index, incorrect means was used to account for the change in index resulting in any further deletions being applied to the wrong elements.

This solution does not require duplication of the array or the use of external variables to track the number of deleted elements. We simply lower the `_forEachIndex` by 1 whenever an element is removed.
2015-11-17 16:02:56 +00:00
561f6126dc fix missing bracket 2015-11-17 13:34:34 +01:00
f3c5c64390 fix Issue with forEach Loops and deleteAt Index 2015-11-17 04:31:17 +01:00
5b16638ae5 Always force param settings 2015-11-08 11:22:41 -06:00
826b4fd20b Cleanup 2015-11-06 20:53:05 -06:00
e0506f29bc Read settings from paramsArray (params in description.ext)
for now just limited to SCALAR/BOOL
2015-11-06 20:46:06 -06:00
c91789f3c4 Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking 2015-11-06 20:30:12 -06:00
a3443cae43 Merge pull request #2780 from acemod/fixTimeInComments
Changed ACE_time back to time in comments where appropriate
2015-11-04 13:04:05 -06:00
cfba7c01e8 Merge branch 'master' into settingsErrorChecking
Conflicts:
	addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
bd97c1ee96 fix Docu in waitUntilAndExecute 2015-11-02 12:05:43 +01:00
8f473b4a27 Removed all assignTeam occurrences 2015-10-30 16:50:13 +01:00
049d40b96e change description in function header 2015-10-28 19:02:54 +01:00
a0bfcdd04c Revert "rename hasHatch to canTurnOut, change description in function header"
This reverts commit 932f09ce60.
2015-10-28 19:01:47 +01:00
932f09ce60 rename hasHatch to canTurnOut, change description in function header 2015-10-28 18:57:47 +01:00
643f4d36dc add FUNC(hasHatch) 2015-10-28 08:01:25 +01:00
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
c227f05f8a Deprecated isWater 2015-10-19 23:28:50 +02:00
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
16180686d2 PV GVAR(settings) after modules, add error debug 2015-10-18 18:49:03 -05:00
76efdbcc1c Merge pull request #2257 from jonpas/parseList
Parse List Common Function
2015-10-18 12:14:18 +02:00
fa7299ba1b Add array info to header 2015-10-16 08:28:54 -05:00
bec884e581 showHud handler 2015-10-15 22:33:05 -05:00
616bc9f8a0 local-private waitAndXX PFEH 2015-10-04 11:38:31 -05:00
f3e61e2136 Merge branch 'master' into commonCleanupX 2015-10-04 11:31:05 -05:00
d9595b6176 fix fnc_binocularMagazine on remote and dead units 2015-10-04 12:10:08 +02:00
42ce11cfee Merge pull request #2679 from acemod/340missingmags
fix missing magazines after certain scenarios
2015-10-04 11:46:36 +02:00
040a63bd8f Merge pull request #2254 from acemod/waitUntilAndExecute
Add WaitUntilAndExecute Function
2015-10-04 11:45:54 +02:00
a2b6166aa0 optimization waitUntilAndExecute, add comments 2015-10-04 11:43:13 +02:00
59da3e1c35 Optimize PFEH Funcs 2015-10-03 23:05:46 -05:00
c75d219b65 Cleanup Undefined Functions 2015-10-03 21:34:46 -05:00
38422e6586 fix missing magazines after certain scenarios 2015-10-04 01:26:38 +02:00
1fdedb5785 delay scroll wheel init 2015-09-30 19:29:17 +02:00
9f3615ea06 change function header of removeEventhandler and waitAndExecute to public: yes 2015-09-30 00:14:21 +02:00
6e24d2868c Fix playerChanged event 2015-09-28 22:41:45 -05:00
bc8cefa5e7 manual merge 2015-09-28 21:06:40 +02:00
34793ce044 Merge pull request #2635 from acemod/340interactcleanup
Code Cleanup Interaction
2015-09-28 21:04:28 +02:00
4521df0a57 Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter 2015-09-28 16:17:12 +02:00
db2572acfd Merge branch 'master' into parseList
Conflicts:
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
2015-09-28 16:06:32 +02:00
9189148b3f more interaction cleanup 2015-09-28 15:37:18 +02:00