Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,863 Commits 73 Branches 88 Tags 752 MiB
e2a863751f
Commit Graph

11863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
commy2
e2a863751f Arsenal numpad enter for search (#5928) 2017-12-19 18:35:32 +01:00
jonpas
47051d9c6d Revert premature version bump 2017-12-18 18:03:21 +01:00
jonpas
80165fb9c0 Prepare release 3.12.0 (build 2) 2017-12-18 17:43:15 +01:00
jonpas
c4637da6af Merge branch 'master' into release-3.12.0 2017-12-18 17:40:27 +01:00
PabstMirror
c8b9483b44 Nightvision - Add setting for blur when ADS (#5924) 
* Nightvision - Add setting for blur when ADS

* Allow blocking brightness control
 2017-12-18 17:38:03 +01:00
SilentSpike
0a31a24fdf Fix FRIES being applied when attribute unchecked (#5926) 2017-12-18 17:30:36 +01:00
Dystopian
1385f12542 Add brightness control when NV effects disabled (#5913) 
* Add brightness control when NV effects disabled

* Add initial ajust and commit. Add comment to math

* Fix math comment

* Change initial level to -3
 2017-12-17 13:09:41 -06:00
Josuan Albin
af09fc652a Add Ctrl+F search shortcut for ACE Arsenal (#5910) 
* Add Ctrl+F search shortcut

* Add ctrl+A and ctrl+x support to search boxes
 2017-12-16 12:33:41 -06:00
PabstMirror
e6683e8077
Add slider settings (#5920) 
* Add slider settings

* WARNING to INFO

* tweak scopes / adv fatigue
 2017-12-16 11:51:15 -06:00
mharis001
5371fb9eef Make attach/detach hint look uniform (#5900) 
Add space at the bottom of hint to make it look nicer
 2017-12-16 16:20:43 +01:00
commy2
0eccca6174 display carried weight in SI and imperial (#5918) 2017-12-16 04:50:17 +01:00
Josuan Albin
7bc396ba24 Update how weight is displayed in ACE arsenal (#5909) 2017-12-16 04:50:02 +01:00
Josuan Albin
a959ae69fd Revert "Fix global behavior in add / remove virtual items funcs (#5887)" (#5911) 
This reverts commit 5fa0179d06.
 2017-12-15 12:29:09 -06:00
ulteq
f9d729c874 Scopes - Fix 'boreHeight' and 'baseAngle' MP synchronization (#5917) 
* Scopes - Unify 'getBaseAngle' & 'getBoreHeight' API

* Scopes - Fix boreHeight and baseAngle MP synchronization
* TODO: Cache the calculation or use publicVariables instead

* Cleanup unused GVARs

* Scopes - Cache getBaseAngle and getBoreHeight results

* Sync baseAngle/boreHeight

* Remove boreHeight/Angle caching

* Cleanup inv check
 2017-12-15 10:22:31 -06:00
PabstMirror
a97dea896f scopes - Fix base angle (#5916) 2017-12-15 10:25:00 +01:00
Andrea Verano
2ecc835438 Italian Translation Update (#5914) 
Added new strings in:
-Advanced ballistics
-Arsenal
-Common
-Cookoof
-Interaction
-Nightvision
-Parachute
-Repair
-Scopes

Fixed some strings in:
-Medical
-Scopes
 2017-12-14 23:32:51 -06:00
ulteq
b77c4d4667 Rangecard - Fixes broken bore height display (#5907) 
* Reverts the getBoreHeight API change from:91425f8576
 2017-12-14 13:43:32 +01:00
PabstMirror
0a87bd134b
Add cookoff setting category (#5903) 
Fix #5902
 2017-12-13 16:04:05 -06:00
jonpas
18d107508b Merge branch 'master' into release-3.12.0 2017-12-12 18:06:24 +01:00
Christian Klemm
d83ce62ee8 Adjusted dig surface whitelist for jungle maps (#5897) 
* Added grasstall to dig surface whitelist

* Added forest to dig surface whitelist
 2017-12-12 17:20:55 +01:00
classic
51f29b7b37 Update Japanese translation (#5891) 
* Update Jpn translation

* Update Jpn translation

* Add Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn tranlastion

* Update Jpn tranlation

* Update Jpn translation

* Updatr Jpn translation

* Update Jpn translation

* Update Jpn translation

* Update Jpn translation

* fix for incorrect indentation

* re-fix incorrect indentation
 2017-12-12 17:17:51 +01:00
Jo David
952af6fa64
Merge pull request #5896 from mharis001/master 
Revert slideshow module to scope = 2
 2017-12-12 17:12:28 +01:00
mharis001
b3c8a243cb Revert slideshow module to scope = 2 
Slideshow is mission utility not setting
 2017-12-12 10:54:48 -05:00
jonpas
047591bc2b Prepare release 3.12.0 2017-12-12 12:40:41 +01:00
jonpas
57da8c3ad0 Fix Mikero tools detection not looking at Wow6432Node 2017-12-12 12:40:33 +01:00
PabstMirror
2aaef9e791
Fix some undefined funcs / strings (#5889) 
* fix missing respawn func / spectator string

* fix readSettingsFromParamsArray, cleanup spec event

* cleanup usless if statement
 2017-12-11 13:10:30 -06:00
Dystopian
d234fd33a0 Add category for laserpointer and reload settings (#5879) 2017-12-10 14:57:17 -06:00
Josuan Albin
a28a06a082 Fix ACE arsenal missing string and unused code in buttonHide (#5890) 
* Add missing ACE_Arsenal_CantOpenDisplay string

* Remove unused code in buttonHide
 2017-12-10 14:48:47 -06:00
SilentSpike
c1045e4266 Update vanilla zeus functions (#5888) 
* Cleanup zeus module

* Update zeus BI functions

* Restore accidentally removed setting check
 2017-12-10 12:29:38 -06:00
PabstMirror
be67cf0737
Transfer old client settings to CBA (#5882) 
* Transfer old client settings to CBA

* Remove cleanup code
 2017-12-10 12:13:17 -06:00
commy2
a38afac04b spotting scope updates (#5880) 
* add tanoha forces spotting scopes and add preview picture

* factory standard preview picture...

* spotting scope damage materials, hide damage anim, buff hp

* delete unused model

* make ai call out spotting scope, proper thread and cost, better icon

* spotting scope death effects

* disable smoke effect
 2017-12-10 12:01:27 -06:00
Josuan Albin
5fa0179d06 Fix global behavior in add / remove virtual items funcs (#5887) 2017-12-10 11:53:51 -06:00
SilentSpike
845f3656d4
Remove deprecated functionality for 3.12.0 (#5878) 
* Remove deprecated functionality for 3.12.0
* Remove associated deprecated module icon
* Restore a dummy version of old module

This is just to prevent existing missions from breaking due to a missing
object.
 2017-12-10 13:38:32 +00:00
PabstMirror
2a448577bb
Fix bofor realistic name UBC (#5884) 2017-12-09 23:47:07 -06:00
commy2
fa61cd3643 improve repair item editor preview images (#5883) 2017-12-09 20:51:45 -06:00
PabstMirror
61c99cb5d8
Attempt to make enum errors more clear (#5876) 
* Add note to enum script error

* Bump Arma/CBA versions

* req 1.78
 2017-12-08 21:39:35 -06:00
jonpas
82f3a57e22 Use ACRE2 add display passthrough keys API in spectator (#5735) 
* Use ACRE2 add display passthrough keys API
* Assure backwards compatibility with older ACRE2 versions
 2017-12-08 23:08:30 +00:00
Dedmen Miller
18d4b9660d Add endRadioTransmissions Event (#5873) 
* Add endRadioTransmissions Event

* Update fnc_endRadioTransmission.sqf
 2017-12-08 10:44:24 -06:00
ulteq
77fd2007ea Advanced Ballistics - Fixed faulty wind attenuation (#5869) 
* Advanced Ballistics - Fixed faulty wind attenuation
* Only relevant at very low altitudes above ground (below 1.6 m)
* Also fixes the Kestrel 4500 readout

* Kestrel 4500 - Minor optimization / fix
* Avoids possible math error 'ln(0)'

* Rebuild Dills
 2017-12-08 10:44:12 -06:00
jonpas
534898a680
Remove dash from Arsenal category name (#5874) 2017-12-08 16:01:58 +01:00
commy2
d1cc7cc12b Add compass control to spectator (#5870) 2017-12-07 22:09:19 +00:00
commy2
44912253af
Merge pull request #5864 from acemod/avoid-setCaptive 
replace usage of setCaptive with camouflageCoef trait
 2017-12-07 23:08:37 +01:00
commy2
24214fc576 Add zeus-like compass control to common (#5860) 2017-12-07 21:51:57 +00:00
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