commy2
68228e9fef
merge
2018-01-02 15:06:53 +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
Ľuboš Lendáč
38e7913caf
Add HealTime modifiers to medical settings ( #5188 )
...
* Add modifiers of TreatmentTime of PAK and Medkit to settings
* Fix indents and stringtable tags
* Fix Healtime vars
* Absolute time for PAK to settings
* Add Medkit Healtime setting
2017-12-30 12:01:23 +00:00
commy2
f4e8972a37
Merge branch 'master' of https://github.com/acemod/ACE3 into medical-rewrite
2017-12-30 10:08:39 +01: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
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
commy2
7797d9906b
fix a crash
2017-12-23 02:19:53 +01:00
commy2
4db844e596
merge
2017-12-23 01:47:43 +01: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
commy2
f6d640b917
icon assets
2017-12-22 11:05:32 +01:00
commy2
0a4c464af8
logos, begin to acify, enable debug console
2017-12-22 10:19:30 +01:00
commy2
1c2ebd0452
add ace arsenal button to main menu
2017-12-22 09:39:01 +01:00
PabstMirror
4cfa64d73a
Laser - Reset hud when exiting UAV ( #5947 )
2017-12-21 16:49:48 -06:00
Christian Klemm
ead5fb4a5e
Added config params for white/blacklisting digging ( #5898 )
...
* Added config params for white/blacklisting digging
* changed to canDig option
* Update README.md
* Update fnc_canDig.sqf
2017-12-20 15:41:50 -06:00
commy2
801afb3061
update extension check ( #5899 )
2017-12-20 15:41:06 -06:00
SilentSpike
2bf67ea057
Use common icon function for vehicle actions ( #5923 )
...
* Use common icon function for vehicle actions
* Always create vehicle icon namespace
2017-12-20 14:30:50 -06:00
jonpas
2ac191dbf7
Prepare release 3.12.0 (build 3)
2017-12-20 16:44:32 +01:00
PabstMirror
c2d6fa53d4
Remove enum warnings ( #5931 )
2017-12-19 12:13:38 -06:00
classic
4e60847c95
Update jpn translation ( #5930 )
...
* Update Jpn translation
* Update Jpn translation
2017-12-19 18:35:49 +01:00
commy2
e2a863751f
Arsenal numpad enter for search ( #5928 )
2017-12-19 18:35:32 +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
rufix
8f5ff1363f
Revert 3c6136bfaf
2017-12-17 12:55:30 +01:00
rufix
2c10265c26
Rename M200 back to "Tropisch"
2017-12-17 12:46:43 +01: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
rufix
3d1e9ac13e
"SIG 556 (Wüstentarn)" -> "SIG 556 (Tarnmuster)"
2017-12-14 13:56:48 +01:00
rufix
a4a9f63dfb
Removed international names for LSVs, added international names for JAS 39 Gripen
2017-12-14 13:49:06 +01: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
rufix
b9d8368b1a
Schreibe "sandfarben" klein.
2017-12-14 13:33:47 +01:00
rufix
2a61ab4bdf
Add missing realisticnames to Syndikat vehicles/aircraft.
2017-12-14 12:21:23 +01:00
rufix
b8e62af673
Add Gryphon/Gripen plane to realisticnames
2017-12-14 12:13:00 +01:00
rufix
497fd080ea
Add Tanoan Ifrit/Karatel to realisticnames
2017-12-14 12:06:10 +01:00
rufix
456f59fc2f
Add Tanoan Marid/Otokar ARMA to realisticnames
2017-12-14 12:04:37 +01:00
rufix
123c5fce37
Add LSVs to realisticnames.
2017-12-14 11:56:57 +01:00
rufix
d5b6b70267
Add ACE tag to Maverick L strings
2017-12-14 11:32:30 +01:00
rufix
22a478019b
Add count of rockets in missiles DAR.
2017-12-14 11:02:57 +01:00
rufix
5448795226
German translations of HK Rifles
2017-12-14 10:59:16 +01:00
rufix
3e1ac5e4ed
German translation of M200.
2017-12-14 10:58:10 +01:00
rufix
7184243251
Rename M249 to FN Minimi.
2017-12-14 10:57:20 +01:00
rufix
c50a1e5796
German translations of Marksman-DLC rifles and MGs
2017-12-14 10:54:14 +01:00
rufix
b0e93e10a8
Rename "TAR-21 EGLM" to "GTAR-21 EGLM".
2017-12-14 10:48:52 +01:00
rufix
9b7ece0ab1
Use "ß" in "Weiß" for M83.
2017-12-14 10:39:27 +01:00
rufix
3c6136bfaf
Rename Germam stromg "ZSU" to "SSU" ("З" is transcribed as "s" in German)
2017-12-14 10:34:15 +01:00
rufix
a9e7e31a4b
Rename "KamAZ" to "KamAS" in German strings (Russian "З" is transcribed as "s" in German).
2017-12-14 10:30:42 +01:00
rufix
023e189786
Rename "Punisher" to "Karatel" which seems to be the official name used.
2017-12-14 10:29:20 +01:00
rufix
838b4e9945
Use "sMG" instead of "SMG" for "schweres Maschinengewehr" (HMG)
2017-12-14 10:22:56 +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
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
