Commit Graph

10556 Commits

Author SHA1 Message Date
commy2
25a3405d1f required addons apex, close #4020 2016-07-11 12:01:47 +02:00
Glowbal
dbac1c6398 Merge branch 'apex' into release 2016-07-11 11:16:50 +02:00
Glowbal
02f08939f2 Merge pull request #4052 from acemod/fix4049
Mine detector optimization and cleanup
2016-07-11 11:16:16 +02:00
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
esteldunedain
9323314da5 Merge branch 'fix4049' of github.com:KoffeinFlummi/ACE3 into fix4049 2016-07-09 20:04:20 -03:00
esteldunedain
165bd4b3f8 Make volume consistent 2016-07-09 20:00:53 -03: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
PabstMirror
3ac1525a3d Add base icon 2016-07-09 12:11:58 -05: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
Glowbal
f86d8d113c Merge branch 'release' 2016-07-09 11:36:49 +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
esteldunedain
071201ea46 Remove the pistol cursor from the mine detector 2016-07-07 19:03:14 -03: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
esteldunedain
2a36fec793 Make the detector AI compatible 2016-07-07 12:38:53 -03: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
esteldunedain
6160fe076d Add an event when a mine is detected to allow hooking into missions 2016-07-07 11:17:57 -03:00
esteldunedain
244bdb093d Add clicks when activating/deactivating the detector 2016-07-07 11:17:09 -03:00
esteldunedain
7a25c53dd3 Switch say2D to playSound 2016-07-07 10:51:34 -03:00
commy2
2a84865302 add event handler for reload mutex 2016-07-07 15:47:37 +02:00
commy2
bf7fde0d65 enable gunbag for all non-machinegun primary weapons 2016-07-07 09:47:02 +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
esteldunedain
ce0da11aed Clip sound duration to below 0.5 s to avoid it stacking into itself when using say 2016-07-06 22:23:34 -03:00
esteldunedain
f73b6b1aad - Restore the config of detector sounds through CfgSounds
- Add the possibility of switching between headphones or speaker
- Move detector actions to their own submenu
2016-07-06 22:14:26 -03:00
esteldunedain
34654fffb7 Add function to allow using playSound3D on CfgSounds classes 2016-07-06 21:31:06 -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
esteldunedain
30532983a1 Improve the positioning of the detector point 2016-07-04 19:32:40 -03:00
esteldunedain
e26eda3ac2 - Optimize getDetectedObject
- Cache detected mines for 0.15 s
- Call detectorLoop every 0.05 s instead of 0.01s
- Compile a dictionary of detectable classnames from config at start
- Switch to playSound3d for global effect
- Remove dummy
- Change config entries to support playSound3d
- Cache getDetectorConfig for better interaction menu performance
- Change sound to mono wss
- Close #4049
2016-07-04 19:04:58 -03: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