4eb7868f1a
NVG - Fix grain and color effects ( #6018 )
2018-01-05 18:23:56 -06:00
a881e5e2d3
Removing unused classname from wiki ( #6024 )
2018-01-05 22:26:03 +01:00
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
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
4379346b2f
Medical - Increase revive max time to 60 min ( #5992 )
2018-01-05 18:55:27 +01:00
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
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
9e14a73b3c
Fix docker ( #6013 )
...
* update docker stuff
* finalize docker fix
2018-01-03 20:31:30 +01:00
71909a9be3
Add custom repair positions to all quadbikes ( #6011 )
2018-01-03 11:01:17 +00:00
b7dd5c5692
add sandbag preview image, proper editor category ( #6008 )
2018-01-02 11:01:25 -06:00
33e25535c9
Deprecate common function numberToDigitsString ( #6007 )
...
* Deprecate common function numberToDigitsString
2018-01-02 17:00:01 +00:00
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
1f818981ed
Fix unconscious hidden status not being reset on respawn ( #6006 )
2018-01-02 16:18:44 +00:00
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
183fc93c5a
Merge pull request #6001 from acemod/fishykins-master
...
add allowFadeMusic setting
2018-01-02 17:12:47 +01:00
ef77bb077e
Merge pull request #5987 from acemod/setHidden-forgetTarget
...
make setHidden use forgetTarget
2018-01-02 16:28:10 +01:00
32755e4e91
forget only different side
2018-01-02 16:26:13 +01:00
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
787f047804
Merge pull request #6002 from acemod/tripd-updates2
...
disable debug mode
2018-01-02 16:16:42 +01:00
b0d0029c7a
disable debug mode
2018-01-02 16:13:57 +01:00
fc0f6b47b1
Merge pull request #5886 from acemod/tripd-updates
...
update tripod
2018-01-02 16:09:48 +01:00
8ecd44b9f2
fix a bug in place after anim adjustment
2018-01-02 16:04:21 +01:00
be56c991ed
Update stringtable.xml
2018-01-02 16:00:35 +01:00
3e2ef7ba36
editor icon, editor category, delete on death
2018-01-02 15:56:15 +01:00
3b02e5e90e
Merge branch 'master' of https://github.com/acemod/ACE3 into tripd-updates
2018-01-02 15:14:04 +01:00
6a70ab1ff4
allowFadeMusic setting
2018-01-02 14:57:19 +01:00
7e3f36e23d
Merge branch 'master' of https://github.com/acemod/ACE3 into fishykins-master
2018-01-02 14:37:54 +01:00
6dec4c8259
Merge branch 'master' of https://github.com/fishykins/ACE3 into fishykins-master
2018-01-02 14:37:13 +01:00
1b38139009
Fix typos in missile guidance framework wiki page ( #5999 )
2018-01-01 10:51:59 -06:00
c44760d640
[Docs] Update component dependencies
...
Automatically committed through Travis CI.
[ci skip]
2018-01-01 01:05:14 +01:00
d3e93c9dc1
Add Kh25ML Laser Guided AGMs ( #5912 )
2017-12-31 18:01:09 -06:00
94d58f7552
Wiki AtragMX updated with CBA Settings System ( #5974 )
...
* Update atragmx.md
* Update advanced-ballistics.md
* Update scopes.md
* Update scopes.md
* Add files via upload
* Delete scope_module.jpg
* Delete ab_module.jpg
* Delete atragmx3.png
* Delete atragmx3a.png
* Delete scope_module.jpg
* Delete atragmx4.png
* simplified_ zeroing
* Add files via upload
* minor_fix
* Update atragmx.md
2017-12-31 13:13:30 -06:00
13be39d0eb
Optionals moved into launchable mod folders ( #5038 )
...
* Optionals moved into launchable mod folders
when using make.py
* added '@' prefix
* Simplify publish.py
2017-12-31 13:12:42 -06:00
7d7d37409e
Merge pull request #5971 from JoramD0/incenTweak
...
Tweaked effective area of incendiary grenades
2017-12-31 13:40:37 +01:00
66fc592dbe
destruction vs effect
2017-12-31 13:36:55 +01:00
ed97be0e06
radius vs area
2017-12-31 13:33:42 +01:00
20ea56100f
Merge pull request #5908 from xrufix/realisticnames
...
Updates to realisticnames
2017-12-31 13:31:31 +01:00
89e1fc243a
Merge pull request #5995 from Dystopian/add_macro_brackets
...
Add parentheses to GETVAR macros
2017-12-30 19:15:00 +01:00
03ade05611
Add parentheses to GETVAR macros
2017-12-30 16:38:45 +03:00
7d998acc71
Fix rearm entire vehicle argument order ( #5993 )
2017-12-30 12:46:11 +00:00
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
65fe101aaf
Arsenal - Filter items with scopeArsenal = 0 ( #5988 )
...
* Arsenal - Filter items with scopeArsenal = 0
* change order
2017-12-29 12:39:24 -06:00
6d2da10558
Arsenal - Add Missing semicolons ( #5990 )
2017-12-29 12:39:02 -06:00
dfe803107a
Fix displayName of spectator respawn template ( #5989 )
2017-12-29 16:47:49 +00:00
13e52b4410
make setHidden use forgetTarget
2017-12-29 02:48:20 +01:00
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
07e1482719
Update fortify wiki with working example ( #5986 )
2017-12-28 18:57:38 +00:00
37e42debc0
Merge pull request #5953 from acemod/arsenal-main-menu
...
add ace arsenal button to main menu
2017-12-27 11:39:54 +01:00
542849cdf7
merge
2017-12-27 11:37:54 +01:00
8bca2ac73b
Merge branch 'master' into arsenal-main-menu
2017-12-27 11:36:32 +01:00
