Commit Graph

11973 Commits

Author SHA1 Message Date
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
787f047804
Merge pull request #6002 from acemod/tripd-updates2
disable debug mode
2018-01-02 16:16:42 +01:00
commy2
b0d0029c7a disable debug mode 2018-01-02 16:13:57 +01:00
commy2
fc0f6b47b1
Merge pull request #5886 from acemod/tripd-updates
update tripod
2018-01-02 16:09:48 +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
1b38139009 Fix typos in missile guidance framework wiki page (#5999) 2018-01-01 10:51:59 -06:00
ace3mod
c44760d640 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2018-01-01 01:05:14 +01:00
xrufix
d3e93c9dc1 Add Kh25ML Laser Guided AGMs (#5912) 2017-12-31 18:01:09 -06:00
Laid3acK
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
John Harvey
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
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
PabstMirror
07e1482719 Update fortify wiki with working example (#5986) 2017-12-28 18:57:38 +00:00
commy2
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
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
Dystopian
0a85753a6a Fix debug info step in github issue template (#5977)
Reflects changes with move to CBA Settings
2017-12-26 22:51:35 +00: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