Commit Graph

9655 Commits

Author SHA1 Message Date
commy2
6bf525e6ac fix some Russian grammar (#5817)
* fix some Russian grammar

* fix Russian translations
2017-11-28 13:29:38 -06:00
shukari
87e998650a [MicroDAGR] get the meters for mortars (better rangetable calcs) (#5802)
* get the 10m for mortars

* get the exact meter

* use toFixed

* that evil )

* thx travis
2017-11-28 13:28:42 -06:00
PabstMirror
b2ceeb9936
Captives - Fix handcuff keybind distance check (#5823) 2017-11-26 22:43:45 -06:00
ulteq
ed772ebeb7
Advanced Ballistics - Typo: 'log' -> 'ln' (#5818)
We need to use the natural logarithm here.
2017-11-25 17:45:09 +01:00
Dystopian
d0f256699e Get compile cache back (#5820) 2017-11-25 14:42:04 +01:00
ulteq
af1f36c14a Advanced Ballistics - Muzzle velocity variation
* Simulates slight variations in muzzle velocity between each shot
2017-11-23 14:36:36 +01:00
ulteq
ed872d567c
Advanced Ballistics - Optimized abort conditions (#5811) 2017-11-23 13:44:47 +01:00
ulteq
5ee1df424d
Minor performance tweaks (#5796)
* Medical_ai - Optimize 'fnc_isInjured'
* Laserpointer - Optimize 'fnc_onDraw'
* Overheating - Skip ground detection if possible
* Overheating - Replace function call with inline code
* Overheating - Nest 'firedEH' abort conditions
* Overheating - Remove duplicate code / Skip function call if possible
* Overheating - Cache energy increment
2017-11-23 11:13:58 +01:00
ulteq
f0036847bc
Merge pull request #5791 from acemod/ballistics-initSpeed-revamp
Ballistics - Regenerated vanilla 'initSpeed' config entries
2017-11-23 11:11:35 +01:00
ulteq
df2a7d3853 Tools - Added automated magazine- and weapon class 'initSpeed' calculator 2017-11-23 10:55:47 +01:00
ulteq
8bc77a7b88
Advanced Ballistics - Minor performance tweaks (#5790)
* Advanced Ballistics - Utilize 'linearConversion'

* Advanced Ballistics - Limit config value boundaries
2017-11-22 23:16:17 +01:00
ulteq
7e397b4596
Advanced Ballistics - Removed unused code (#5806) 2017-11-22 23:14:35 +01:00
ulteq
b99a10ad63
Merge pull request #5804 from acemod/scopes-iron-sight-fix
Scopes - Fixed iron sight zeroing
2017-11-22 11:28:28 +01:00
ulteq
c3e1fe31f8
Scopes - Fixed major typo affecting trajectory synchronization (#5805) 2017-11-22 09:59:01 +01:00
ulteq
ce825ce8d3 Scopes - Add 'DISABLE_DISPERSION' helper flag
* Allows you to disable vanilla dispersion for testing purposes by defining 'DISABLE_DISPERSION'
2017-11-21 23:57:12 +01:00
ulteq
91425f8576 Scopes - Added new config entry to fix the iron sight zeroing 2017-11-21 23:57:07 +01:00
PabstMirror
a3160d0d31 Movement - Fix climbing when over water 2017-11-20 19:00:21 -06:00
ulteq
734c68d723 Ballistics - Regenerated vanilla 'initSpeed' config entries
* Updated all vanilla 'initSpeed' config values to match our Advanced Ballistics muzzle velocities (ammo temperature simulation: off)
2017-11-19 15:10:16 +01:00
ulteq
9cad5873d0
Scopes - Adds 'Reset zero' interaction (advanced ballistics only) (#5789)
* Allows you to reset any zero adjustment on your current scope
2017-11-18 13:59:42 +01:00
Dystopian
a0e9b752e9 Add ability to pull dead body out of vehicle (#5630)
* Add ability to pull dead body out of vehicle

* Fix interaction not in vehicle

* Fix interaction with crew of dead vehicle

* Fix medical unload patient when he is dead

* Cleanup

* Fix cargo index, fix menu visible in vehicle
2017-11-17 16:47:58 -06:00
PabstMirror
0672b0da35
Setting Cleanup - Make NoRadio global (#5782) 2017-11-17 16:41:03 -06:00
ulteq
a270ca8a99
Advanced Ballistics - Better diagnostic tools (#5776)
* Makes it easier to detect errors in 3rd party weapon compats
2017-11-17 20:00:57 +01:00
ulteq
aab09584b7
Scopes - Persistent zero adjustments (#5753)
* Makes manual zero adjustments (advanced ballistics only) for each weapon & scope combination persistent across game restarts / mission restarts / weapon or scope changes.
2017-11-17 19:08:03 +01:00
God of Monkeys
257bde4eef Update Chinese stringtable (#5786) 2017-11-17 10:18:54 -06:00
PabstMirror
53bd784380 Remove refuel capability from IDAB water truck (#5783) 2017-11-17 14:48:56 +01:00
nomisum
3f1b755e61 add global event to wirecut start (#5741)
Wirecutter - Add global event when cutting fences
2017-11-16 23:43:49 -06:00
Andrea Verano
4d24840181 Italian Translation Update (#5779)
Added new strings in:
-captives
-common
-cookoff
-finger
-goggles
-hitreactions
-interaction
-magazinerepack
-mk6mortar
-noradio
-overheating
-rearm
-respawn
-scopes
-spectator
-switchunits
-vehiclelock
-weather
-zeus

Fixed some strings in:
-goggles
-magazinerepack
-nightvision
-sandbag
-switchunits
-trenches
-vehiclelock
-weather
2017-11-16 23:35:49 -06:00
PabstMirror
9c7511df0b
Remove missileGuidance setting (#5778) 2017-11-15 15:19:07 -06:00
ulteq
66069519fc
Rearm - Fixed typo in stringtable (#5777) 2017-11-15 20:20:43 +01:00
ulteq
9d383d5add
Settings - Added more categories (#5771) 2017-11-15 20:10:20 +01:00
ulteq
9b6f1879f6 Weather - More natural temperature and humidity randomization (#5754) 2017-11-14 14:43:29 +01:00
ulteq
64c9c7d522 Yardage 450 - Minor performance tweak (#5767)
* Utilize 'params' / 'selectMin' / 'selectMax'
2017-11-14 14:41:36 +01:00
ulteq
827718f748 Magazine Repack - Categorizaton and stringtable overhaul (#5770) 2017-11-14 14:41:14 +01:00
PabstMirror
005c64d174 Map - Allow the pistol flashlight to do illumination (#5766)
Close #5757
2017-11-14 14:40:24 +01:00
Josuan Albin
765d36b4bc Add / Fix missing author entries (#5763)
* Add missing author strings

* Fix dagr author entry
2017-11-13 16:54:34 -06:00
ulteq
3729f377ad
Sort more settings into categories (#5760) 2017-11-13 18:50:24 +01:00
ulteq
31aa478f28
Settings - Utilize 'sliderSettings' (#5756) 2017-11-13 18:50:08 +01:00
ulteq
0a0c43eff0 Rangecard - Fix author string (#5759) 2017-11-13 17:18:08 +01:00
PabstMirror
d1f6b0a9d8 Add support for custom slider settings using ace_settings config (#5750) 2017-11-13 10:27:09 +01:00
ulteq
39c56447d9
Scopes - Hide 'up' direction lettering (#5751)
* Improves readability
2017-11-13 00:37:03 +01:00
PabstMirror
2d3dc6ca99
Restore some modules set to scope = 1 (#5749)
* Restore some modules set to scope = 1

* hide the fries again

* Restore stringtable entries
2017-11-12 12:19:25 -06:00
PabstMirror
f9b89cd07a
Cleanup options menu (#5746) 2017-11-12 11:34:23 -06:00
PabstMirror
3c8d5d6052
Add CBA setting for noRadio (#5571)
* Add ace_setting for noRadio

* Delay adding server EH

* make noradio a cba setting
2017-11-12 11:34:10 -06:00
ulteq
fbaa071a4e
Merge pull request #5747 from acemod/scopes-zeroing-fix
Scopes - Improved zero angle calculation
2017-11-12 14:16:34 +01:00
ulteq
224e2cb777 Scopes - Take rail base angle into account
* Removes fixed angular offsets from the zero angle calculation
2017-11-12 12:21:06 +01:00
ulteq
6b68ff426f Scopes - Fixed zero angle prediction
* Corrects the prediction of the (hair-raising!) zero angle calculation in the vanilla-game
2017-11-12 12:21:03 +01:00
ulteq
afbc8bfb82 Revert "Scopes - Fixes zero on three vanilla weapons (#5696)"
This reverts commit 4c2348cff5.
2017-11-12 11:45:38 +01:00
Dystopian
95434c521b Fix misprint in maptools (#4957) 2017-11-11 23:39:37 -06:00
PabstMirror
93e69adcb5 Wirecutter - Fix net_fence_8m_f on malden (#5744) 2017-11-12 02:15:24 +01:00
ulteq
d4c4e68e42
Overheating - Minor performance tweaks (#5739)
* Don't try to cool down an already cooled barrel
* Don't run the projectile direction update routine if we know that the max. possible deflection is < 0.05 mrad
2017-11-11 20:45:13 +01:00
ulteq
9e11e39eb0
ATragMX - Utilize 'linearConversion' (#5743)
* Improved muzzle velocity table lookup speed
* Improved drag coefficient table lookup speed
2017-11-11 20:44:23 +01:00
PabstMirror
662089a61b QuickMount - Use correct cargo index (#5733) 2017-11-11 20:31:28 +01:00
PabstMirror
cd30b09b4f Convert ACE_settings to CBA_settings (#4895)
* Convert ACE_settings to CBA_settings

* Run Modules Globaly, BWC for SetSetting

* Add support for string settings

* ACE_ServerSettings warning

* Add handler for global setting being changed

* Add deprecated and replaced not to Settings Framework doc

* Remove options menu UI, Move Debug and HeadBug Fix to Options in Pause Menu

* Change modules scope to 1

* Disable debug
2017-11-11 20:21:55 +01:00
ulteq
9ea1f6839f
Scopes - Fixed bugs in the zero angle calculation (#5742)
* Fixed typo in the module setting parsing (reference temperature was way off)
* Fixed bug in the zero angle calculator (muzzle velocity was off in most cases)
2017-11-11 14:15:59 +01:00
ulteq
9d69961d5f
Merge pull request #5698 from acemod/ab-trajectory-refinement
Advanced Ballistics - Trajectory refinement
2017-11-10 17:29:32 +01:00
ulteq
dcc934202b
Weather - Major Cleanup (#5710)
* Single global on/off switch (that really turns everything off properly)
* Less coupling between code that runs on the client / server
* Simpler update routines
* More cohesive code
* Less module options
* Less network traffic
2017-11-10 15:44:15 +01:00
PabstMirror
70c25aacaf cargo - use getInteractionDistance to get better distance (#5697) 2017-11-10 15:28:12 +01:00
ulteq
fecc77e225 Advanced Ballistics - Improved random seed generator 2017-11-08 15:26:43 +01:00
ulteq
fb0a60b018 Gravity correction
* ArmA is using 9.8066
2017-11-08 15:26:39 +01:00
ulteq
28706c4dab
Scopes - UI improvement (#5702)
* Displays U, D, L, R behind the MIL turret adjustment number
* Allows clients to select their preferred UI type
* Improves the text alignment
2017-11-08 14:04:09 +01:00
Dedmen Miller
bacb7d069b Don't recompile XEH EH's before every call (#5728)
* Fix medical respawn/init

* Medical use CBA addClassEH

* Movement inventoryDisplayLoad

* Medical handleRespawn header typo

* Parachute handleRespawn

* Rearm and parachute handleRespawn

* concertina_wire handleInit

* Fix header

* use XEH function instead of config

* use XEH function instead of config

* remove unneeded init eh
2017-11-07 15:21:58 -06:00
sbng-PAPA
a3e9879cec korean translation (#5730)
Misfit taxt Modified, translate for 3.11
2017-11-06 15:54:35 -06:00
ulteq
e1213483e6 Remove duplicate macro definitions 2017-11-06 18:33:08 +01:00
ulteq
008602590c Fixes bugs in newly added macro based MRAD/MOA conversion
* Fixes: 5729
2017-11-06 17:24:21 +01:00
commy2
568ef50c02 simplify some code (#5727) 2017-11-04 11:05:33 -05:00
PabstMirror
c20ec6599d
Spectator - Fix script error in ui_draw3d (#5722) 2017-11-04 11:03:51 -05:00
ulteq
96d978615e
Merge pull request #5726 from acemod/atragmx-c1-vs-distance-interpolation
ATragMX - Added 'C1 vs. Distance interpolation' data
2017-11-03 22:33:14 +01:00
ulteq
ef0c2788d3
Merge pull request #5695 from acemod/ab-vanilla-drag-removal-fix
Advanced Ballistics - Fixes bug in the vanilla drag removal routine
2017-11-03 22:24:52 +01:00
ulteq
0bae4511e4
ATragMX - Fixed UI (C1 vs. Distance interpolation) (#5720)
* The C1 coefficient needs to be updated automatically whenever the target range changes
2017-11-03 22:01:02 +01:00
ulteq
30fedc9ece ATragMX - Utilize 'C1 vs. Distance' data in the range card output 2017-11-03 21:59:47 +01:00
ulteq
d3dbb77510 ATragMX - Added C1 vs. Distance interpolation data
* Significant accuracy improvement for some bullets
2017-11-03 21:59:42 +01:00
Andrea Verano
50b569f62c Italian Translation Update (#5719)
Added:
-New string in "pylons"
-New string in "weaponselect"
2017-11-01 15:59:38 -05:00
PabstMirror
ba97bb20fe
Tagging - For lastUsed use random if not used yet (#5687) 2017-10-31 12:13:55 -05:00
ulteq
25344deb80
Ballistics - 7.62x54R muzzle velocity correction (#5711)
* Closes: https://github.com/acemod/ACE3/pull/5470
* Reference: https://github.com/acemod/ACE3/files/1272583/mousin.barrel.experiment.pdf
2017-10-31 10:58:12 +01:00
ulteq
4bfc956e1a Advanced Ballistics - Fixes bug in the vanilla drag removal routine
* More accurate bullet drop at extreme long ranges
* Fixes Client FPS affecting the trajectory
2017-10-30 10:07:37 +01:00
Dystopian
32e3b643a7 Fix 5.56 Reload Tracer mags are not tracer (#5660) 2017-10-29 16:41:26 +01:00
ulteq
461c2649a5
RangeCard - Increased level of accuracy (#5703)
* Accounts for the accuracy improvements of the Advanced Ballistics module
* Reduces the expected error at max range down to 0.1 Mil
2017-10-28 23:52:35 +02:00
ulteq
fd9c28ba48
Merge pull request #5701 from acemod/ballistics-dispersion-cleanup
Ballistics - Dispersion Cleanup
2017-10-28 21:48:42 +02:00
ulteq
cd3f2f03a1
ATragMX | Scopes - Fixed typo (#5700) 2017-10-28 21:42:03 +02:00
ulteq
916d5ee6c0 Ballistics - Added comments with actual the weapon names 2017-10-28 20:26:59 +02:00
ulteq
9d6b772661 Ballistics - Automatic MOA -> RAD conversion 2017-10-28 20:05:51 +02:00
Cuel
c815a9cae8 (spectator) unhide/unmute unit on exiting (#5699)
* unhide/unmute unit on exiting

* Update fnc_setSpectator.sqf
2017-10-28 11:23:18 -05:00
ulteq
4c2348cff5
Scopes - Fixes zero on three vanilla weapons (#5696)
* Manually fix rail heights where the automated gathering failed
* Affects: Noreen "Bad News" ULR, Vector SMG and ASP-1 Kir
2017-10-27 22:53:15 +02:00
ulteq
cda060d3e0 Weather - Properly sync overcast value (#5688)
* Makes sure that all clients share the same (numeric) overcast value
* Only affects the barometric pressure calculation
* Does not affect the actual weather on the clients
2017-10-27 12:39:48 +02:00
Cuel
7acff1848b Set correct state (#5684) 2017-10-27 00:40:06 +02:00
PabstMirror
a24b095b6a Add more sources for pylon (Taru and Huron pods) (#5682)
Close #5677
2017-10-26 12:31:34 -05:00
Tim Beswick
c9f1719f5a Hot Resupply (#5639)
Allow rearm, refuel and pylons to function while vehicle engine is running
2017-10-25 23:13:44 -05:00
Tim Beswick
1a2e2848ad Added collision lights keybind (#5646) 2017-10-25 23:11:35 -05:00
Dedmen Miller
8c1952d15f Fix ACE_ItemCore order (#5675)
* Fix ACE_ItemCore order

* Commy is forcing me
2017-10-25 23:11:13 -05:00
shukari
154d56a0e4 Ability for ace engineer to configure pylons (#5672)
* let ace engineer configure pylons

* fix double usage
2017-10-24 20:49:51 -05:00
PabstMirror
1cd86efc06 Zeus - Fix moduleLoadIntoCargo (#5669) 2017-10-24 14:11:16 -05:00
PabstMirror
2efe2642ab Remove duplicate weapon srifle_DMR_03_spotter_F (#5492) 2017-10-24 13:28:48 -05:00
Ozan Eğitmen
e769d092af Pylons: Evaluate String Values from config (#5667) 2017-10-24 18:22:02 +02:00
jonpas
5160a4d767 Prepare release 3.11.0 (build 4) 2017-10-24 15:42:18 +02:00
jonpas
c2c1ae538a Merge branch 'master' into release-3.11.0 2017-10-24 15:40:38 +02:00
Ozan Eğitmen
b45a7e2413 Add custom combo box control (#5661) 2017-10-24 15:39:15 +02:00
BaerMitUmlaut
53b8649d85 Fix carrying on water (AGL->ASL) (#5659) 2017-10-24 15:38:47 +02:00
jonpas
58d69a7978 Prepare release 3.11.0 (build 3) 2017-10-23 20:21:01 +02:00
jonpas
84cd5d8749 Merge branch 'master' into release-3.11.0 2017-10-23 20:20:04 +02:00
ulteq
3484942680 Scopes - Fixed MRAD conversion (#5651)
* Same issue as https://github.com/acemod/ACE3/pull/5640
2017-10-22 10:44:00 +02:00