fd2fd3241e
Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm
2015-11-23 19:37:10 +01:00
cbe8d98f86
Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel
2015-11-23 19:29:05 +01:00
931c6830fc
Added reset
...
It's now possible to reset a fuel truck by console command:
[fuel_truck] call ace_refuel_fnc_reset
2015-11-23 19:28:51 +01:00
763df43fbc
Added possibility to disallow rearm
...
> vehicle setVariable ["ace_rearm_disabled", true, true];
Also added ammo compatibility for RHS Mi24 with turret
2015-11-23 17:08:06 +01:00
3be60a2f6e
Merge pull request #2842 from acemod/fcsUpdateDisplay
...
Update FCS display after distance adjust
2015-11-23 16:34:09 +01:00
d2538c6ff2
Add spectator text chat
...
Turns out custom radio channels are kind of a pain to work with. However this should work fine assuming the radioChannelAdd commands will work on client machines.
2015-11-22 20:03:10 +00:00
113ac0f370
Minor improvements
...
fnc_reset is still WIP
2015-11-21 23:24:24 +01:00
f07f06c843
Merge pull request #2760 from acemod/spectatorUpdates
...
Spectator updates
2015-11-21 15:00:44 +00:00
c2564de5ef
Fix UBC for 1.54
...
Soldiers no longer inherit hitpoints from CaManBase
Adds a macro to deal with them
2015-11-20 23:27:29 -06:00
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
839c022b84
Fix broken repair point selection code
...
Only valid hit selection + hit point combinations are usable for repair points:
- Empty hit points mean there isn't enough information to display to the user
- Empty hit selections mean that the hit point doesn't actually exist
2015-11-20 21:11:23 -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
d0cb09196d
Merge branch 'master' of github.com:acemod/ACE3
2015-11-20 23:29:33 +01:00
67345b0178
Fix incorrect variable
...
_items was the old variable name.
2015-11-20 23:28:52 +01:00
979ff8b479
Local -> private
2015-11-20 16:13:20 -06:00
0f62168250
Merge pull request #2840 from acemod/fixOverpressure
...
Overpresure - Misc fixes
2015-11-20 15:38:24 -06:00
08813c1b75
Convert local keywords to private
2015-11-20 15:36:37 -06:00
801120fb39
Merge pull request #2841 from acemod/medicalAiBandage
...
Move bandage log before basic exit
2015-11-20 22:28:55 +01:00
4a19fcc5a5
Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation
...
inWater -> isUnderwater
2015-11-20 22:28:43 +01:00
a652be8248
Merge pull request #2847 from BaerMitUmlaut/cleanup-moduleAmbianceSound
...
Cleanup ambient sounds module
2015-11-20 22:27:57 +01:00
063042cb36
Merge pull request #2777 from acemod/interactionAnimationSetting
...
Interaction Menu Animation Setting And PreExpand First Level
2015-11-20 14:56:37 -06:00
7b526a99a3
Cleanup
2015-11-20 14:53:16 -06:00
f9a77a62ab
Merge pull request #2766 from acemod/settingsErrorChecking
...
Add Error Checking to Settings + MapGesture Settings
2015-11-20 14:51:31 -06:00
c4117e1283
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
69b53af1d3
1.54 - Replace typeName with isEqualType
2015-11-20 11:40:31 -06:00
dd7c71eeee
Merge pull request #2852 from acemod/updateMakepy
...
make.py - update for new mikros tools
2015-11-20 10:34:48 -06:00
9a9029fa49
Merge pull request #2839 from acemod/abFixTwist
...
AB - Fix ACE_twistDirection
2015-11-20 10:32:28 -06:00
e81dd0729e
Inventory Resize UI - changes for 154 GL-Mags
2015-11-19 15:54:43 -06:00
cf9235c926
make.py - update for new mikros tools
2015-11-19 00:28:28 -06:00
f8e293d04d
Localise spectator hotkeys in help window
2015-11-18 15:18:21 +00:00
0567d1c2a1
Fix spectator unit list key press handling
...
By setting maxHistroyDelay really high, the unit list shouldn't be messed with via key press very often.
2015-11-18 15:02:17 +00:00
0110ada1b5
Fix zeus waypoint formation actions
2015-11-18 14:54:17 +00: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
3b2b7fd78d
Merge pull request #2821 from dudakov/master
...
Russian Translations - Update
2015-11-18 08:30:46 +01:00
ebbf2b373a
goggles - prevent CBA PFEH warning
...
fix "x\cba\addons\common\fnc_removePerFrameHandler.sqf:30","WARNING:
Invalid or not existing PFH ID."
2015-11-17 23:44:50 -06:00
da16fc1038
\addons\captives\stringtable.xml - resolving conflicts.
2015-11-18 06:50:00 +03:00
f8481ae5f2
Merge branch 'master' of https://github.com/acemod/ACE3.git into develop
...
Conflicts:
addons/captives/stringtable.xml
2015-11-18 06:39:58 +03:00
d6000ae985
local -> private
2015-11-17 14:33:17 -06:00
3ec9fca73e
local -> private
2015-11-17 14:06:12 -06:00
75d80be143
Merge branch 'master' into interactionAnimationSetting
2015-11-17 14:05:31 -06: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
a7b5945a12
Merge pull request #2849 from acemod/localtoprivate
...
replace local keyword with private
2015-11-17 19:37:38 +01: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
23e110d7ce
Remove depreciated spectator hotkey
2015-11-17 15:26:34 +00:00
b6f9a2b776
Merge pull request #2703 from jonpas/removeAdjustedProneOptics
...
Remove enable optics in adjusted prone stances
2015-11-17 16:24:27 +01:00
