Commit Graph

9697 Commits

Author SHA1 Message Date
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
ulteq
0aca46d7aa Scopes - BoreHeight config revamp (#5648)
* Scopes - Added rail heights for all vanilla guns
* Scopes - Improved default rail height
* Scopes - Updated all scope heights
* ATragMX - New default bore heights
* ATragMX - Updated scope base angles
2017-10-22 10:28:20 +02:00
Daniel Jupp
c34b1e1376 Disabled Debug Define (#5645) 2017-10-20 22:46:51 +02:00
jonpas
89495d4dc2 Prepare release 3.11.0 (build 2) 2017-10-20 17:36:30 +02:00
jonpas
81e4740b60 Merge branch 'master' into release-3.11.0 2017-10-20 17:35:01 +02:00
ulteq
61c044e16b Fixed a typo in the airFriction generator script (#5641)
- Slightly improves the vanilla trajectory of the 'ACE_338_Ball' bullet
2017-10-20 17:33:40 +02:00
ulteq
923507d009 ATragMX and RangeCard - Fixed incorrect MRAD conversions (#5640)
- This greatly improves the accuracy of the MRAD output in both modules
- Old and incorrect conversion factor: 3.38 [(360 * 60) / 6400]
- New and correct conversion factor: 3.44 [54 / (5 * PI)]
2017-10-20 17:33:26 +02:00
jonpas
9c78e20670 Merge branch 'master' into release-3.11.0 2017-10-20 17:32:05 +02:00
Andrea Verano
18c2f45b3a Italian Translation Update (#5636)
Added:
-New string in "weather"
2017-10-20 17:27:28 +02:00
God of Monkeys
72e48c04f0 Update Chinese stringtable content (#5637)
Update Chinese stringtable content
2017-10-18 12:01:29 -05:00
PabstMirror
8ea0a42b1b Use BIS translation for Zeus/Players (#5633) 2017-10-18 06:26:08 +02:00
PabstMirror
23023ff8ea Fix server rain PFEH (#5631) 2017-10-17 22:48:02 +02:00
jonpas
e6f4046bf8 Prepare release 3.11.0 2017-10-17 20:27:56 +02:00
jonpas
856ffb5579 Remove rain, lightnings and wind sync (#5622)
* Move ACE Weather rain simulation to server and remove sync (synced correctly by vanilla from server)

* Remove lightnings sync (synced correctly by vanilla, ACE3 doesn't have own lightnings probability)

* Cleanup rain and lightning settings, strings, comments

* Set wind only on server (correctly synced in vanilla, gusts and waves still need manual sync)
2017-10-17 20:19:30 +02:00
SilentSpike
51a61653f4 Update spectator docs (#5362)
* Add player initilization safety to setSpectator

Public function which should wait for player unit to exist before running.
With this change an additional variable is now set on the player unit which
can be used to check whether players are spectators or not (part of
grander plans).

* Add UI initalization safety to setSpectator

Should make it so that calling the public function before the main display
has initalized will correctly wait until it has before starting spectator

* Overhaul spectator

Initial WIP overhaul of spectator component. Based on BI's End Game
Spectator and AACO's work on POTATO spectate. The essential functionality
is in place, but some things are broken and some are still to be
transferred.

* Remove redundant canInteract condition

Spectator UI will be open anyway so this is pointless.

* Fix follow camera controls

Also ensure unit camera modes have a target more consistently

* Fix widget weapon icon for unarmed

* Fix follow camera zooming

* Fix entity list not updating correctly

* Remove redundant conditions

* Fix list click behaviour

* Remove a bunch of old debug

* Alter behaviour of camera speed

* Restructure the spectator addon

* Fix camera tracking behaviour

* Fix very fast camera toggle

* Fix initial camera mode

* Fix double click behaviour

* Make AI name display consistent

* Add UI toggle

* Fix current camera mode button highlighting

* Fix focus info widget when clicked on in 3D world

* Improve key handling

Use of `inputAction` could result in weirdness when multiple keys pressed
at the same time. Hardcoded for now.

* Implement dynamic help UI element

* Remove some redundant code

* Fix follow camera jitter

* Add projectile drawing

Technically the capability to draw projectiles has been in since the
start. However it took me a bit of time to figure out how best to
add/remove the required event handlers.

I decided to add them during the process of finding things to draw, since
I'm iterating over the list of spectatable entities here anyway. With an
additional GVAR containing up to date entities, the fired EHs can remove
themselves when applicable. This avoids any granularity issues with adding
EHs en masse.

* Improve naming convention related to drawing

* Remove outdated unit and side settings

Also re-add unit whitelisting/blacklisting support

* Rename public function for consistency

Adds a deprecated warning to the old function name.

* Update stringtable

Some entries are replaced with BI translations, others are no longer
needed. I pieced together one of the camera mode settings by combining the
BI translations of the individual versions.

* Add location public functions and list population

Just need to take care of drawing and then camera interaction now

* Add location 2D and 3D drawing

* Respect whitelist and blacklist correctly

* Add location camera focus capability

* Fix local helicopters follow mode bug

* Add compatibility with `counter` template

Simply repositions the counter UI to the top of the screen out of the way

* Update respawn template

This template is only compatible with respawn types 2 & 3

* Rename compatibility function

* Add compatibility for respawn types 1,4 and 5

* Update setCameraAttributes function

* Fix draw3D for respawn types 1,4 and 5

* Fix screeching seagulls #4265

* Fix script command typo

* SQF Linter Pass

* Add obsolete warning for public func params

* Deprecate interrupt function

* Fix incorrect function call

* Make playable virtual spectator work

* Improve focus handling in public function

- User might want to reset focus for free cam, in which case objNull
  cannot be reserved for random
- Focus is still required for unit camera
- Update some function headers

* Note explicitly the use of `player`

* Remove unused base classes

* Improve seagull culling

* Add projectile drawing to vehicles

* Fix same tab selection clearing list

* Make projectile lines last 1 frame longer

* Add true zeus compatibility

- Re-opens spectator when zeus closes
- Transfers the curator module over in the respawn template
- Only handle uiForced in setSpectator to avoid issues with esc key
- Add safety to setFocus so that it only updates the UI when applicable

* Fix player moving in FPP

* Fix zeus transfer and re-opening

* Consolidate icon definitions

* Fix AI setting for player groups

* Improve handling of alive spectators

Instead of disabling simulation, just stage them automatically if alive.

* Fix respawn template for types 2 & 3

* Fix pre-set camera mode with no focus

- Improve handling of UI updates in camera related functions
- More explicit UI initalisation
- Find a focus if one wasn't pre-set for a camera mode which requires a
  focus

* Localise key names

* Fix camera mode and vision settings on init

When spectator starts the available camera modes and vision modes should
be consulted to ensure they are respected upon opening.

* Fix key localisation

* Add next/prev entity keys

* Fix vision modes update while camera active

- Updates the camera vision mode in case the current was removed

* Add public getCameraAttributes function

* Fix spectator zeus compatibility

- Camera control wasn't returned on exit due to change in fnc_ui

* Improve vision mode handling

- Curator now resets vision mode on entry
- First person also reset vision mode so that it is consistent between
  camera changes

* Improve location handling

- It makes more sense to specifiy the position ATL since the text is going
  to be rendered there and a z of 0 is then ground height.
- Updates the ui immediately if the list is already on locations

* Disable list keyboard search

* Fix handling of forced camera mode with no focus

* Fix handling of free mode removal while no target

* Fix locations respecting available modes

* Fix list entry removal code

- Replace getTargetGroups with getTargetEntities for consolidated
  filtering.
- Fix the step of the removal loops and make them go to index 0 instead of
  1

* Improve side handling of unit list

- Accounts for possibly of whitelisted random objects that belong to other
  sides
- Move the index decrement to loop, not within every loop

* Add linter ignore directive

* Fix list code

* Improve entity fetching

- Change whitelist/blacklist application to optimize the code

* Include dead units in the list

- Allow getTargetEntities to return dead units too
- Iterate over allGroups in list updates to reduce overhead

* Take care of TODOs

* Mark stageSpectator as non-public

* Fix updating list focus

* Adjust default camera speed

* Include the function file

* Generalise camera button UI

- Makes it easier to extend with future camera mode buttons
- Removes potential error when display doesn't exist

* Remove obsolete staged event

- Add vision toggle to help
- Restructure some function PREP

* Add public function to return all spectators

* Change default briefing name used on map display

* Fix the order of 4 main sides in list

* Restore non-toggle behaviour of camera speed

* Fix UI gap between list and tabs

* Force update UI list when player is staged

Hopefully this fixes any issues related to the player appearing in the
list

* Update controls strings

* Fix entity tooltips showing short name

- Also revert changes to common function and just handle in this component

* Include dead in unit switching

* Show rank and vehicle icon in list

- Rank is shown in tooltip
- Vehicle icon is used to see which units in the list are mounted

* Change default vehicle icon

* Show whether medic/engineer in tooltip

* Improve list double click behaviour

* Improve group icon handling

* Use dynamic group icons for drawing

* Fix EFUNC call

* Update all function headers

* All the changes I had staged before arma broke git

Arma managed to crash my whole system again, breaking my git repo and I
resorted to nuking it and pasting the changes I had comitted locally back
in. From memory:

- Fix icon paths
- use distanceSqr for minor speed boost
- Add setting to show map locations in the UI
- Limit location rendering based on distance
- Probably some other crap

* Fix squared comparisons

* Remove unnecessary variable publicity

* Deprecate fnc_stageSpectator

The function was a source of confusion alongside fnc_setSpectator and so
it is replaced by an additional parameter to hide the unit as part of
fnc_setSpectator. No longer is the unit moved either, to reduce complexity
and give more control to mission maker.

* Fix undefined variable

* Update spectator framework doc

* Update spectator feature doc

* Fix typos and grammar

* Revent version introduced number

* Update with new changes
2017-10-17 20:19:10 +02:00
BaerMitUmlaut
b366be0277 Prevent fastroping teleport serverside (#5629) 2017-10-16 23:20:50 +02:00
Mark Ruffner
7aae91be79 'Fix' race condition where rope is cut as someone mounts the rope (#5569)
* initial fix attempt

* reset animation

* Fix logic

* Not cutting when roping
2017-10-16 23:11:21 +02:00
PabstMirror
9c7b546e24 Fix garrison header and use showMessage (#5628)
* Fix garrison header and use showMessage

* Fix moduleUngarrison
2017-10-16 15:23:39 -05:00
Andrea Verano
c08bea1275 Italian Translation Update (#5627)
* Italian Translation Update

Added:
-Ai
-Pylons
-New entries for Zeus

* Remove empty comment
2017-10-16 20:30:38 +02:00
jonpas
7183a765f5 Add Advanced Throwing torque (rotation) (#5621)
* Add throwable rotation

* torque grenade config

* Cleanup

* Do vectorNormalized on direction only
2017-10-15 20:06:18 +02:00
PabstMirror
6e219b8678 QuickMount - fix locked seats, getIn EH (#5626) 2017-10-15 17:59:34 +02:00
jonpas
d598906205 Fix defused UXOs being able to be defused again and detected by mine detector (#5623) 2017-10-15 13:13:16 +02:00
LordGolias
8d9c17ed88 Made AI medic use epipen on unconscious patients (#5433)
* Made AI medic use epipen on unconscious patients

* Fix epi heal args, use non-local treatment funcs
2017-10-14 20:43:53 +02:00
PabstMirror
65c5e6e38e Add function to add curator actions (#5620) 2017-10-14 12:01:07 -05:00
BaerMitUmlaut
c211cbf82b Added fastrope keybind (#5606)
* Add fastrope keybind

* Add canInteractWith checks

* Fix player -> ACE_player
2017-10-14 11:55:48 -05:00
PabstMirror
750382ff67 Cookoff - Filter bad ammo, use new rearm config (#5618) 2017-10-14 15:12:32 +02:00
PabstMirror
2663bbb786 Fix options menu (#5617) 2017-10-13 23:50:12 +02:00
classic
d1aaf89c81 Update the Jpn translation (#5612)
* Add the Jpn translation for ai

Add the Japanese translation for ai

* Update the Jpn translation for nightbision

just tweaks for name.

* Update the Jpn translation for captives

added missing word

* Add the Jpn translation for pylons

Add the Japanese translation for pylons

* Update the Jpn translation for zeus

added to new entry.
2017-10-12 16:15:56 +02:00
PabstMirror
c8255960d6 Disable checking weapon temp on fakeWeapon (#5600) 2017-10-11 23:36:48 +02:00
BaerMitUmlaut
a95c380dcc Remove legacy medical settings (#5609) 2017-10-11 22:23:12 +02:00
Laid3acK
958471cb0c AB : same values for the both 127x108 bullets (#5588)
* 127x108 apds fix

* fix 127x108 apds initspeed mag
2017-10-11 14:07:13 -05:00
Ozan Eğitmen
1b86063ade Add Pylons Component (#5517)
* Initial commit

* Change order

* ace-ify functions

* Add function headers, tweak onPylonMirror function

* Finish localization

* Fix trivial idc collision

* Styling

* Add self as author

* Add interaction for the dialog

* Add settings to enable menu and change behaviour

* Add strings

* Move changes into pylons component

* Progress

* Only one function left!

* Fix issues with overlapping players, Use LINKFUNC

* Add progress bar

* I need to switch branches

* Remove old pylon weapons from aircraft

* Explicitly set new pylon's ammo to 0

* Replace magic numbers with ID list

* Align controls properly

* Remove space before eol

* Add ability to add/remove FRIES

* 🐛 Whoops

* Fix logic errors

* Value of 1 means helicopter has built-in FRIES

* Add pilot/gunner switch button

Working on those buttons also helped me improve both the static and
on-the-fly (pun intended) parts of the dialog.

* Add quick zeus module

* Add a way to retrieve scripted pylon turrets

Not entirely reliable, but if used in both rearm and pylons, missions
that only use ace will work perfectly.

* Use getNumber default

* Use common's getPylonTurret

* Make dialog close on apply for zeus

* Handle UI Scaling better

* Prevent progressBar from failing in zeus

* Remove unnecessary stringtable key
2017-10-11 14:05:54 -05:00
Joko
3a0fd5cae3 fix the delay timing when a unit switch to Captive (#5338) 2017-10-10 11:30:31 -05:00
Josuan Albin
bb03f55c5c Add garrison zeus modules (#4555)
* Add garrison and un-garrison modules

* Remove unnecessary text from garrison header

* Add french translations to new strings

* Add changes requested by review

* Change pushback to pushBack

* Move garrison funcs to ai, finish headers

* Remove diag log debug

* Fix typos and header issues

* Add missing newlines

* Fix strings, Fix typos and headers

* Enable debug and disable compile cache, Add trace and comments

* Rebase before review

* Fix default case running instead of case 3

* Fix edge case related to players being in garrison group

The player would make the enableAttack checks in ungarrison and garrisonMove fail, this is now fixed.

* Fix some arrays in garrsionMove and garrison

* Relax distance checks in garrisonMove, change AI behaviour while pathing to aware

* Add debug view

* Remove unused var, fix unit pos using the wrong format

* Make debug more visually pleasing

* Change garrison debug target to a waypoint icon

* Change disableAI event to AISection, comment out doFollow in doMove EH

* Fix locality issue
2017-10-10 11:06:37 -05:00
AkiraforARMA
ed1e95106d Priority ERROR units never die possibility (#5526)
* Priority ERROR units never die possibility

Cases when _lifesLeft goes below 0. 
Low or limb damage, then recovered with PAK from unconcious & revivestate.

* Update fnc_setDead.sqf
2017-10-10 11:06:07 -05:00
Dedmen Miller
81e02a7336 Refactor private ARRAY to private keyword (#5598)
* Everything

* Fixed missing ;

* Fix missing ; and double private

* Fixed cannot isNull on number

* Turn _temparture back to isNil

* Fix error from merge
2017-10-10 09:39:59 -05:00
shukari
22c8ef1e8a German stringtable updates (#5539)
* advanced_fatigue stringtable german

* cargo stringtable german

* cookoff stringtable german

* fastroping stringtable german

* hellfire stringtable german

* nlaw stringtable german

* overpressure stringtable german

* quickmount stringtable german

* refuel stringtable german

* repair stringtable german

* scopes stringtable german

* slideshow stringtable german

* spectator stringtable german

* zeus stringtable german

* cookoff stringtable german #2

* hellfire stringtable german #2

* nlaw stringtable german #2

* overpressure stringtable german #2

* quickmount stringtable german#2

* refuel stringtable german #2

* scopes stringtable german #2

* slideshow stringtable german #2

* zeus stringtable german #2

* tiny fix

* tiny fix

* quickmount stringtable german #3

* fastroping stringtable german #2

* captives stringtable german

* cargo stringtable german

* cookoff stringtable german

* tiny change

* cargo stringtable german

* fcs stringtable german

* Fix german strings for scopes
2017-10-07 13:37:59 +02:00
Willard
51b1cd6023 Missile guidance for RHS hellfire and DAGR (#5444)
* rhs hellfire missileguidance

* tabs to spaces

* added support for -N and -M launcher, removed ir/radar locking

* added missing macro

* Switch to using pylon system
2017-10-06 15:31:48 -05:00
ulteq
be482ea097 Advanced Ballistics - Drag model revamp & Spin drift correction (#5566)
* Advanced Ballistics - Drag model revamp
- Moved away from using the drag tables from the GNU exterior ballistics library
- The drag functions are now based off this data from JBM Ballistics: http://www.jbmballistics.com/ballistics/downloads/text/
- The differences are minor, but some players might still appreciate the additional authenticity

* The Mach number is now calculated in relation to the air temperature.

* Improved speed of sound calculation accuracy.

* Advanced Ballistics - DLL update

* Advanced Ballistics - Added drag function reference (JBM Ballistics)

* Advanced Ballistics - Fixed calculation error in the spin drift simulation
- The error was introduced with this PR (https://github.com/acemod/ACE3/pull/4708)

* More descriptive variable names

* Minor performance optimizations

* Fixed some minor issues

* DLL rebuild

* Utilize new 'toFixed' script command
- Small performance improvement

* Fixed a typo

* Use correct reference speed for the drag compensation

* Updated all 'airFriction' values to match the new drag model

* 'Default' atmosphere now equals the ICAO standard atmosphere

* Update reference humidity to meet the ICAO standard
2017-10-06 13:05:20 -05:00
classic
d5aeec11ea Update the Jpn translation (#5586)
* Update the Jpn translation

few tweak to translation

* Update the Jpn translation

couple tweak

* Update the Jpn translation

added more simplify translation

* Update the Jpn translation

few tweak and fix miss translation

* Update the Jpn translation

Added missing symbol and few tweak

* Update the Jpn translation

added shortest word because text is protruding the button

* Update the Jpn translation

fix miss translation and some tweaks

* Update the Jpn translation

just few tweak

* Update the Jpn translation

fix miss translation

* Update the Jpn translation

just a little tweak

* Update the Jpn translation

just a tweak

* Update the Jpn translation

added more simply translation

* Update the Jpn translation

tweaked to some entry

* Update the Jpn translation

tweak to few entry

* Update the Jpn translation

fix for miss translation

* Update the Jpn translation

fix miss translation

* Update the Jpn translation

some tweaks to translation

* Update the Jpn translation

fix miss translation

* fix the Jpn translation

fix the kanji
2017-10-04 16:30:11 +02:00
PabstMirror
760665f65f Leave ACE_FCS off by default (#5580) 2017-10-03 11:57:07 -05:00
PabstMirror
b41cc8651f Fix kestrel ItemInfo for cba misc items (#5583) 2017-10-03 11:54:49 -05:00
jonpas
711e1fc026 Fix Underwater interactions (magrepack, loading, refuel, medical legs, dragging) (#5521)
* Fix Magazine Repack underwater - fix #5513
Also prevent common goKneeling function underwater

* Fix loading patients underwater - fix #5515

* Fix load object underwater

* Fix take nozzle on jerry can underwater

* Fix refuel underwater conditions further

* Use isTouchingGround, Make refuel semi-compatible
 reports false if head is out of the water, we want true even if we are not diving

* Less interact exceptions duplication

* Use animationState to determine if unit is swimming, create common function and use it instead of isTouchingGround

* Fix condition

* Support dragging underwater
No carrying due to animation timing issues and other misc things

* Allow Medical Legs SelfActions underwater

* Fix fixPosition function underwater (use getPosATL instead of getPos)

* Fix fixPosition's slope adjustment for non-gravity objects, Do the same for objects without simulation as well
2017-10-01 13:38:11 -05:00
Andrea Verano
03a32b9b13 Italian translation update (#5576)
Added:
-The new string in captives
2017-10-01 10:56:02 -05:00
PabstMirror
5f8350d7bc Minor rearm fixes (#5572) 2017-09-30 11:14:41 -05:00
Ozan Eğitmen
45a66ccfa1 Medical & Captive Load Menu Overhaul (#5519)
* Add load in child actions to medical & captive

* Add actions with proper structure

* Move vehicles actions code to common function

* Simplify code in config, Fix docs

* Remove unused vars

* Fix header example

* Add _distance param to fnc_nearestVehiclesFreeSeat

* Change docs

* Fix spacing
2017-09-29 22:00:47 +02:00
Tuupertunut
0644ad9ca2 Rearm bugfixing (#5411)
* Added workaround functions for turret magazine ammo.

* Switched to retrieving turrets dynamically instead of looking them up from an array.

* Refactoring only, no functional changes

* Repurposed getNeedRearmMagazines as a general purpose rearm info function + more.

* The function retrieves all non-full magazines. This code was previously repeated in many different functions, but is now centralized in one.
* Empty pylon filling is no longer supported in favor of the upcoming "pylons" ACE-module.

Fixed bugs:

* Rearm was using broken commands "magazineTurretAmmo" and "setMagazineTurretAmmo". They are now replaced with their corresponding workaround functions.
* Pylon rearm was trying to set ammo count on empty pylons.

Note: rearmSuccessLocal is not yet fixed!

* Rearming no longer switches shell types in cannons/mortars.

* Added Tuupertunut to authors.

* Rearming no longer switches shell types. 2nd try.

Last time it was fixed only if the turret is manned. Now it is fixed even when unmanned.

* Updated fnc_rearm to support the earlier repurposing of fnc_getNeedRearmMagazines.

* Small fixes and comments.

* Renamed fnc_getVehicleMagazines to fnc_getTurretConfigMagazines.

The latter describes much better what the function actually does.

* Removed redundant checks.

* Refactoring.

* Fixed spaces in macros.

* Renamed fnc_getAllTurrets to fnc_getAllRearmTurrets
2017-09-29 14:53:25 -05:00
classic
9dfc76b6d5 Update the Japanese translation (#5565)
* Update the Jpn translation

following to official localization.

* Update the Jpn translation

fix for miss translation

* Update the Jpn translation

added more natural words and fix miss translation.

* Update the Jpn translation

fixed for miss translation.

* Update the Jpn translation

just tweaks

* Update the Jpn translation

added to new entry. fixed or tweaked to few entry.

* Update the Jpn translation

added the jpn translation to new entry

* Update the Jpn translation

Added the Jpn translation to new entry.

* Update the Jpn translation

tweak to jpn translation

* Update the Jpn translation

following to official Japanese localization

* Update the Jpn translation

support to new entrys and few fix

* Update the Jpn translation

just tweaks to few entrys
2017-09-28 16:04:24 +02:00
PabstMirror
651aa285f8 Add trip flare to Put muzzle (#5564)
Muzzle won't be used because explosives has a custom placing engine.
But arsenal needs this to categorize it as an "explosive"

Close #5563
2017-09-28 03:46:33 +02:00
jonpas
a48db26996 Fix Load Patient/Captive actions (#5544)
* Disable (un)load patient action if unit is dead but was uncoscious before

* Remove handcuffs on death (prevents stand-up ragoll restart), Don't show load patient and captive at the same time

* Only allow unloading from outside - fix #5525 as discussed

* Also prevent unloading captives from inside

* Add debug logging
2017-09-27 15:41:05 -05:00
KoffeinFlummi
32b2d99887 Merge remote-tracking branch 'sbng/master' 2017-09-27 18:57:24 +02:00
Josuan Albin
240a078dde Toggle modules standardization (#5558)
* Change toggle modules messages to be the same as others

* Fix _ui_toggleNvg capitalization
2017-09-26 19:36:36 -05:00
jonpas
430c136a61 Deprecate isUnderwater (replaced by underwater command from 1.66) (#5560) 2017-09-26 19:35:00 -05:00
PabstMirror
30fcbb66ae Add ace_common_fnc_getPylonTurret func (#5548)
* Add getPylonTurret function

* cleanup

* debug

* Fix
2017-09-26 21:47:13 +02:00
jonpas
4de7953316 Remove deprecated addToInjuredCollection function (#5559) 2017-09-26 11:23:20 -05:00
ulteq
098b88106c RangeCard - Always display barrel length and bore height (#5551)
- More uniform appearance with advanced ballistics enabled or disabled
2017-09-26 16:51:48 +02:00
Christian Klemm
3d340bb0ef Added captive hotkey (#5529)
* added captive hotkey

* Removed toggling + distance check

* adjusts

player -> ace_player
interact check
stringtable adjust

* Update XEH_postInit.sqf

* Update XEH_postInit.sqf

* Removed dots

* Removed comment

* Use targetEvent
2017-09-25 23:22:10 -05:00
sbng-PAPA
37dcb562a7 korean translation for 3.10 2017-09-26 00:54:27 +09:00
Jo David
4a6b06dfeb Typo in flashlights translation Fix #5552 (#5553) 2017-09-25 16:29:40 +02:00