PabstMirror
ba3ecf2a0a
Merge pull request #2321 from acemod/HearingStuff
...
Hearing stuff
2015-08-31 13:24:29 -05:00
PabstMirror
38122ffeaf
Merge pull request #2197 from acemod/mapOpenCloseEvents
...
Map open close events / MapTools Cleanup
2015-08-31 13:23:10 -05:00
commy2
f15805d1f3
setStructuralDamage function
2015-08-31 20:05:38 +02:00
commy2
e1d683d8dc
laserpointer with new command lineintersectssurface
2015-08-31 17:31:37 +02:00
SilentSpike
397d77e5b5
Remove special goggles treatment of vehicle units
...
The condition to disable the overlay for gunners introduces more problems (and inconsistencies for that matter) than it was worth. Vehicle gunners using camera based weapons should probably consider not wearing a pair of glasses/goggles before doing so.
2015-08-31 15:25:40 +01:00
SilentSpike
543e829278
Fix goggles overlay for FFV seats
...
When aiming down sights, view is considered to be "gunner" and so the overlay would be disabled. Introduces addition canUseWeapon check if view is "gunner" to differentiate FFV seats from regular gunner seats
2015-08-31 14:56:51 +01:00
SilentSpike
5e57cad669
Merge pull request #2216 from acemod/isolateZeusMenuKeybind
...
Prevent CBA keybindings in zeus interface
2015-08-31 14:41:48 +01:00
SilentSpike
04269831e8
Consider modifier keys for zeus interaction hack
...
The hacky keybind detection method should consider modifier keys also to prevent keybinds on the same key with different modifiers from firing
2015-08-31 14:40:31 +01:00
PabstMirror
4be7411a05
Use "visibleMapChanged" event
2015-08-30 15:26:43 -05:00
commy2
7a4c37c085
disable all actions on ladders by default, close #2289
2015-08-30 22:03:45 +02:00
commy2
fae38a2232
tripod hmgs should have 100rnd mags instead of 500rnd mags, fix #1190
2015-08-30 20:20:00 +02:00
commy2
c18af0d34b
completely prevent ace_optics from interfering with any mission camera scripts
2015-08-30 19:30:44 +02:00
commy2
74dfd73167
fix issues with pip optics camera in virtual arsenal
2015-08-30 19:05:35 +02:00
commy2
8d589ea8f0
solution for custom cameras (for intros) being broken with ACE
2015-08-30 15:50:51 +02:00
commy2
fc6f97e09e
fix autoriflemen spawning with 0x frag grenade bug
2015-08-30 13:30:21 +02:00
commy2
610bb7a1df
better animation for spotting scope, fix #1638
2015-08-30 13:10:25 +02:00
commy2
58ec4a68cb
fix weapon select in ffv slots not working
2015-08-30 12:01:13 +02:00
commy2
4682235d8a
increase reach in 3rd person for opening doors, fix #2301
2015-08-30 11:13:26 +02:00
commy2
32300a0a80
objectParent command replacing fnc_getBackpackAssignedUnit
2015-08-30 10:45:14 +02:00
PabstMirror
910bb151e2
#1988 - Boost explosive hearing damage
2015-08-30 01:47:40 -05:00
PabstMirror
8307ccea96
firedNear - use new isKindOf
2015-08-30 01:37:14 -05:00
PabstMirror
2f54cfadbc
Merge pull request #2146 from jokoho48/codeCleanupHearing
...
Code cleanup of Hearing module
2015-08-30 01:18:47 -05:00
KoffeinFlummi
6a17e3fa83
Merge remote-tracking branch 'origin/master'
2015-08-30 00:42:46 +02:00
KoffeinFlummi
5f63290508
Merge branch 'ptbr'
2015-08-30 00:42:31 +02:00
Glowbal
b968a32ea2
Merge pull request #2260 from acemod/updateMainConfig
...
Update Main Config File
2015-08-30 00:37:46 +02:00
KoffeinFlummi
a7f2a7fefc
Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3
2015-08-30 00:35:11 +02:00
PabstMirror
f67809b18c
Merge branch 'master' into mapOpenCloseEvents
2015-08-29 16:43:24 -05:00
PabstMirror
22f8b2e8c2
Merge pull request #2305 from acemod/attachEventHandlers
...
Attach event handlers
2015-08-29 16:35:51 -05:00
PabstMirror
fa3a0213b7
Merge pull request #2249 from acemod/captiveFFV
...
Captive ffv animation fix + cleanup
2015-08-29 15:39:23 -05:00
Glowbal
998bc2d45a
Merge pull request #2297 from acemod/addMoreHearingProtection
...
Add Hearing Protection to Helmets with Peltor Headsets
2015-08-29 22:34:59 +02:00
Joko
91a8463198
Merge pull request #2299 from acemod/FixTactialLadderAnimation
...
Fix Tactical Ladder Animation Clipping
Fixes #2287
2015-08-29 22:33:08 +02:00
SilentSpike
620136a1a7
Merge branch 'master' into spectator
...
Conflicts:
AUTHORS.txt
2015-08-29 21:20:04 +01:00
PabstMirror
0b3b3871ff
Merge pull request #2065 from acemod/hearingDisableZeus
...
Setting to disable hearing for zeus RC
2015-08-29 15:15:14 -05:00
PabstMirror
d06680e2a0
#1571 - Handle Null Attached Objects
2015-08-29 11:47:56 -05:00
SilentSpike
200f44d963
Adjust spectator camera speed based on height
...
Slows the camera movement close to the ground as it feels more natural when spectating units up close and such
2015-08-29 16:05:04 +01:00
PabstMirror
6eba898301
Merge pull request #2160 from acemod/updatingBaseClass150
...
realisticnames 1.50 Updating Base Class Changes
2015-08-29 09:55:25 -05:00
PabstMirror
f6c752045c
Cleanup
2015-08-29 09:38:57 -05:00
Glowbal
354e4410d1
Merge pull request #2268 from gienkov/pulse-enhancement
...
HR and BP enhancement
2015-08-29 11:47:00 +02:00
Glowbal
70c0edf436
Merge pull request #2283 from acemod/cargoCanInteract
...
Add canInteractWith checks for cargo
2015-08-29 11:45:50 +02:00
PabstMirror
007859d42e
Attach - getin/out/killed event handlers ( #2200 #2300 )
2015-08-28 16:57:16 -05:00
jokoho48
3269114861
Fix Tactical Ladder Animation Clipping
2015-08-28 11:55:32 +02:00
bux578
19a6226ced
add Hearing Protection to Helmets with Peltors
2015-08-28 09:10:58 +02:00
PabstMirror
80d18c468e
Merge pull request #2244 from acemod/wireCuttersConfigAndCleanup
...
wirecutters config for fences + cleanup
2015-08-27 16:01:31 -05:00
ViperMaul
a86ff93c16
Merge pull request #2052 from MikeMatrix/logMacros
...
ACE specific logging macros
2015-08-26 21:52:20 -07:00
Michael Braun
93106697ab
Added debug log macros
2015-08-27 06:21:02 +02:00
ViperMaul
d38cb31240
Merge pull request #2109 from acemod/pushSubmaine
...
Push SDV sub, cleanup push
2015-08-26 21:03:46 -07:00
PabstMirror
bc016eac4c
1.50 - use new didJip command (Ref #2241 )
2015-08-26 22:39:27 -05:00
ViperMaul
5ea98143e2
Merge pull request #2211 from jonpas/integrateAsdg
...
Integrated ASDG JR Optional
2015-08-26 17:53:32 -07:00
jonpas
6d27299883
Cleaned up spare parts collection after SettingsInitialized, Check if vehicle already in collection
2015-08-26 23:43:06 +02:00
jonpas
48e0f5757d
Merge branch 'master' into trackToTrackedVehicles
...
Conflicts:
addons/repair/stringtable.xml
2015-08-26 23:38:51 +02:00
jonpas
ef1b4cbd26
Merge branch 'master' into trackToTrackedVehicles
...
Conflicts:
addons/repair/XEH_preInit.sqf
2015-08-26 23:33:05 +02:00
jonpas
6a6c5008c0
Merge branch 'master' into repairHitpointStrings
...
Conflicts:
addons/repair/functions/fnc_doRepair.sqf
2015-08-26 23:29:36 +02:00
Glowbal
f7679b45ad
Merge pull request #2246 from jonpas/repairHitpointGroups
...
Repair Hitpoint Groups Framework
2015-08-26 23:27:08 +02:00
PabstMirror
9c8e9732ed
Add canInteractWith checks for cargo
2015-08-26 16:26:08 -05:00
jonpas
ce8da8d720
Fixed Full Repair available even when vehicle is already fully repaired
2015-08-26 23:09:46 +02:00
jonpas
b6d5db9157
Reverted IGNORED_HITPOINTS, Added Taru glasses to it
2015-08-26 23:09:04 +02:00
jonpas
cc70580a93
Improved comments
2015-08-26 22:51:41 +02:00
jonpas
e4123c9730
Added 2 strings, changed 1
2015-08-26 22:44:30 +02:00
jonpas
8529e5c9b7
Merge branch 'master' into trackToTrackedVehicles
2015-08-26 21:25:08 +02:00
PabstMirror
ca991712e8
Merge pull request #2270 from acemod/codeCleanUpMicroDagr
...
Code Cleanup MicroDagr Module
2015-08-26 11:03:22 -05:00
PabstMirror
4cf81b493a
Fix stringtable and more cleanup
2015-08-26 11:00:59 -05:00
Michael Braun
9ca19def70
Added autoformatting variations for log macros
2015-08-26 17:09:31 +02:00
jonpas
dc2e146e8b
Merge branch 'master' into repairHitpointStrings
...
Conflicts:
addons/repair/functions/fnc_addRepairActions.sqf
2015-08-26 17:04:05 +02:00
jonpas
c0379c7809
Updated with correct cargo events and settings category
2015-08-26 17:02:29 +02:00
Michael Braun
fd204d972d
Fixed issue with ERROR conflicting with log level input
2015-08-26 16:45:28 +02:00
Michael Braun
5f6584ba3f
Added Log format macros for use with not printing it to the log.
2015-08-26 15:53:03 +02:00
ulteq
f1d41731fb
Merge pull request #2149 from jokoho48/codeCleanupHuntIR
...
Code cleanup of HuntIR module
2015-08-26 15:48:29 +02:00
Michael Braun
a17d94c213
Removed semicolon of log macro
2015-08-26 14:12:17 +02:00
Michael Braun
5a0e95dcf0
Simplified log macros
2015-08-26 14:04:17 +02:00
Grzegorz
5ad0e192c3
Fix being able to TQ torso
2015-08-26 11:18:54 +02:00
Glowbal
19bfa478d1
Revert use of param in action string
2015-08-26 10:13:30 +02:00
Glowbal
0d7e7fa0cc
should be type of
2015-08-26 10:08:32 +02:00
Glowbal
81068e6086
fixed dragging getWeight
2015-08-26 10:05:30 +02:00
Glowbal
1a0abf31fd
fix global variable in local name space
2015-08-26 09:11:43 +02:00
Glowbal
65e16da998
fix missing semi column and bracket
2015-08-26 09:10:29 +02:00
Glowbal
13740c06e4
Merge pull request #1816 from voiperr/ace_map_dev
...
Flashlight simulation on map
2015-08-26 09:01:30 +02:00
gienkov
6a123020d2
fail to find BP on limbs with TQ on
2015-08-26 08:55:50 +02:00
Glowbal
fb5563e7ba
Merge pull request #2048 from MikeMatrix/codeCleanupSwitchunits
...
Code cleanup of Switchunits module
2015-08-26 08:51:22 +02:00
Glowbal
5bec26c721
Merge pull request #2086 from jokoho48/codeCleanUpDragging
...
Code cleanup of Dragging module
2015-08-26 08:45:30 +02:00
Glowbal
222e0183ed
Merge pull request #2202 from jonpas/cargoEvents
...
Cargo Events
2015-08-26 08:36:31 +02:00
Glowbal
ad7716a25e
Merge pull request #2233 from gienkov/patch-27
...
Increase "load in bodybag" action time to 15s
2015-08-26 08:36:06 +02:00
Glowbal
d97dfce2d3
Merge pull request #2245 from jonpas/repairHitpointSelections
...
Custom Hitpoint Repair Positions Framework
2015-08-26 08:33:01 +02:00
Glowbal
a139a3cccc
Merge pull request #2263 from gienkov/patch-30
...
Bandage and tourniquet on adv. medical change proposal
2015-08-26 08:30:59 +02:00
jokoho48
ca71dd43e1
Code Cleanup MicroDagr Module
2015-08-26 05:31:33 +02:00
Grzegorz
b8a29bfd44
@jokoho482 suggestion
2015-08-26 03:00:43 +02:00
gienkov
cae5f828fb
run check only on arms
2015-08-26 02:51:05 +02:00
gienkov
c3af5e81e7
fix my error
2015-08-26 02:41:12 +02:00
gienkov
5a9817322b
remove tabs
2015-08-26 02:39:34 +02:00
gienkov
8498589920
pulse zero on limb with TQ on
2015-08-26 02:37:51 +02:00
PabstMirror
bcb6c474a0
Merge pull request #2250 from acemod/fixExportColors
...
- Fix Exporting Color Arrays
2015-08-25 16:42:26 -05:00
Felix Wiegand
3098794951
Merge pull request #2194 from NemesisRE/patch-1
...
Changed german strings for aid kit
2015-08-25 23:18:21 +02:00
PabstMirror
2c64cca44d
Merge pull request #2236 from acemod/hugeChangeToInteractMenu
...
Compile Self Menu, set "Default Params" to array instead of code
2015-08-25 13:34:30 -05:00
Grzegorz
5280ded680
Bandage and tourniquet on adv. medical change proposal
...
Make bandaging longer as it is not very fast process.
Make putting on tourniquet faster cause it's should be easy to put one on limb, so it's actually useful now and with above change (putting it on before was longer than bandagin).
2015-08-25 20:05:05 +02:00
jokoho48
8d29170551
fixing Spelling Issues
...
Change from DEBUG_SETTINGS_CORE to DEBUG_SETTINGS_MAIN
2015-08-25 19:33:10 +02:00
ulteq
f0cc1ca333
Merge pull request #2015 from jokoho48/codeCleanupAB
...
Code cleanup of the Advanced Ballistics module.
2015-08-25 18:56:45 +02:00
jokoho48
2af486ab6b
Update Main Config File
2015-08-25 18:34:10 +02:00
SilentSpike
ffcf0ecf7d
Merge pull request #2253 from gienkov/spectator-pl-translation
...
Translate spectator strings to polish
2015-08-25 16:25:14 +01:00
voiper
e237bea88c
Dimmed the glow values.
2015-08-24 15:43:43 -07:00
voiper
f8f8d7fd19
Simplified the colour check again.
2015-08-24 15:43:21 -07:00
voiper
54f1a87222
Simplified the colour check.
2015-08-24 15:42:12 -07:00
