Commit Graph

9989 Commits

Author SHA1 Message Date
PabstMirror
5d039b72d6
Cookoff- Damage handling disabled by default (#6264) 2018-04-13 23:09:16 -05:00
PabstMirror
6a4f2b1fda
Hellfire - Fix hellfires not showing after 1.82 (#6259)
Inherit from RocketPods instead of scalpel which has changed
2018-04-13 23:08:56 -05:00
PabstMirror
10a3a29ea0
Drop FCS from aircraft (#6265) 2018-04-13 23:08:39 -05:00
Dystopian
350711a86c Fix repair at dead vehicle (#6262) 2018-04-13 18:37:08 -05:00
PabstMirror
fa39e97203 Merge branch 'master' into release-3.12.2 2018-04-12 10:59:46 -05:00
Josuan Albin
1994e301fd More various ace arsenal fixes (#6192)
* Compile stats on preInit

* Remove uneeded check in add/removeStat

* Remove perf profiler vars

They aren't required anymore

* Fix case issue in verifyLoadout, remove uneeded line

* Fix ace arsenal cam not working porperly underwater

By removing those checks the cam is allowed to clip through objects and work properly underwater, sounds like features to me :D

* Fix gunbag behavior in ace arsenal

Switching between gunbags will keep the weapon, switching to another backpack then back to a gunbag will also keep the weapon.

* Fix text scaling in the searchbars and loadout name edit boxes

Also made the text bigger by default
2018-04-12 10:44:23 -05:00
shukari
468da8b79b Fix fastropes being blocked after rope breaking (#6239)
* add broken state

* add broke state

* add broken state

* add broken state

* add broken state
2018-04-12 10:23:18 -05:00
Kex
b7942fdb83 Remove arsenal when already present (#6246) 2018-04-12 09:25:57 -05:00
PabstMirror
e7b7219bd9
Repair - Handle changes to getAllHitPointsDamage (#6250)
Since 1.82 `getAllHitPointsDamage` returns lower case
Fix track repair and hit point groups being case sensitive
Part of #6248
2018-04-12 09:15:57 -05:00
jonpas
1217d912ef Prepare release 3.12.2 2018-04-11 22:20:47 +02:00
PabstMirror
731ac2a268
Cleanup ace_vehicles for 1.82 (#6247)
Close #6220
2018-04-11 15:18:21 -05:00
PabstMirror
5ea2069b76
Arma 1.82 compat (#6201)
* Arma 1.82 compat

* Add tank to required addons
2018-04-11 15:18:05 -05:00
Dedmen Miller
3ca8105e9e Improve Reload TakeEH (#6242)
* Improve Reload TakeEH

* Simplify explosives take EH
2018-04-11 08:53:23 -05:00
blaffer
7634f4657b Fix #6234 (#6235) 2018-04-09 22:50:57 -05:00
shukari
181d2ef5e1 fix #6237 (#6238) 2018-04-09 22:48:58 -05:00
rufix
b6b58d4860 Update headers 2018-04-10 03:55:28 +02:00
Dedmen Miller
50abe911a5 Change stringToColoredText to accept a hex string (#6241) 2018-04-09 16:20:03 +01:00
PabstMirror
d41779dc74
Fix getAllRearmTurrets (#6224) 2018-04-07 20:23:10 -05:00
PabstMirror
ba9cff211a
Refuel - Fix hint string not being localized (#6214) 2018-04-07 20:22:46 -05:00
PabstMirror
743fbd4875
Cleanup old classnames (#6206)
Fix #6205
2018-04-07 20:22:14 -05:00
PabstMirror
85cf4424f9
Fix german medical translation (#6223) 2018-04-02 00:59:47 -05:00
lugubrioushatchling
e1241da4a9 Fixes for portuguese translation of ACE medical (#6222)
* Update stringtable.xml

* Update AUTHORS.txt

* Update stringtable.xml

* Update stringtable.xml
2018-04-02 00:35:27 -05:00
xnooztvFR
fc6f4418d3 Fix french translation (#6180)
* Fix french translation

Fix french translation

* Changes from alganthe/Vdauphin
2018-04-02 00:34:20 -05:00
jonpas
8548ff7eb8
Add support for Razor Wire on Prei Khmaoch Luong (#6199)
* Add support for Razor Wire on Prei Khmaoch Luong

* line for each model
2018-03-18 12:49:48 +01:00
vabene1111
b5eb4ac834 Fixed Slideshow action numbering (#6198)
Slideshow Action names would not be named on clients because counting was only done on the server, this would result in all actions on one object showing up in the same slideshow set
2018-03-17 18:12:33 +01:00
Jaffa
b6a2315525
Allow local goggle effects to be set per client
From what I can see goggles are all handled locally and do not need to be globally enabled/disabled. If a group wants to force the setting, CBA provides optional force functionality.
2018-03-05 21:20:32 +00:00
Josuan Albin
859b6a16f6 Fix error in ACE Arsenal stats (#6175)
* Fix the camera on remote units ending after ace arsenal closes

* Shorten handleStats, fix error with face, voice, insignia tabs

* Remove uneccessary code

You saw nothiiiiing.
2018-03-03 18:34:24 +01:00
mharis001
8ee7c1b132 Shorten handleStats window resize (#6176) 2018-03-03 18:33:29 +01:00
ulteq
21ae61e551 Fix allowSwapBarrel condition (#6170) 2018-02-27 17:35:03 -06:00
Dystopian
3feafc449f Interaction - Add Flip and Push actions to Quad Bike, Kart and Static Weapons (#6019)
* Add Flip and Push actions to Quad Bike

* Add actions to karts and static weapons

* Move magic number to macro

* Ditch here is

* Move condition to function
2018-02-26 12:23:47 -06:00
Dystopian
a2804f6097 Add Camping Light interaction (#6078)
* Add camping light interaction

* Add dragging

* Add cargo loading

* Handle Camping_Light_off objects

* Fix work in MP

* Replace action with command
2018-02-26 12:12:21 -06:00
Dystopian
ee7a1f6acb Improve class initialization (#6085) 2018-02-24 12:39:03 -06:00
mharis001
bca8b01860 Various additions to ace_zeus (#6036)
* Add search to teleport players UI

* Change group side icons to look better

* Improve teleport UI and add stringtable entries

* Add Assign Repair Vehicle module

* Add Assign Repair Facility module

* Add Assign Engineer module

* Add Full Heal module

* Add Suicide Bomber module

* Make heal module work without ace_medical

* Add suicide bomber module translations

* Improve attribute cargo to use displayName

* Improve set engineer ui

* ACE_Curator for repair modules + author array

* Add angle param to getModuleDestination

* Prevent multiple suicide bomber modules on same target

* Heal module: support BI scripted revive system

* Requested changes
2018-02-24 11:44:57 -06:00
mharis001
e813af667f BFT settings subcategory (#6165) 2018-02-23 23:40:47 -06:00
PabstMirror
04bb3d981c
InteractionMenu - Always compile before adding main action (#6156) 2018-02-23 23:30:33 -06:00
PabstMirror
f70dfaf160
Arsenal - Compile stats on first use (#6159)
* Arsenal - Compile stats on first use

* fix )
2018-02-23 23:30:15 -06:00
Josuan Albin
123c19c1c0 Scope stats and ballistic stats improvement (#6164)
* Hide some of the ballistic stats if config value not defined

ACE_magMuzzleVelocity
ACE_bulletMass
ACE_ballisticCoef

* Add vertical and horizontal scope limits stats
2018-02-23 23:29:41 -06:00
commy2
1835ccebb8 Fix empty return value of getUnitTrait (#6160) 2018-02-21 11:05:17 +01:00
John Lillis
d64a0c6728 Remove SwayFactor ACE setting and module addition 2018-02-18 11:09:49 -05:00
PabstMirror
741407f6e1 Arsenal - Add stat for scope magnification (#6150) 2018-02-18 02:32:19 +01:00
Orbis2358
5bb27a28a7 Korean translations fix (#6151)
* Korean translations fixed

Avulsion: 적출상
Laceration: 열상
Crush: 압궤상
Puncture Wound: 자상

* Update AUTHORS.txt
2018-02-18 02:31:34 +01:00
PabstMirror
4ec1039490
Add missing semicolons (#6148) 2018-02-15 10:31:14 -06:00
Josuan Albin
1d6e07d18f Add ACE Arsenal stats (#6110)
* Add test class

* Add stats mockup

* Merge branch 'master' of https://github.com/acemod/ACE3 into arsenalStats

* Finish mockup, add basic hide/show logic

* Add base for stats

* Use CBA EHs for stats to allow 3rd party mods of it

* Add handleStats and most of the UI behaviors for stats

* Continue work on stats

* Add container stats

* Add page support for stats

* Add text for the ROF stat

* Add accuracy in MOA for the accuracy stat

* Change accuracy shown number to 1 decimal instead of 2

* Add MIL in the dispersion stat text

* Change stats layout, remove dummy text strings

* Add some AB stats

* Remove last test string

* Replace configExtremes by normal lookup where it's relevant

* Add "undefined value" string when AB stat isn't present

Mostly for laucnhers

* Fix typo in preInit

* Change drag model stat to ballistic coef

* Fix issue with unused stats, change text to white when bar is present

* Rewrite some part of handleStats

Reason: add support for conditions, less redundant code, less reasons for dedmen to emasculate me

* Re-add _hideUnusedFnc, handle empty stats arrays

* Pass args to stat conditions, add test condition stat

* Add hearing related stats

* Remove the padding between stats and the stat bar / text

* Add strings for stats

* Change stats window to fit baer's suggestion

* Algin the close stats button, add missing strings

* Finish code review

* Add missing newline

* Remove duplicate strings

* Add explosive range stat

* Use proper string for the explo range stat

* Fix capitalization for ctrlParent

* Fix conditional stats blocking other stats

* Add better integration for ballistics, hearing and explosive stats

* Replace the private array in handleStat by params

* Add backblast stats

* Add backblast stat strings

* Add flashlight map color and g-force reduction stats

* Shorten preInit

* Change stats close button to fit arsenal design

* Improve stats page indicator look

* Rework how stats are stored and retrieved

* Remove args config entry, add priority entry, add vanilla weapon stats

* Add vanilla container stats

* Remove some lines in preInit

* Add ballistics stats

* Add hearing stats

* Remove uneeded config entries

* Add explosive range stat

* Add backblast stats

* Add spaces after semicolons in statements

To make JJ happy because I don't care.

* Add flashlights map color stat

* Add gforce reduction stat

FINALLY FUCKING DONE

* Fix headers for the new stats funcs

* Add add / remove stat API

* Fix typo in removeStat header

* Remove uneeded inline func

* Clean up add / remove stat

* Move all CfgACEArsenalStats entries to their own file

* Replace STR_ACE_Ballistics_statAmmo by a BI string

* Add script profiler related macro and code

* Use the highest ballistic coef instead of first one defined

* Add support for future ammo displayname

* Add ACE_standardAtmosphere for ballistic coef

* Add mag muzzle velocity stat

* Add weapon muzzle velocity stat

* Add comment explaining the ENABLE_PERF_PROFILING macro

* Change cfgACEArsenalStats to ACE_Arsenal_Stats

* Make JJ less pissy about spaces around =

* Fix indentation in weaponMuzzleVelocity, use param

* Use GVAR and EGVAR when appropriate

* Prefix all stats except the base class

* Fix Merge

* Fix aspect ratio scaling of stats panel

* Minor fixes
2018-02-15 10:03:22 -06:00
Whigital
f214b884a2 Settings strings (#6136)
* [hearing] Update strings

* [medical] Update strings

* [medical_ai] Update strings

* [medical_menu] Update strings

* [nametags] Update strings

* [nametags] Use existing DisplayName entries

* [medical_menu] Correct spelling

* [medical] Disable unreferenced setting

* [medical] Overdosing strings

* [medical_menu] Correct key IDs

* [repair] Update strings

* [medical] Correct spelling
2018-02-13 13:30:38 -06:00
Dystopian
e683c524d7 Map - Add Camping Light support (#6087)
* Add Camping Light support

* Add intensity check
2018-02-13 13:27:57 -06:00
Josuan Albin
04191e3c99 Fix ACE Arsenal interaction condition (#6140)
* Fix ACE Arsenal interaction condition

* Remove empty array
2018-02-10 13:13:59 -06:00
PabstMirror
1c6c7914dc
Interaction - Fix div0 error in getVehiclePos (#6139)
* Interaction - Fix div0 error in getVehiclePos

* Formating
2018-02-09 21:45:21 -06:00
PabstMirror
c864a6d569 Vehicle Lock - Convert to cba settings (#6133)
Switch vehicleStartingLockState from slider to list
Close #6014
2018-02-10 03:32:14 +01:00
PabstMirror
2b89b3102b HuntIR - Register as a feature cam (block NVG border) (#6138)
Fix #6135
2018-02-10 03:31:38 +01:00
PabstMirror
e73a2ddec0 NightVision - Add setting for shutter effects (#6134)
Also convert to cba settings
Close #6119
2018-02-10 03:31:22 +01:00
PabstMirror
4cabaa48b7
Pylons - Fix old weapons not being removed (#6100)
* Pylons - Fix old weapons not being removed

Fix  #6088
- Use removeWeaponTurret instead of removeWeaponGlobal
- Fix "Too Far" warning showing on completion

* Fix _x

* Fix var name

Co-Authored-By: Ozan Eğitmen <ozanegitmen@gmail.com>
2018-02-09 19:17:57 -06:00
Dystopian
59783a2e7a Small changes to persistent laserpointer (#6101) 2018-02-09 15:31:05 -06:00
Josuan Albin
8b9480de40 Add various misc improvements for ACE Arsenal (#6111)
* Disable anim previews when center isn't the player

* Abuse configs to change the edit loadout 3DEN entry

* Remove inheriting as it's not needed

* Remove uneeded condition

* Add zeus modules for ACE Arsenal, revert old arsenal modules

* Add 3 new arsenal EHs

* Add a setting to disable the identity tabs in ace arsenal

* Pass loadoutName in the onloadoutLoad EH

* Change foreach to forEach and ctrlcommit to ctrlCommit

* Resize the right window when the load bar isn't there

* Add a tooltip for the "clear container" button

* Improve onKeyDown, add classname copying using ctrl+c
2018-02-09 14:30:37 -06:00
commy2
eedb9fe614 weaponSelect CBA Setting (#5581)
* weaponSelectCBASetting

* Update to movedToSQF

* Add category
2018-02-09 14:28:34 -06:00
PabstMirror
ba5d44b848
Allow displayTextStructured to be moved via game layout settings (#6102)
* Allow displayTextStructured to be moved via game layout settings

Fix #6081

* Fix comment, add upperleft bounds check
2018-02-09 14:27:40 -06:00
PabstMirror
9e213f0e9a
Fix movedToSQF (#6124) 2018-02-09 14:27:21 -06:00
PabstMirror
e8da3e6435
Arsenal - Pass arsenal dispay to displayOpened event (#6109) 2018-02-08 13:42:07 -06:00
PabstMirror
5bef98d4ff
Decrease direct hit damage done by AGM-114N (#6121)
Fix #6114
2018-02-08 12:32:01 -06:00
PabstMirror
73e7ad5c79
Scopes - Use real zero for non-adjustable scopes (#6128) 2018-02-08 12:01:41 -06:00
God of Monkeys
3c697ca80b Chinese Language Update (#6130)
Chinese Language Update
2018-02-07 15:15:15 -06:00
BaerMitUmlaut
7b50d4a7a6 Add seperate setting for noise intensity (#6059) 2018-02-06 13:38:23 -06:00
Dystopian
f0a2b68f3d Aircraft - Disable scripted eject if vehicle is locked (#6096)
* Add lock check

* Delete seat lock check
2018-02-04 12:47:54 +01:00
mharis001
27504468e4 Change cargo menu to look better (#6112) 2018-02-01 16:41:56 -06:00
BrenSilent
4258b9a6d6 [German Translation] Update for new Settingsmenu (#6015) (#6016)
* German translation update

This updates partially the german translation for the new cba settings UI

* Fix tooltipp

Fixes the tooltipp for the safezone when switching units

* Fixes

Various fixes after review

* Missed two

Fix in stringtable for arsenal

* Gonna catch em all

Another small mistake i missed.
2018-02-01 12:09:11 -06:00
Jo David
db93a42891 add muffling to new LOW headsets (#6106) 2018-01-31 16:19:28 -06:00
PabstMirror
1b6dc5ae2d
HuntIR - Fix connecting when ammo is null (#6099)
Fix #6093

`[_nearestHuntIRs select 0] call FUNC(cam);` would pass nill
Also delay opening GUI for a frame to prevent issue with interaction menu
2018-01-30 21:50:24 -06:00
PabstMirror
4857294510
Advanced Throwing - Disable when controlling UAV (#6092)
Close #6069
2018-01-30 10:54:34 -06:00
mharis001
b30e188d1a Change ace_map settings to use CBA init directly (#5984)
* Make default channel setting a list

* Convert more map settings to CBA

* Give BFT settings own category

* Remove '?' from end of setting display names

* Fix mistake of ACE_Settings removal (movedToSQF = 1)

* Move settings to initSettings.sqf
2018-01-28 15:50:28 -06:00
sbng-PAPA
6ce8b8473a korean translate 3.12.x (#6071) 2018-01-28 15:42:32 -06:00
Josuan Albin
29a0b2ef09 Misc arsenal fixes (#6083)
* Change backpack and scope checks in scanConfig and addVirtualItems

Reason: was not a good implementation
Might cause issue of people compalining about tents.

* Give IDC to menuBar controls, disable import button in MP

Reason: copyFromClipboard is disabled in MP

* Add tooltip strings for the loadouts, export, import menu buttons

* Remove double space in onArsenalOpen
2018-01-28 15:39:46 -06:00
Brunius
cc503e041b Add pylon whitelist option (#6080)
* Adding pylon whitelist option

* Changing tabs to spaces :(

* Changing to use QGVAR

* Changing name in QGVAR to more clearly reflect function of variable

* Docs for the magazine whitelist function in pylons

* Changes to match style guide

* More docs

* More tabs

* Update pylons-framework.md

* Update pylons-framework.md
2018-01-28 15:38:48 -06:00
BaerMitUmlaut
3c04d61a0d Fix medical AI activation (#6077) 2018-01-24 19:08:39 +01:00
Mark Ruffner
f46082a1fe fix (another) missing call (#6079) 2018-01-24 08:18:42 +01:00
Mark Ruffner
8ba81c53a3 Add spectator handling of grenades (#6012)
* Handle non-local vanilla grenade tosses

* handle advanced throwing grenades

* Track through events

* Add missing calls
2018-01-23 00:31:44 +01:00
PabstMirror
46a31e1f9c Add ace hellfire support to rhs apaches (#6056)
Close #5956
2018-01-22 23:15:23 +01:00
Christian Klemm
7ba394c711
Enabled cancel button when exiting arsenal 2018-01-19 18:21:01 +01:00
classic
00af6844cd Update jpn translations (#6031)
* Update Japanese translation

* Update Japanese translation

* Update Japanese translation
2018-01-18 20:16:24 -06:00
jonpas
88963cdae8 Prepare release 3.12.1 (build 2) 2018-01-15 21:35:34 +01:00
jonpas
7c97e5fab6 Merge branch 'master' into release-3.12.1 2018-01-15 21:34:21 +01:00
Dystopian
70ca4d01a7 Fix house-type object carrying in building (#6049) 2018-01-15 19:02:06 +01:00
Josuan Albin
b7606800a1 Match case for magazines in fillRightPanel (ACE Arsenal) (#6044)
* Match case for magazines in fillRightPanel

Apparently you can have different case between the entry in the weapon magazines array and its actual configname...

* Add possible fix for the mission end bug

* Add ded's proposed fix, remove closeOnMissionEnd

CloseOnMissionEnd is bugged in 3DEN and force close the display after it's opened
2018-01-15 18:21:38 +01:00
ulteq
a5523bc0c7
ATagMX - Allow one decimal place for the bullet mass (in grams) (#6041)
Closes: #6040
2018-01-10 19:44:53 +01:00
jonpas
2303f345af Prepare release 3.12.1 2018-01-07 02:49:17 +01:00
PabstMirror
00ba133b21 Dev helper function to convert settings to code (#5752)
* Dev helper function to convert settings to code

* fix double //

* Add movedToSQF config

* Fix paramArray settings

* Add movedToSQF to moveMarkers

* Add tabs
2018-01-07 02:46:47 +01:00
Dystopian
e24ed0fa92 Fix back blast if damage not allowed (#6030) 2018-01-06 18:24:44 -06:00
commy2
3eddd5ef72 fix make error (#6028) 2018-01-06 16:57:44 +01:00
PabstMirror
2ced42ae3a Cleanup markers 2018-01-06 00:52:57 -06:00
Josuan Albin
3839f2f5fc Minor arsenal fixes (#6025)
* Change "ok" to "apply" while in 3DEN

* Move execNextFrame from initBox's action to openBox

This was done in order to avoid crashes on custom actions
2018-01-06 01:30:33 +01:00
SilentSpike
dbe6a04e8a Optimise spectator loops (#6021)
* Optimise spectator loops

`count` is only quicker than `forEach` when the final command returns a
boolean or nil. `forEach` is quicker if the final command returns any
other data type.

* Use `forEach` instead of `count`
2018-01-06 01:30:15 +01:00
PabstMirror
4eb7868f1a
NVG - Fix grain and color effects (#6018) 2018-01-05 18:23:56 -06:00
SilentSpike
fd815c5ed8
Serialize spectator help control variable (#6023)
Could result in an on-screen error if the spectator API was used in a scheduled environment.
2018-01-05 20:41:43 +00:00
Josuan Albin
0acbde1489 Various ACE Arsenal fixes (see description) (#5996)
* Copy the array properly when using preStart cache in openBox

* Fix add and removeVirtualItems erroring out when passing false as arg

* Disable face, voice, and insignia tabs in 3DEN

* Move grenadeList and putList outside of foreach in scanConfig

* Fix grenadeList and putList indentation

* Change the camera handling in onArsenalClose

Fixes the camera not being focused on the player after using ACE Arsenal on an other unit outside of zeus / 3DEN.
Remove the code that moved the curatorCam near the edited unit after ACE Arsenal is closed.

* Fix message control overflowing, move width defines to defines.hpp

* Add ability to exit arsenal and not apply a loadout in 3DEN

* Add ACE3 logo to common, fix config pathing to a non existing file
2018-01-05 18:56:21 +01:00
PabstMirror
4379346b2f Medical - Increase revive max time to 60 min (#5992) 2018-01-05 18:55:27 +01:00
commy2
3c41d37417 overhaul movable markers (#5922)
* overhaul movable markers

* moving markers setting

* disable debug

* fix conflict with map gestures
2018-01-05 18:55:00 +01:00
SilentSpike
fb3fc09997
Center spectator map correctly in FPP (#6010)
Instead of centering on the camera object use `positionCameraToWorld` to get the actual viewpoint
2018-01-04 18:03:38 +00:00
Dystopian
71909a9be3 Add custom repair positions to all quadbikes (#6011) 2018-01-03 11:01:17 +00:00
commy2
b7dd5c5692 add sandbag preview image, proper editor category (#6008) 2018-01-02 11:01:25 -06:00
SilentSpike
33e25535c9
Deprecate common function numberToDigitsString (#6007)
* Deprecate common function numberToDigitsString
2018-01-02 17:00:01 +00:00
PabstMirror
966cf8d748
Cleanup maverick (#6000)
* Cleanup maverick config

* x

* Cleanup ACE_Comanche_Test

* fix formatting (and poke Travis)
2018-01-02 10:37:16 -06:00
SilentSpike
1f818981ed
Fix unconscious hidden status not being reset on respawn (#6006) 2018-01-02 16:18:44 +00:00
SilentSpike
4bb16c043c
Optimise cellphone IED function slightly (#6005)
* Optimise cellphone IED function slightly
* Fix distribution and use CBA function
2018-01-02 16:18:12 +00:00
commy2
183fc93c5a
Merge pull request #6001 from acemod/fishykins-master
add allowFadeMusic setting
2018-01-02 17:12:47 +01:00
commy2
ef77bb077e
Merge pull request #5987 from acemod/setHidden-forgetTarget
make setHidden use forgetTarget
2018-01-02 16:28:10 +01:00
commy2
32755e4e91
forget only different side 2018-01-02 16:26:13 +01:00
commy2
bcf834d2c7
Merge pull request #5894 from acemod/ownerEvent-instead-of-local-logic
use ownerEvent instead of game logics
2018-01-02 16:16:58 +01:00
commy2
b0d0029c7a disable debug mode 2018-01-02 16:13:57 +01:00
commy2
8ecd44b9f2 fix a bug in place after anim adjustment 2018-01-02 16:04:21 +01:00
commy2
be56c991ed
Update stringtable.xml 2018-01-02 16:00:35 +01:00
commy2
3e2ef7ba36 editor icon, editor category, delete on death 2018-01-02 15:56:15 +01:00
commy2
3b02e5e90e Merge branch 'master' of https://github.com/acemod/ACE3 into tripd-updates 2018-01-02 15:14:04 +01:00
commy2
6a70ab1ff4 allowFadeMusic setting 2018-01-02 14:57:19 +01:00
commy2
7e3f36e23d Merge branch 'master' of https://github.com/acemod/ACE3 into fishykins-master 2018-01-02 14:37:54 +01:00
commy2
6dec4c8259 Merge branch 'master' of https://github.com/fishykins/ACE3 into fishykins-master 2018-01-02 14:37:13 +01:00
xrufix
d3e93c9dc1 Add Kh25ML Laser Guided AGMs (#5912) 2017-12-31 18:01:09 -06:00
commy2
7d7d37409e
Merge pull request #5971 from JoramD0/incenTweak
Tweaked effective area of incendiary grenades
2017-12-31 13:40:37 +01:00
commy2
66fc592dbe
destruction vs effect 2017-12-31 13:36:55 +01:00
commy2
ed97be0e06
radius vs area 2017-12-31 13:33:42 +01:00
commy2
20ea56100f
Merge pull request #5908 from xrufix/realisticnames
Updates to realisticnames
2017-12-31 13:31:31 +01:00
commy2
89e1fc243a
Merge pull request #5995 from Dystopian/add_macro_brackets
Add parentheses to GETVAR macros
2017-12-30 19:15:00 +01:00
Dystopian
03ade05611 Add parentheses to GETVAR macros 2017-12-30 16:38:45 +03:00
PabstMirror
7d998acc71 Fix rearm entire vehicle argument order (#5993) 2017-12-30 12:46:11 +00:00
Josuan Albin
1b332129e6 Add QOL improvement for the ACE Arsenal loadouts screen (#5973)
* Add search bar in loadouts screen

* Add onKeyDown support for the loadouts display

* Add ctrl+key support to both editbox in the loadouts screen

* Fix syntax error
2017-12-30 01:13:06 -06:00
PabstMirror
65fe101aaf
Arsenal - Filter items with scopeArsenal = 0 (#5988)
* Arsenal - Filter items with scopeArsenal = 0

* change order
2017-12-29 12:39:24 -06:00
PabstMirror
6d2da10558
Arsenal - Add Missing semicolons (#5990) 2017-12-29 12:39:02 -06:00
SilentSpike
dfe803107a
Fix displayName of spectator respawn template (#5989) 2017-12-29 16:47:49 +00:00
commy2
13e52b4410 make setHidden use forgetTarget 2017-12-29 02:48:20 +01:00
SilentSpike
81722abeac Use engine command to select weighted spall size (#5985)
* Use engine command to select weighted spall size

* Remove multi-line macro
2017-12-28 19:08:11 -06:00
commy2
542849cdf7
merge 2017-12-27 11:37:54 +01:00
commy2
8bca2ac73b
Merge branch 'master' into arsenal-main-menu 2017-12-27 11:36:32 +01:00
bux
747a3aa111 improve tooltip 2017-12-27 08:14:26 +01:00
PabstMirror
e66e9c2453
Show cba settings in debug button (#5978) 2017-12-26 17:43:42 -06:00
Josuan Albin
69f7484f12 Add a function to port BI VA loadouts to ACE Arsenal (#5943)
* Add a function to port BI VA loadouts to ACE Arsenal

* Fix typos in the header

* Remove override argument, add button in 3DEN

* Add null player exception

* Remove unused passed argument

* Add error messages to portVALoadouts

* Change error messages

* Add missing dot in string
2017-12-26 17:43:33 -06:00
Jo David
54320eb451 Fix(explosives): Selecting a cellphone as an IEDs trigger would throw an error (#5963)
* move code var to outer scope

* run closeDialog only for the player
2017-12-26 17:20:43 -06:00
PabstMirror
fe531d71f3
Scopes - Fix undefined enum types (#5969) 2017-12-26 17:09:03 -06:00
commy2
057cc8d6d5 rename 'close' to 'try' in arsenal 2017-12-24 20:41:13 +01:00
commy2
4fb556d7ac make bots not talk 2017-12-24 20:27:33 +01:00
commy2
bb47249679 make bots not talk 2017-12-24 20:09:34 +01:00
commy2
2d2bf2acd4 save and restore last loadout 2017-12-24 20:07:33 +01:00
JoramD
fcba14ef71 Tweaked affected area for objects 2017-12-24 12:06:18 +01:00
JoramD
f0eb7dd479 Tweaked effect size of AN-M14 2017-12-24 11:30:02 +01:00
Josuan Albin
12208b4ebe Fix some scaling issues in ACE Arsenal (#5959)
* Fix various text not resizing properly on lower resolutions

* fix spacing of arsenal the menu bar

* Increase weight control width to avoid cutoff
2017-12-23 10:17:39 -06:00
PabstMirror
8e6e2b3283
Ignore explosives placed without ace_explosives (#5962) 2017-12-22 18:34:35 -06:00
commy2
f31eb52b08 oops 2017-12-22 21:54:55 +01:00
commy2
96f3791855 final code conversions, esc to exit 2017-12-22 21:41:13 +01:00
commy2
e3c94821a2 ace version of createUnit 2017-12-22 20:26:25 +01:00
commy2
6865c95f16 redo arsenal scripting 2017-12-22 19:44:31 +01:00
bux
774aca4a1d use pixel drawn ace logo instead of antialiased 2017-12-22 18:00:07 +01:00
commy2
33c2b96bb3 converting to ace standards 2017-12-22 15:09:06 +01:00
commy2
ac09c0f75a enable the debug console 2017-12-22 11:26:29 +01:00
bux
57dc1de4ff adjust icon width for main menu 2017-12-22 11:14:48 +01:00