Glowbal
9b85bc3e29
v3.6.1
2016-07-11 11:15:36 +02:00
Nicolás Badano
aa01c0d940
Merge pull request #4078 from acemod/fixNavalMines
...
Allow defusing naval mines
2016-07-11 00:40:13 +02:00
PabstMirror
74da791610
Proper fix for naval mines
2016-07-10 17:29:19 -05:00
PabstMirror
721bc205ef
Allow defusing naval mines
...
Fix #4074
- Workaround for naval mines not working with deactivate
- Add "isNotSwimming" exception to defuse progress bar
2016-07-10 13:49:06 -05:00
commy2
d249132864
Merge pull request #4062 from acemod/disable-interaction-menu-while-reloading
...
Add reload mutex as canInteractWith condition
2016-07-09 21:03:55 +02:00
jonpas
55c7b9bfc4
Merge pull request #3997 from acemod/gogglesEffectsSetting
...
Add goggle setting for level of effects
2016-07-09 18:48:22 +02:00
jonpas
d9d2302ab8
Merge pull request #4069 from acemod/addAsianStrings
...
Add Korean and Japanese strings to tracker
2016-07-09 18:20:16 +02:00
jonpas
317c36e85c
Merge pull request #4061 from acemod/removegtgt
...
Remove remaining >> signs from interaction menu
2016-07-09 18:17:39 +02:00
BaerMitUmlaut
0a46a83e02
Realistic names for APEX content ( #4055 )
...
* Added realistic names for APEX content
* Fix strings
* Lowercase Polish colors
2016-07-09 18:14:08 +02:00
PabstMirror
ef38144d70
Merge pull request #4051 from acemod/simplifyNews
...
Make ace news fit apex menu style
2016-07-08 15:46:54 -05:00
jonpas
1185375c90
Add Korean and Japanese strings to tracker
2016-07-08 20:00:12 +02:00
commy2
c55c0d5666
only use one waitUntilAndExecute at any time for reload mutex
2016-07-08 15:12:47 +02:00
commy2
35b93e0da9
Merge pull request #4065 from acemod/removeRedundantFnc
...
Remove redundant getMagazineIndex compatibility function
2016-07-07 20:22:50 +02:00
jonpas
0220b57609
Remove redundant getMagazineIndex compatibility function
2016-07-07 20:16:03 +02:00
commy2
be17b72cad
remove old 'gestures' reload mutex
2016-07-07 16:38:24 +02:00
commy2
6569de5332
add event handler for reload mutex
2016-07-07 16:35:07 +02:00
commy2
2a84865302
add event handler for reload mutex
2016-07-07 15:47:37 +02:00
commy2
e39017e27a
add reload mut ex as canInteractWith condition
2016-07-07 09:10:14 +02:00
commy2
8ddc025a16
Merge pull request #4060 from acemod/tweakSpottingScope
...
Tweak spotting scope anims / mem points
2016-07-07 09:02:05 +02:00
esteldunedain
893866ff39
Remove >> signs from interaction menu
2016-07-06 22:38:03 -03:00
PabstMirror
5362a80911
Tweak spotting scope anims / mem points
2016-07-06 16:55:54 -05:00
Glowbal
62a0c49fc2
Merge pull request #4056 from acemod/fixReviveLoop
...
Fix order of revive loop
2016-07-06 13:40:20 +02:00
PabstMirror
450b8dfedb
Fix order of revive loop
...
Fix #4035
Revive loop was killing heartrate before it exited
2016-07-06 00:54:51 -05:00
PabstMirror
4047c44b64
Merge pull request #4047 from acemod/cleanupRefuel
...
Refuel - Simplify Actions, Fix Van_01 config
2016-07-05 20:59:49 -05:00
PabstMirror
022e7747b1
Fix no attack profile on static titan launcher ( #4023 )
2016-07-05 20:58:32 -05:00
jonpas
bd2a063861
Fix pboProject false/true becoming 0/1 in UI config, Default ammoCount to off ( #4041 )
2016-07-05 23:01:25 +02:00
PabstMirror
6c732bf789
Fix action name, put actions on base class
2016-07-05 00:22:47 -05:00
PabstMirror
8a572ace41
Make ace news fit apex menu style
2016-07-04 15:31:25 -05:00
PabstMirror
e40415b628
Add #undef for PREP w/ DISABLE_COMPILE_CACHE
2016-07-04 01:17:30 -05:00
PabstMirror
ea140f63a5
Refuel - Simplify Actions, Fix Van_01 config
2016-07-03 15:17:00 -05:00
Nicolás Badano
08c4731a3a
Merge pull request #4045 from acemod/fixOverheatingBarrels
...
Fix overheating spare barrels
2016-07-03 21:11:13 +02:00
commy2
a5b88d3276
Merge pull request #4034 from acemod/dragKeybind
...
Add Drag/Drop Keybind
2016-07-03 20:43:06 +02:00
commy2
0a5a4d2d33
Fix German word order / capitalization
2016-07-03 20:42:43 +02:00
PabstMirror
5ad1f752ca
Fix overheating spare barrels
...
- Remove ACE_SpareBarrel from CfgWeapons as it is now a magazine
- Don't call updateTemperature in displayTemp, as unit may not be local
- Fix targetEvent error
2016-07-03 12:58:40 -05:00
Nicolás Badano
287adb16e6
Merge pull request #4040 from acemod/fixObscuedInteractionPoints
...
Less aggressive overlap detection
2016-07-03 17:33:10 +02:00
PabstMirror
bbc708e3e0
Less aggressive overlap detection
...
Ensure the 2d screen pos distance is significant.
2016-07-02 22:46:36 -05:00
Nicolás Badano
f2359cb243
Merge pull request #4037 from acemod/fixCargoSpareParts
...
Fix cargo event name - spare parts not being added
2016-07-02 14:19:23 +02:00
PabstMirror
d15330d245
Fix cargo event name - spare parts not being added
2016-07-01 23:14:20 -05:00
PabstMirror
96efbaef53
Add Drag/Drop Keybind
2016-07-01 16:28:44 -05:00
Glowbal
a497690bbd
Merge branch 'master' into apex
2016-06-29 21:44:15 +02:00
Glowbal
a47168e31b
Merge pull request #4019 from acemod/customizable-faction
...
add possibility to overwrite a units faction for determining name tags
2016-06-29 20:16:21 +02:00
Glowbal
eca5263df8
Merge pull request #3998 from acemod/apexUBC
...
Fix UBC for 1.62 Apex
2016-06-29 12:04:21 +02:00
Glowbal
806877492c
Merge pull request #3999 from acemod/fixApexWeapons
...
Fix ballisitics and huntir configs
2016-06-29 12:04:05 +02:00
Glowbal
2fa8141721
Merge pull request #4022 from acemod/apexLauncherConfig
...
Add javelin configs for new apex launchers
2016-06-29 12:03:37 +02:00
PabstMirror
3ae8a494c4
Add javelin configs for new apex launchers
...
Fix #4007
2016-06-28 22:46:04 -05:00
commy2
ab2307996c
add possibility to overwrite a units faction for determining name tags
2016-06-28 23:43:34 +02:00
Glowbal
01c184b174
Merge pull request #4014 from acemod/apexTitanBandaid
...
Handle bad target when using apex titans
2016-06-28 22:01:12 +02:00
Glowbal
4251831e2e
Merge pull request #4009 from acemod/fixRearmEvents
...
Fix rearm events
2016-06-28 20:33:56 +02:00
PabstMirror
20376385ca
Fix #4007 - Handle bad target when using apex titans
2016-06-27 13:43:05 -05:00
Glowbal
f1bf5f8e7b
Merge pull request #4013 from acemod/fix-color-medicaldisplay
...
Fix injuries shown as blue instead of red
2016-06-27 19:57:52 +02:00
