bux578
35ecef454f
Merge pull request #2825 from gienkov/pl-translation
...
pl translation
2015-11-29 07:35:04 +01:00
PabstMirror
8d2b612570
Remove nametags and actions on hidden units
...
Fix #2596
2015-11-28 21:35:25 -06:00
SilentSpike
c426bfc9c1
Merge pull request #2888 from acemod/repairPositions
...
Define custom repair points for a few vehicles
2015-11-28 20:09:37 +00:00
Thomas Kooi
5282e95668
Merge pull request #2876 from acemod/medicalTranslateHP
...
Medical Fixes
2015-11-28 20:58:08 +01:00
Thomas Kooi
ced94d73a7
Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone
...
[REMADE] RoadCone_F and its inhered RoadBarrier_F intractable
2015-11-28 20:51:39 +01:00
Thomas Kooi
d7a19cf0a6
Merge pull request #2882 from acemod/fixUGVNametag
...
fix UGV Nametag issue
2015-11-28 20:50:23 +01:00
Thomas Kooi
7dd0af33b4
Merge pull request #2871 from acemod/cleanupLaserpointer
...
cleanup laserpointer
2015-11-28 20:43:31 +01:00
Thomas Kooi
c132ef86cf
Merge pull request #2133 from jonpas/dynamicViewDistance
...
Mk 1 eyeballs Integration
2015-11-28 20:40:29 +01:00
Thomas Kooi
e669f3e2cb
Merge pull request #2699 from BaerMitUmlaut/disable-nvgs-in-sight
...
Disable nvgs in sight
2015-11-28 20:37:30 +01:00
gienkov
f25a181d8e
fix my error
2015-11-28 20:37:29 +01:00
Thomas Kooi
cef01baf0b
Merge pull request #2856 from acemod/isEqualTypeRepalcement
...
1.54 - Replace typeName with isEqualType
2015-11-28 20:36:07 +01:00
Thomas Kooi
b807d1db48
Merge pull request #2886 from acemod/bandageReopen
...
Add all wound types to bandage treatment configs
2015-11-28 20:32:13 +01:00
SilentSpike
a8cf9c6f48
Fix missing boolean inversion
2015-11-28 13:58:56 +00:00
gienkov
2c83fe4a11
refuel translation fixes
2015-11-28 13:45:59 +01:00
gienkov
a906c180ce
remove alpha entries
2015-11-28 13:34:54 +01:00
PabstMirror
a42c2153cc
Error handling for bad setting values array
2015-11-28 01:57:15 -06:00
PabstMirror
f676e6d9c9
Add some more typeNames replacements
2015-11-27 21:23:27 -06:00
PabstMirror
5850f78c1f
Merge branch 'master' into isEqualTypeRepalcement
2015-11-27 21:08:21 -06:00
gienkov
adae379445
fixes
2015-11-27 21:55:05 +01:00
gienkov
b091b73e24
fixes
2015-11-27 21:54:04 +01:00
gienkov
3250245587
3.4.0 translations and fixes
2015-11-27 21:50:57 +01:00
PabstMirror
6031eb8c6e
Add all wound types to bandage treatment configs
...
Fix by adding all config entries;
instead of trying to modify classname
2015-11-27 14:19:26 -06:00
gienkov
7eecff4296
Merge remote-tracking branch 'origin' into pl-translation
...
Conflicts:
addons/captives/stringtable.xml
addons/map_gestures/stringtable.xml
addons/zeus/stringtable.xml
2015-11-27 21:19:25 +01:00
SilentSpike
0ffb9ea5ad
Define custom repair points for a few vehicles
...
Some helicopters have the main rotor point on the tip of a single blade which can be problematic depending on the orientation of the helicopter so those have been moved to the center (to match others). The tail rotor is also in the complete wrong position for some.
2015-11-27 20:06:57 +00:00
ViperMaul
8d4364350c
Fix for "double semicolon detected" error
2015-11-27 10:43:30 -08:00
jokoho48
76435ec228
posible fix for overlapping Speedlimiters
2015-11-27 15:48:03 +01:00
PabstMirror
e51f658ce0
Try base wound class in bandage treatment configs
...
Gets the correct wound for the bandage treatment config
Used for selecting most effective bandage and reopening
_className was something like "velocityWoundMedium"
but configs only had base class "velocityWound"
2015-11-26 23:18:39 -06:00
jokoho48
f364c2a5c3
fix some stuff i mixed up
2015-11-26 23:44:42 +01:00
jokoho48
5f2840bf39
fix that in UGV dont work speedLimiter
2015-11-26 23:39:17 +01:00
jokoho48
5df7eba1eb
remove debug Code
2015-11-26 22:27:46 +01:00
jokoho48
59708ec2f7
fix UGV Nametag RPT Issue #2873
2015-11-26 22:24:06 +01:00
jokoho48
52a6eddb44
fix missing PBOPREFIX
2015-11-26 20:53:14 +01:00
PabstMirror
4aeeefdfe8
Fix UBC and increase Heli_04 Pod interaction distance
2015-11-26 11:47:25 -06:00
PabstMirror
a5c45c137f
Medical - addDamageToUnit Helper
2015-11-26 09:53:12 -06:00
Thomas Kooi
581f71f8a1
Merge pull request #2141 from GitHawk/refuel
...
Adding vehicle refueling
2015-11-26 16:16:13 +01:00
Thomas Kooi
bba0e999ff
Merge pull request #2164 from GitHawk/rearm
...
Adding vehicle rearming
2015-11-26 16:15:09 +01:00
Thomas Kooi
81ab280cb4
Merge pull request #2670 from acemod/simplifyFragConfig
...
Simplify frag config
2015-11-26 16:13:21 +01:00
Thomas Kooi
15267c0433
Merge pull request #2219 from acemod/handSignals
...
Hand signals enhancement
2015-11-26 16:04:41 +01:00
PabstMirror
ca0cfc9bbf
Merge pull request #2861 from acemod/repairRebass
...
Repair Overhaul
2015-11-25 17:00:32 -06:00
PabstMirror
988a5c76bb
Medical - 1.54 Changes
...
1.54 Armor
Translate selectiosn to hitpoints
Calc newDamage using hitIndex (because sel is translated)
Fix isFalling never being reset
Cache hitpointIndex to reset damage
Normalize Limb Armor to 1.54
Cleanup
Cleanup
2015-11-25 11:49:20 -06:00
PabstMirror
0b9044e3c7
Merge pull request #2753 from acemod/showHudSetter
...
Showhud setter
2015-11-25 11:16:21 -06:00
PabstMirror
ac6390c0b3
Add array info to header
2015-11-25 11:07:56 -06:00
PabstMirror
185cae2fe5
Remove Old Gestures from interaction
2015-11-25 11:00:45 -06:00
PabstMirror
095252ef76
Cleanup
...
revert `format ["'%1'", QGVAR()];` as it crashes the game
2015-11-25 10:16:37 -06:00
SilentSpike
c731d83642
Merge pull request #2848 from acemod/fixForEachDeleteAt
...
fix Issue with forEach Loops and deleteAt Index
2015-11-25 14:00:37 +00:00
Thomas Kooi
08c5374a99
Merge pull request #2390 from BaerMitUmlaut/pass-magazine
...
Added interaction to quickly pass a magazine
2015-11-25 14:04:07 +01:00
PabstMirror
36bf2d9cb5
Merge pull request #2803 from BaerMitUmlaut/remove-team-synching
...
Remove manual team synching
2015-11-24 21:37:50 -06:00
PabstMirror
20bf90f3e9
Medical - Fix Hitpoints Macro when building
2015-11-24 16:30:09 -06:00
PabstMirror
575fabb69d
#2872-Map time support for subclasses of ItemWatch
2015-11-24 16:17:06 -06:00
jokoho48
fd1c38c612
Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals
2015-11-24 22:44:32 +01:00
jokoho48
352db4cb66
remove some crap code
...
replace some variables with macros
2015-11-24 22:43:42 +01:00
PabstMirror
cfefb1c40e
Cleanup spotting scope configs
2015-11-24 15:24:14 -06:00
PabstMirror
2c6cfcf294
Merge pull request #2832 from p1nga/Spotting-Scope-Update
...
Updated spotting scope model.
2015-11-24 15:23:12 -06:00
PabstMirror
9ecffcd133
Merge pull request #2746 from acemod/fixFlashlightPrivates
...
fix privates in Map module
2015-11-24 15:18:38 -06:00
IngoKauffmann
f9266764fb
Moved module to ACE_Logistics
2015-11-24 21:33:38 +01:00
IngoKauffmann
1a6730340c
Move module to ACE_Logistics category, removed single interact point
2015-11-24 21:30:08 +01:00
PabstMirror
2c76bc3b10
Merge pull request #2605 from TheNiner/master
...
Fixed Laser Update Position Bug
2015-11-24 13:43:53 -06:00
BaerMitUmlaut
818466d296
Added ACE setting to hide interaction
2015-11-24 19:07:17 +01:00
PabstMirror
51a463de24
Fix tap shoulder msg display
...
Missing efunc on displayTextStructured
Calculate a shoulder side when using keybind
2015-11-24 11:25:56 -06:00
IngoKauffmann
8fc52a4dfb
Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel
2015-11-24 17:57:21 +01:00
PabstMirror
86f7ee2ad2
Merge pull request #2834 from acemod/addEarPlugsLoudness
...
Hearing - Add earplugs based on loudness and give to MGs and fix respawn issues
2015-11-24 10:52:11 -06:00
IngoKauffmann
d4c708e731
Missing ;
2015-11-24 17:33:33 +01:00
PabstMirror
ddc8b16db2
Merge pull request #2857 from acemod/invResize154
...
Inventory Resize UI - changes for 154 GL-Mags
2015-11-24 10:24:06 -06:00
PabstMirror
4ae209ab44
Merge pull request #2865 from acemod/154UBC
...
Fix UBC for 1.54
2015-11-24 10:23:48 -06:00
jokoho48
773b30df33
Merge branch 'master' of https://github.com/acemod/ACE3 into handSignals
2015-11-24 15:14:30 +01:00
PabstMirror
7981faad64
private -> local
2015-11-23 17:47:58 -06:00
PabstMirror
0273dd1d4d
Merge branch 'master' into fixFlashlightPrivates
2015-11-23 17:45:41 -06:00
commy2
1d315bee6f
cleanup laserpointer
2015-11-23 20:52:04 +01:00
IngoKauffmann
fd2fd3241e
Merge remote-tracking branch 'refs/remotes/acemod/master' into rearm
2015-11-23 19:37:10 +01:00
IngoKauffmann
cbe8d98f86
Merge remote-tracking branch 'refs/remotes/acemod/master' into refuel
2015-11-23 19:29:05 +01:00
IngoKauffmann
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
IngoKauffmann
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
commy2
3be60a2f6e
Merge pull request #2842 from acemod/fcsUpdateDisplay
...
Update FCS display after distance adjust
2015-11-23 16:34:09 +01:00
IngoKauffmann
113ac0f370
Minor improvements
...
fnc_reset is still WIP
2015-11-21 23:24:24 +01:00
SilentSpike
f07f06c843
Merge pull request #2760 from acemod/spectatorUpdates
...
Spectator updates
2015-11-21 15:00:44 +00:00
PabstMirror
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
PabstMirror
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
SilentSpike
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
PabstMirror
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
Glowbal
d0cb09196d
Merge branch 'master' of github.com:acemod/ACE3
2015-11-20 23:29:33 +01:00
Glowbal
67345b0178
Fix incorrect variable
...
_items was the old variable name.
2015-11-20 23:28:52 +01:00
PabstMirror
979ff8b479
Local -> private
2015-11-20 16:13:20 -06:00
PabstMirror
0f62168250
Merge pull request #2840 from acemod/fixOverpressure
...
Overpresure - Misc fixes
2015-11-20 15:38:24 -06:00
PabstMirror
08813c1b75
Convert local keywords to private
2015-11-20 15:36:37 -06:00
Thomas Kooi
801120fb39
Merge pull request #2841 from acemod/medicalAiBandage
...
Move bandage log before basic exit
2015-11-20 22:28:55 +01:00
Thomas Kooi
4a19fcc5a5
Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation
...
inWater -> isUnderwater
2015-11-20 22:28:43 +01:00
Thomas Kooi
a652be8248
Merge pull request #2847 from BaerMitUmlaut/cleanup-moduleAmbianceSound
...
Cleanup ambient sounds module
2015-11-20 22:27:57 +01:00
PabstMirror
063042cb36
Merge pull request #2777 from acemod/interactionAnimationSetting
...
Interaction Menu Animation Setting And PreExpand First Level
2015-11-20 14:56:37 -06:00
PabstMirror
7b526a99a3
Cleanup
2015-11-20 14:53:16 -06:00
PabstMirror
c4117e1283
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-20 14:37:23 -06:00
PabstMirror
69b53af1d3
1.54 - Replace typeName with isEqualType
2015-11-20 11:40:31 -06:00
PabstMirror
9a9029fa49
Merge pull request #2839 from acemod/abFixTwist
...
AB - Fix ACE_twistDirection
2015-11-20 10:32:28 -06:00
PabstMirror
e81dd0729e
Inventory Resize UI - changes for 154 GL-Mags
2015-11-19 15:54:43 -06:00
SilentSpike
f8e293d04d
Localise spectator hotkeys in help window
2015-11-18 15:18:21 +00:00
SilentSpike
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
SilentSpike
0110ada1b5
Fix zeus waypoint formation actions
2015-11-18 14:54:17 +00:00
SilentSpike
d1dff4a24a
Merge branch 'master' into fixForEachDeleteAt
...
# Conflicts:
# addons/common/XEH_postInit.sqf
2015-11-18 13:27:04 +00:00
SilentSpike
49d4f233d9
Revert commit a718c82780
2015-11-18 13:19:12 +00:00
bux578
3b2b7fd78d
Merge pull request #2821 from dudakov/master
...
Russian Translations - Update
2015-11-18 08:30:46 +01:00
PabstMirror
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
