Commit Graph

8638 Commits

Author SHA1 Message Date
esteldunedain
0236c16e8f Cache volume attenuation due to earplugs and headgear 2016-02-18 13:48:40 -03:00
PabstMirror
930c2f84c6 Call updateHearingProtection at settings init 2016-02-17 09:49:00 -06:00
PabstMirror
649b0c28e2 Calculate hearing protection coefficient on events 2016-02-16 18:17:42 -06:00
PabstMirror
8fed9325c9 Fix flashbang 2016-02-16 13:02:25 -06:00
PabstMirror
749425dfb7 Settings Category, Minor Cleanup 2016-02-16 12:58:42 -06:00
esteldunedain
698b934801 Increase the volume of the residual woosh when ringing is disabled 2016-02-06 14:49:56 -03:00
esteldunedain
9a8dd3e2ad Fix stringtable 2016-02-06 14:49:28 -03:00
esteldunedain
354ed0cab2 Trace instead of sideChat 2016-02-06 14:11:18 -03:00
esteldunedain
2f1e96ae4f Overhaul ACE_Hearing and change default settings. 2016-02-06 13:59:31 -03:00
PabstMirror
d69af47030 Merge branch 'master' of https://github.com/acemod/ACE3 2016-02-05 16:49:39 -06:00
PabstMirror
e3e9d19ca1 Fix "key" capitalization for Interaction_GetOut 2016-02-05 16:49:36 -06:00
commy2
0032e7aa9a Merge pull request #3267 from acemod/removeSwagWalkFix
Remove Swag Walk Fix
2016-02-05 21:59:57 +01:00
commy2
43e8620039 Merge pull request #3274 from acemod/setallgearremote
setAllGear - abort function and print warning when used on remote units,
2016-02-05 21:58:54 +01:00
commy2
f33beb9865 update movement config comments 2016-02-05 21:31:08 +01:00
commy2
d89c93de22 setAllGear - abort function and print warning when used on remote units, 2016-02-05 21:14:20 +01:00
Nicolás Badano
027de27e33 Merge pull request #3268 from acemod/fix3140
Document the locality requirements of fnc_setAllGear.
2016-02-05 10:19:57 -03:00
esteldunedain
dbe7e294a5 Document the locality requirements of fnc_setAllGear. Close #3140 2016-02-05 10:18:36 -03:00
esteldunedain
b2d050afca Close #3188, Close #3260 2016-02-05 09:46:51 -03:00
Nicolás Badano
d26fc4614f Merge pull request #3266 from SzwedzikPL/overheatingStringtableFix
Fix overheating stringtable
2016-02-05 09:35:29 -03:00
Thomas Kooi
0850ab35e3 Merge pull request #3262 from acemod/nozzleFixes
fix some issues with Fuel Nozzle
2016-02-05 09:15:27 +01:00
Thomas Kooi
f47b51c0cb Merge pull request #3070 from dixon13/newCivInteraction
Changes to civilian interaction
2016-02-05 09:14:45 +01:00
dixon13
a0e6f97125 Updated condition for ACE_GetOut 2016-02-05 00:32:56 -07:00
SzwedzikPL
270b557084 fix overheating stringtable 2016-02-05 04:55:05 +01:00
Nicolás Badano
dadec15948 Merge pull request #2104 from acemod/trenches
Trenches
2016-02-04 23:43:06 -03:00
Nicolás Badano
9930231cda Merge pull request #3265 from acemod/fix3264
Remove extra PREPs in the ACE_Zeus
2016-02-04 23:41:33 -03:00
esteldunedain
b6581cf5ef Fix #3264 2016-02-04 21:00:40 -03:00
esteldunedain
2577992dfc Progress bar localization 2016-02-04 20:43:32 -03:00
esteldunedain
7da6e2a35f Reduce the placement distance 2016-02-04 18:47:30 -03:00
esteldunedain
8c187cbf07 Adjust big trench height 2016-02-04 18:47:17 -03:00
esteldunedain
4cd0028794 Add animation and progresive digging 2016-02-04 18:43:47 -03:00
esteldunedain
3d47156547 Rename some variables 2016-02-04 17:42:12 -03:00
Joko
a6d84eca8e add GitHawk to AUTHORS 2016-02-04 21:08:34 +01:00
esteldunedain
2d45a28863 Merge branch 'master' into trenches 2016-02-04 17:04:09 -03:00
jokoho48
dc3026366a remove unneeded files
fix hard edge in model
add LOD
2016-02-04 20:52:28 +01:00
Glowbal
8c0472bbeb Merge branch 'master' of github.com:acemod/ACE3 2016-02-04 20:35:15 +01:00
Thomas Kooi
8741c3665d Merge pull request #3261 from acemod/Fix-french-translation-string
Fix french translation refresh marker interval
2016-02-04 20:35:55 +01:00
Glowbal
f1ce133d32 Merge branch 'release'
Conflicts:
	addons/refuel/functions/fnc_connectNozzle.sqf
2016-02-04 20:34:32 +01:00
Thomas Kooi
653f6567cc Fix french translation refresh marker interval
As per @alganthe's comment on #3114
2016-02-04 20:30:51 +01:00
Thomas Kooi
543d54d37e Merge pull request #3114 from Luigium/master
Fixed and added French Translation
2016-02-04 20:28:00 +01:00
Thomas Kooi
727cb38be6 Merge pull request #3218 from SzwedzikPL/fix3202
Fix laser_selfdesignate does not measure the distance
2016-02-04 20:17:06 +01:00
PabstMirror
54870f872a Disable Debug 2016-02-04 13:16:41 -06:00
Nicolás Badano
c967bd1ace Merge pull request #3259 from acemod/fix3denGoggles
Fix ACE_goggle changing the tint on the 3den camera
2016-02-04 16:08:02 -03:00
Nicolás Badano
cbafe05f76 Merge pull request #3082 from acemod/deterministicOverheatingX
Deterministic overheating (updated)
2016-02-04 16:03:30 -03:00
Thomas Kooi
dd3613c357 Merge pull request #3190 from acemod/fcs_enableGMG
Add FCS to more things
2016-02-04 20:03:19 +01:00
Thomas Kooi
893040b08a Merge pull request #3102 from buddytex/SandbagEditor
Add Sandbag to editor
2016-02-04 20:00:51 +01:00
Thomas Kooi
f26fb9e9da Merge pull request #3107 from jonpas/headless
Add Dynamic AI Group Tranferring to Headless Clients
2016-02-04 20:00:16 +01:00
Thomas Kooi
a3f80dbc30 Merge pull request #3230 from acemod/draggingStuff
Fix dragging moving object to random location
2016-02-04 19:58:56 +01:00
Thomas Kooi
ce27575de3 Merge pull request #3244 from acemod/fixScopesCapturingKeys
Fix ace_scopes capturing native adjustment keys for the PSO scope.
2016-02-04 19:58:21 +01:00
Thomas Kooi
508f6a16ae Merge pull request #3162 from acemod/Refuel_Fuelbladders
Refuel - Add refuel actions to fuel bladder objects
2016-02-04 19:57:50 +01:00
Thomas Kooi
8c9523e36b Merge pull request #3151 from acemod/explosives_cleanup_plus_minetriggers
Various explosives enhancements
2016-02-04 19:56:27 +01:00