Commit Graph

11972 Commits

Author SHA1 Message Date
SilentSpike
c15966c79a
Fix draw3D in specator free camera when perma-dead (#5868)
This is a weird engine behaviour where draw3D doesn't work if the
current camera unit is not alive (or going to respawn), so we switch to
a temporary agent unit while in free camera to work around this edge
case.
2017-12-07 21:45:30 +00:00
PabstMirror
6a6b03eb57 Fix undefined var 2017-12-07 12:45:59 -06:00
commy2
2ca398ea71
Merge branch 'master' into avoid-setCaptive 2017-12-07 19:11:09 +01:00
Dystopian
36b61fdb6e Block adv. throwing when player is busy (#5534)
* Add throw blocking status effect

* Add concertina_wire and tripod support

* Add launcher in hands support

* Disable effect sending more than once

* Fix EFUNC using, add trace

* Disable vanilla throw blocking

* Improve status handling

* Fix rearm status key
2017-12-07 11:26:21 -06:00
commy2
235315e4ef
Merge pull request #5867 from acemod/spare-items-3den-settings
3den attribute for spare items in cargo
2017-12-07 18:25:44 +01:00
commy2
cec440c3b1 fix repair item damage, hide spare item module 2017-12-07 18:01:31 +01:00
commy2
bb05037a4d 3den attribute for spare items in cargo 2017-12-07 15:29:54 +01:00
Jo David
f987eb4159
Merge pull request #5866 from acemod/nvgCat
Remove dash from NV category name
2017-12-07 13:57:36 +01:00
SilentSpike
753f0c8914 Remove dash from NV category name 2017-12-07 11:27:08 +00:00
commy2
c7119c5575
Merge pull request #5865 from acemod/fix-stringtable
remove duplicate japanese entry
2017-12-07 11:07:09 +01:00
bux
9b15464af6 remove duplicate japanese entry 2017-12-07 10:07:52 +01:00
ace3mod
4f98f09367 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2017-12-07 08:51:31 +01:00
Josuan Albin
2bde515aaa Add ACE_Arsenal (#5734)
* Add CBA setting for modIcons

* Add CBA settings for camera control

* Merge the 2 inverted settings into one

There's no man crazy enough to need one inverted and the other normal

* Add back missing newline

* Change rscCommon, don't redefine base classes

* Change anim to "civil" when not in a weapon or special tab

* Fix current handgun ending up in launchers tab and vice versa

* Change back virtualItems first index to primary secondary handgun

* Add ace_arsenal_hide config check and config entry

* Add dogtags handling in postInit

* Add CBA setting for fontHeight for left and right panel

* magazineGroups

* Add base layout for loadouts GUI

* Prepare the SQF base for the loadouts display

* Continue laying the base for the SQF of the loadouts display

* Add CBA settings for the loadouts display

* Implement button logic for loadouts display

* Finish button logic, start adding filling and button funcs

* Add editBox for loadout names

* Add loadout saving and deleting

* Add loadouts loading

* Add select current after list is refreshed after saving

* Redo button layout, Add rename button, Add messages

* Add double click loading

* Fix loadout deleting not triggering curSel change

* Keep cursor at same index when deleting loadouts

Woops

* Reload pictures when saving over old loadout

* Fix loadout save not updating the pictures properly (again)

* Add close button for loadouts dialog

* Fix weight not updating when using arrows to add / remove items

* Make the arsenal layout a bit prettier

* Start adding non available items and missing mods for loadouts

* Remove useless lines in fillLoadouts

* Move buttonHide above panel fill in loadoutsClose

* Change the way weapons are checked in fillLoadoutsList

* Add weapon in container support for fillLoadoutsList

* Add mag in container check for fillLoadoutsList

* Add item check for containers in fillLoadoutsList

* Fix item duplication when loadout loadouts

* Switch anim to civil for the rest of the tabs that need it

* Make extra sure item duplication won't happen

* Fix right panel hiding issues

* Fix remove all button, use QGVAR for EHs names, add isMP check to share tab

* Fix initBox erroring out if the object is null

* Move loadout checking to it's own func

* Force panel reload every time loadoutList change

I'm forced to do this, I can't save arrays in listnboxes

* Change how loadouts are retrived from the listnbox

* Fix save overwriting existing loadout not updating right row

* Fix indentation in buttonLoadoutsSave

* Fix reserved var error

* Fix fillLoadoutlist tab check

* Fix accessories in containers not being checked properly via verifyLoadout

* Fix binos not being detected properly by verifyLoadout

* Fix pre-filled backpacks not behaving properly

* Add mine detector check in configScan and onArsenalOpen

* Add extra traces

* Add mine detector check in non cached part of addVirtualItems

* Move right panel greying to it's own func

* Fix right panel listnbox for items with mass under 1

* Redo unique items sorting in onArsenalOpen

* Add loadoutSaved EH, handle empty name box for loadout saving

* Reapply inisgnia after loadout is loaded

* Change LoadoutSaved to loadoutSaved

* Rename savedLoadout to onLoadoutSave

* Change buttonLoadoutsSave layout to prepare base weapon saving

* Save base class for weapons when saving loadouts

* Remove unused profiling code related code

* Add not implemented warning messages for export and import

* Fix error when saving with a container or weapon slot being empty

* Remove dogtags from loadout upon loadout saving

* Change how misc item mass is retrieved

* Remove vanilla "NoVoice" from voices to avoid an error related to it

* Use tolower for currentData and itemsToCheck in fillLeftPanel

Avoid camelCase issues with the commands that don't fucking respect it.

* Remove redundant check in postInit

* Fix sharedLoadouts condition in onArsenalOpen, Fix save button logic

* Prepare sharedLoadouts addition

* Add loadout sharing

* Add proper saving and loading for shared loadouts

* Change loadout deleted / unshared EH name, add said EH to unsharing

* Remove shared loadouts from disconnected players

* Fix error in buttonLoadoutsSave, add row when other share a loadout

* Change sharedLoadouts tab curSel selection to lnbData instead of lnbText

* Add data when adding a new row via CBA EH

* Remove mode, add arg to openBox to have arsenal prefilled

* Cleanup buttonClearAll code

* Fix itemInfo behavior when switching between items that don't have logos

Fix #23

* Add copy paste and arrow key support for searchbars

Close #22

* Add back newline at EOF for onKeyDown

* Change default camera setting from non inverted to inverted

* Fix import and export "not implemented" message

* Rename share button to Unshare when loadout selected is shared

* Improve missing items logging, cache verifyLoadout check

* Remove unused var

* Add full 3DEN support

* Remove 3DEN sphere and grid, set helper center dir properly

* Change 3DEN lightsource intensity

* Save 3DEN inventory properly

* Rewrite onArsenalClose 3DEN comment

* Fix sharedLoadouts check

* Add 3DEN support for defaultTab

* Add new event for 3rd parties in buttonCargo

* Move weight update to updateRightPanel for buttonCargo and selChangedListnBox

* Fix defaultLoadout save button

* Remove unallowed command

* Fix arsenal messages not working in 3DEN

* Add export current loadout, Add export defaultLoadoutsList

Signed-off-by: Josuan Albin <josuanalbin@outlook.fr>

* Add import button functionality

* Change export / import messages

* Change message to use scheduled only

* Attempt to sanitize data in import func

* Add a 3DEN attribute to save defaultLoadoutsList, fix shared loadout check

* Replace 2 last traces in verifyLoadout

* Change defaultLoadoutsList export format and add a 3DEN check for it's default value

* Fix original array being modified in fillLoadoutsList

* Improve shared loadout check

* Fix removeVirtualItems not removing Accs, nil virtualItems var in removeBox

* Add zeus support for arsenal rewrite, fix openBox camera check

* Add isPlayer check to arsenal rewrite part of bi module

Arsenal rewrite does not seem to work on remote players, welp, I tried at least

* Fix shared loadouts loadout index being null

Forgot to change that one getVar

* Hide shared column if sharing is disabled on My loadouts tab

* Remove trace from loadoutsLoad, add trace to shared and unshared EHs

* Fix postInit trace

* Fix sharing EHs being broken, remove traces in them, prevent possible issue

yeah, _x params doesn't work there :p

* Fix fillLoadoutsList error

* Start translating and code reviewing

* Add editing vehicle crew loadout support for arsenal

* Move left panel filling above 3DEN handling to avoid float crew members

* Fix onArsenalClose EOF, add header for it

* Move onButton EHs to config, remove placeholder stats func

* Add headers for onLoadouts funcs and verifyLoadout

* Clean up buttonClearAll

* Fix assigned items not being added properly to currentItems on loadout load

* Add more function headers

* Make rename work in default loadouts tab in 3DEN

* Add more functions headers, continue code review

* Add more functions headers, finish code review

* Fix loadout saving to profile from an other tab than my loadouts

* Fix loadout saving even more

* Attempt to fix loadouts handling

From totally broken to somewhat usable.

* Even more fixing

* Add back onLoadoutSave EH

* Add back author message in loadoutSave

* Add back EOF newline

* Add back loadout caching

* Remove unique items from saved and loaded loadouts

* Add unique item support for the remaining container tabs

* Fix mag check for magazine type in container

* Add support for CfgVehicles and CfgGlasses in miscItems

* Add button highlighting for loadouts display, fix mag put and throw check

* Change shared column to show a proper icon

* Revert "Move onButton EHs to config, remove placeholder stats func"

This reverts commit 1be5d92426.

* Add back EOL newline in prep, remove stats placeholder again

* Add part of the german translation

* Add more translations, change how shared button text is managed

* Add scheduled check in openBox to avoid issues with people using addaction

Because you know they will.

* Add translations for import and export messages

* Fix comms tab defaulting to empty

* Align buttons perfectly for loadouts display, translation for delete action

* Add loadout saved translations

* Add load and rename messages translations

* localized interaction name in initBox

* Fix issue when admins deleted a loadout didn't change the icon status for authors

* Fix loadout import, update unique items list after import / loadout load

* Beautify UI a bit

* Add setting to toggle missing / unavailable items RPT logging

* Add settings strings

* Increase button size for main display

* Change DLC logo side in infoBox

* Change loadouts display buttons spacing, change deleteLoadout button active color

* Remove camera rotation limit

* Add polish translation

* German translation by @bux

* Order

* Fix typo in buttonExport, add credits in handleMouse

* Fix right panel item count not updating properly in certain scenarios

* Add loadoutName check when importing default loadouts, change assignedItems check

* Improve onSelChangedRight, fix typos in onSelChangedLeft and handleSearchbar

* Fix syntax check in removeVirtualItems count

* Shorten onSelChangedRightListnbox by improving current tab check

* Improve fillLeftPanel weapon tab filling

* Move lnbSetPicture occurences for the loadouts display to a define

* scan config opti

* Fix RPT logging check in fillLoadoutsList, use picture macro for shared tab

* Fix sharing and RPT logging settings having the same var

* Add newline at EOF for funcs that are missing it

* Move GVAR(sharedLoadoutsVars) to sharedLoadoutsNamespace

* newline eof

commy contributed too!

* Fix delete button not working as intended in public tab

* Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig

* Revert "Replace bis_fnc_baseWeapon with CBA equivalent everywhere outisde of scanConfig"

This reverts commit 496e6f8223.

* Add new Cfg entry for handling unique items saving, add entry to chemlight shields

* Fix currentMag tab not detecting current mag properly (still experimental)

* Improve left and right filled EHs, add "Dog Tags:" for dogtag uniques

* Change how the right panel first update works

* Fix updateRightPanel very obscure bug and header typo

* Move postInit EHs for medical and dogtags to their respective postInit

* Fix medical postInit typo

* Add currentMag tabs for primary and secondary muzzles properly

* Fix container compatible mags tab not showing anything

* Replace an inline if to select in fillRightPanel

* Attempt to fix accs recognition when switching weapons

* Improve currentMag2 tab show / hide logic

Secondary and handguns can't have a secondary mauzzle

* Add strings for currentMag and currentMag2 tabs

* Readd strings that tabler accidentally removed

* Make sorting for the right panel stay the same when switching items / tabs

* Replace bis_fnc_addWeapon by the addWeapon command

bis_fnc_addWeapon failed when a weapon with the same classname was in one of the player's containers
Add mag for primary muzzle after the weapon is added, is possibly replaced by current mag(s) saved in curentItems

* Replace BIS_fnc_overviewAuthor in itemInfo

It works better

* Display itemInfo box properly for currentMag1 and 2 tabs

* Don't reset arsenal vision mode after quitting arsenal

* Improve showItem

* Remove trace from showItem

* Move getWeight and weight string from movement to common

* Fix typos in addVirtualItems

* Comment back compile cache for common

(Not yet for arsenal, not until it's validated for a merge)

* Replace secondaryMuzzleMag tab icon by @Max255PL 's

* Update @Max255PL 's icon

* Add missing author strings

* Add debug trace for a specific issue

* Add more traces in loadoutsSave

* Fix bug in loadoutsSave, remove debug traces

* Fix typo in loadoutsSave

* Fix uniqueBase cfg check for all cases in loadoutsSave

* Improve whitelisting for current weapon accs and mags

* Update CBA settings strings, change RPT logging to be turned off by default

* Update polish translation by @max255PL

* Fix saving loadouts when no loadout has ever been saved

* Make loadout screen lighter

* Save camera position and view mode for ace arsenal

* Improve loadouts screen presentation

* Improve loadouts screen readability

* Improve camera angle in loadout screen

* Improve loadout renaming, Fix bug linked to renaming

* Fix wrong loadout being used while renaming and color not being reapplied

* Fix other possible issue with renaming

* Change missing items color to be more colorblind friendly

* Fix typo and improve return check in getWeight

* Disable debug and re-enable compile cache for common and arsenal

* Remove uneccessary newline in arsenal's script_component.hpp
2017-12-07 08:48:10 +01:00
PabstMirror
4b42eb4385
ST Nightvision Effects (#4694)
* Merge ST Nightvision

* Cleanup

* Header cleanup

* Add ace setting for fog

* Cleanup debug

* Manual merge refuel changes

* Add new setting for effect scaling

* Cleanup

* Use ace_common_fnc_getZoom

* Fix compat inheritance changes

* Fix stringtable

* Add category

* Tidy function headers

* Replace global event with remote event
2017-12-06 13:15:33 -06:00
SilentSpike
b1f5caacbb Improve cook off settings UX (#5351)
* Improve cookoff setting UX

- Adds second eden attribute to boxes/vehicles to toggle the ammunition
  cookoff itself
- Removes the cookoff toggle from boxes (they only care about ammunition
  cookoff)

* Fix attribute default values

* Update incendiary box ignition code
2017-12-06 13:13:10 -06:00
xrufix
0630ebd93a Fix missing HE magazine for Blackfish Autocannon. (#5854)
* Fix missing HE magazine for Blackfish Autocannon.

* Change displayname of Blackfish autocannon to "L/60 Bofors"

* Remove muzzle tweak from autocannons.
2017-12-06 10:24:41 -06:00
commy2
eba99f4707 only use for medical, keep setCaptive for captives 2017-12-06 17:22:07 +01:00
commy2
1890c71c65 replace usage of setCaptive with camouflageCoef trait 2017-12-06 16:55:01 +01:00
ulteq
63c76fd1c2 Ballistics - Fix .338 misnomer (#5851)
* Ballistics - Fix .338 misnomer
* Quick and dirty fix
* A proper fix would add new ammo and magazine classes

* Ballistics - Removed leftover HPBT translation
2017-12-05 22:21:49 -06:00
PabstMirror
53d382a4f5
Interaction - Fix setting zeus group behaviour to safe (#5855) 2017-12-05 00:41:28 -06:00
Daniel Jupp
5a4c439c22 Fix Mikero tools dupe key issue (#5853)
Mikero tools seams to not cleanup regkeys properly and leaves a key with no value behind making. Making find_depbo_tools break
2017-12-04 20:15:24 +01:00
commy2
bbda53ca1a
Merge pull request #5414 from acemod/buildingLitter
Delete medical litter on building explosion
2017-12-04 13:56:13 +01:00
commy2
617a54201d Merge branch 'master' of https://github.com/acemod/ACE3 into buildingLitter 2017-12-04 13:19:31 +01:00
commy2
7d4bc85f75 tweak radius, and med junk height check 2017-12-04 13:18:56 +01:00
PabstMirror
eb8f5ffac3
Overpressure - Don't add backblast damage if blocked (#5848) 2017-12-03 14:03:49 -06:00
commy2
2e9b195021 Scale grenade torque depending on throw mode (#5845) 2017-12-03 16:37:13 +00:00
SilentSpike
e0ae842ff0
Remove some pp effects while in spectator (#5846)
Closes #5708
2017-12-03 16:35:51 +00:00
PabstMirror
82aa953e66 Fix BIS_fnc_lerp causing crash in 3rd person spectator (#5844)
* Fix BIS_fnc_lerp causing crash in 3rd person spectator
* Clarify spectator 3PP camera distance code
2017-12-03 16:10:48 +00:00
Dystopian
0d69f6ac67 Add persistent laserpointer (#5821)
* Add persistent laser

* Fix init in favour of CBA Settings one
2017-12-03 07:22:49 +01:00
PabstMirror
d1ba153ae8
AdvThrow - Fix toqrue script error for IR strobes (#5842)
Close #5835
- Add config to GrenadeCore (IRStrobeBase: GrenadeCore)
- Verify array is valid 3d vector in throw.sqf
2017-12-02 12:23:34 -06:00
PabstMirror
a00457ccff
Map - Don't move map when player is dead (#5843)
Close #5830
2017-12-02 11:57:36 -06:00
PabstMirror
726ef4ad0d
Remove cargo from parachutes (#5841) 2017-12-02 11:11:07 -06:00
commy2
0e3aeb8767 add setting to hide freefall altimeter, ref #5596 (#5836)
* add setting to hide freefall altimeter, ref #5596

* warning for changed mid mission
2017-12-02 11:02:32 -06:00
SilentSpike
ec09c2beda Remove parachute landing animation (#5794)
* Remove parachute landing animation

The vanilla animation has since been reworked and is an improvement.

* Optimise altimeter code

* Fix reserve chute handling and cutting action

* Fix cut parachute action

* Fix cut parachute action further

- Prevent potential for action to be present when reserve is not
available
- Move cut parachute action to the parachute self actions rather than
the player's

* Revert number to string conversion
2017-12-02 11:02:16 -06:00
ulteq
24b58fbb21
Scopes - Allow 0.05 mrad increments (#5840)
* Scopes - Allow 0.05 mrad increments
2017-12-02 16:23:41 +01:00
ulteq
c5e594ffb8
Wind Deflection - Settings cleanup (#5838)
* Removed confusing 'simulationRadius' setting
2017-12-02 14:18:57 +01:00
ulteq
b7be7d1cf4
Wind Deflection - Only track remote bullets if they're tracers (#5839)
* Do not run the PFH for remote projectiles unless they are tracers
2017-12-02 14:18:35 +01:00
ulteq
fd8ea42c50
Advanced Ballistics - Fix maxTime calculation if airFriction == 0 (#5837) 2017-12-02 12:34:52 +01:00
commy2
7cfb2b865c Fix enum errors (#5834)
* Fix enum errors

* Update fnc_paradropItem.sqf

* Update fnc_actionPlaceInBodyBag.sqf

* Update fnc_compat_spectatorBI.sqf

* Update ACE_ZeusActions.hpp
2017-12-01 10:34:27 -06:00
ulteq
9c4a32d1df Advanced Ballistics - Removed all unnecessary settings (#5814)
* It just works automagically
2017-11-30 17:13:54 -06:00
PabstMirror
b86ef91d7a
Disable cookoff on RCWS turrets (#5605)
* Disable cookoff on RCWS turrets

* getNumber

* Change config name, add doc
2017-11-30 17:07:46 -06:00
Tim Beswick
e85c752ca6 Cook-off probability and cook-off tweaks (#5585)
* Added cookoff probability for vehicles. Tweaks to cookoff to stop total blocking of destruction in some cases.

* Changed var name to probability. Better method for getting config value.

* Fixed naming error

* Changed setting to be a global coefficient. Added some info to cookoff doc

* Reverted hitfuel check

* Reverted damage threshold for cook-off

* Tweaked probability calculation

* Update fnc_handleDamage.sqf
2017-11-30 16:54:47 -06:00
classic
504d54461e Update Japanese translations (#5831)
* Update Japanese translation for captives

* Update Jpn translation for common

* Update Jpn translation for cookoff

* Update Jpn translation for finger

* Update Jpn translation for googles

* Update Jpn translation for hitreactions

* Update Jpn translation for interaction

* Update Jpn translation for magazinerepack

* Update Jpn translation for mk6mortar

* Update Jpn translation for noradio

* Update Jpn translation for overheating

* Update Jpn translation for pylons

* Update Jpn translation for rearm

* Update Jpn translation for respawn

* Update Jpn translation for scopes

* Update Jpn translation for spectator

* Update Jpn translation for switchunits

* Update Jpn translation for vehiclelock

* Update Jpn translation for weaponselect

* Update Jpn translation for weather

* Update Jpn translation for zeus

* Update Jpn translation for reloadlaunchers

* fix the tag
2017-11-30 16:52:27 -06:00
SilentSpike
1f987c0f3d Prevent virtual spectators falling into water (#5832)
Fix #5775
2017-11-30 16:51:34 -06:00
PabstMirror
d357395b4b
Minor fixes for 1.78 RC (#5825) 2017-11-30 10:29:35 -06:00
PabstMirror
ef8825bb21
Fix ab module strings (#5829) 2017-11-29 14:07:44 -06:00
Dystopian
fc8a70872f Lock object while loading to cargo + disable disassembling (#5624) 2017-11-29 14:07:30 -06:00
Dystopian
64384280d0 Fix repair sound (#5706)
* Fix repair sound

* tabs
2017-11-29 13:36:48 -06:00
ulteq
2163e712e5 Ballistics - Dispersion overhaul (#5819)
* Ballistics - Dispersion overhaul
* Updated rifle dispersion according to the data from @dagger

* Updated AUTHORS.txt
2017-11-29 13:18:52 -06:00
PabstMirror
5f062caaea
fix medical enableAdvancedWounds setting (#5826) 2017-11-29 12:19:26 -06:00