Commit Graph

10503 Commits

Author SHA1 Message Date
jonpas
d1d23c55bc Streamline dependencies extraction tool (#4268)
* Streamline dependencies extraction tool for new wiki location, Update dependencies list

* Use LF strictly
2016-08-19 15:58:39 +02:00
jonpas
9599ab9bd9 Streamline closing points on wiki pages (#4269) 2016-08-19 15:47:03 +02:00
jonpas
9415d0fb03 Fix Events Framework documentation 3.1 section (#4266)
* Fix 3.1. section, Add dots after numbers, Update CBA doc with target _blank

* Fix closing points
2016-08-19 15:44:30 +02:00
commy2
91e4f50ba0 fix FUNC(objectEvent) 2016-08-19 15:23:47 +02:00
bux578
4f3ff2c967 fixes 2016-08-19 15:20:22 +02:00
jonpas
00927f1a38 Merge pull request #4264 from acemod/fixInteractMenuWikiList
Fix list in interaction menu framework documentation
2016-08-19 01:13:59 +02:00
jonpas
3884821eb1 Fix list in interaction menu framework documentation 2016-08-19 00:57:19 +02:00
jonpas
f2a7bb4083 Merge pull request #4263 from acemod/wiki-removeNotIncludedRearmFeature
Remove never-merged rearm feature and framework documentation
2016-08-19 00:01:55 +02:00
jonpas
58bf3c4719 Remove never-merged rearm feature and framework documentation 2016-08-18 21:01:44 +02:00
jonpas
ff0dcd3152 Use pushBackUnique in Tags cache (#4249)
* Use pushBackUnique in tagging

* Use configProperties, Add maintainers

* Fix header

* Revert to configClasses
2016-08-18 20:52:28 +02:00
jonpas
b22a4bee60 Update documentation development environment instructions 2016-08-18 20:45:39 +02:00
jonpas
986ac43a68 Cache config UI (#4234)
* Cache config UI

* Use configClasses to prevent reading entries in base class

* Fix header not containing return value

* One more count

* More lazy eval
2016-08-18 19:07:05 +02:00
bux578
468662b46e Create CNAME 2016-08-18 19:00:17 +02:00
bux578
04036f5fdf Merge pull request #4259 from acemod/mergeDocs
merge gh-pages content into docs folder
2016-08-18 18:52:40 +02:00
bux578
accd408418 merge gh-pages content into docs folder
https://github.com/blog/2228-simpler-github-pages-publishing
2016-08-18 18:37:38 +02:00
PabstMirror
b02e91e02e Clear reviveState when calling setUnconscious
#4250
2016-08-18 01:59:40 -05:00
freghar
9fa247398f add BlueForceTracking filtering via an object variable (#4196)
There's no good workaround for this:

 * creating a dummy unit on [0,0,0] and making it leader prevents
   grp members from entering vehicles
 * joining group of a different side prevents grp members from seeing
   blueforce tracking markers of their original side

Usage (_obj can be group or unit, depending on BFT_ShowPlayerNames):

  _obj setVariable ["ACE_map_hideBlueForceMarker", true];

The inverse, hiding of markers of other groups/units for a particular
player, can be already done by 'ace_map_BFT_Enabled = false' locally,
as the Update function checks for it every time.

Signed-off-by: freghar <freghcz@gmail.com>
2016-08-16 19:28:21 -05:00
Nicolás Badano
b445a8460e Merge pull request #4246 from acemod/isBeltForNewWeaps
Add ACE_isBelt for DLC/Expansion magazines
2016-08-14 19:38:08 -03:00
PabstMirror
24d13e525f Add ACE_isBelt for DLC/Expansion magazines
Fix #4094
2016-08-14 13:35:00 -05:00
commy2
7d2f2023ee eject ai during cookoff 2016-08-14 13:51:33 +02:00
commy2
2231464087 fix bug which would cause unecessary echo network traffic (#4242) 2016-08-13 16:45:50 +02:00
Lukas
84a370d0f2 Czech translation (#4241) 2016-08-13 15:44:48 +02:00
Glowbal
fdfe672491 Merge pull request #4166 from acemod/glasses-hearing
Make hearing component compatible with glasses
2016-08-13 14:17:47 +02:00
Glowbal
ba8c8bb5b0 Merge pull request #4109 from acemod/port-incendiary-grenades
Port ACE2 incendiary grenades
2016-08-13 14:16:39 +02:00
Glowbal
b66291d668 Merge pull request #4240 from acemod/rename-enable-setting-for-cookoff
rename cookoff setting to 'GVAR(enable)'
2016-08-13 14:15:25 +02:00
commy2
58539a0949 Merge branch 'master' of https://github.com/acemod/ACE3 into glasses-hearing 2016-08-13 13:03:23 +02:00
commy2
5b3d424509 always destroy engine, effect only requires cookoff 2016-08-13 12:44:38 +02:00
commy2
d0d407a2c5 only do engine burning effect if cookoff is enabled 2016-08-13 12:39:52 +02:00
commy2
1bde8d617b rename cookoff setting to 'GVAR(enable)' 2016-08-13 12:38:04 +02:00
Glowbal
41ce89b439 Merge pull request #4116 from acemod/cookoff
Port AGM cook off
2016-08-13 12:17:47 +02:00
commy2
0dc13276df change default value to true 2016-08-13 12:13:49 +02:00
commy2
f0a74781c9 add setting to disable cook off effects 2016-08-13 12:12:34 +02:00
commy2
c42004449d Port AGM cook off 2016-08-13 11:59:15 +02:00
commy2
9a93dffc3b port A2 incendiary grenades 2016-08-13 11:49:36 +02:00
Broström.A | Evul
0dfee34a56 Added additional cargo and dragging for crates (#4129)
* Added Cargo and Dragging for `Land_WoodenBox_F` and `Land_WoodenCrate_01_F`.
2016-08-13 11:33:41 +02:00
PabstMirror
f354bab3c2 Add Tripflare (#4152) 2016-08-13 11:29:01 +02:00
[OMCB]kaban
8fc2cbd0ef Russian Translations - Update (#4217) 2016-08-13 11:25:43 +02:00
Glowbal
822b1f6894 Merge pull request #4232 from acemod/fixFcsUI
Fix missing zeroing UI on vehicles without FCS
2016-08-13 11:24:20 +02:00
jonpas
5985f3bd26 Fix missing zeroing UI on vehicles without FCS 2016-08-11 22:34:38 +02:00
PabstMirror
a2da54bfec Fix javelin fire block not being removed (#4228) 2016-08-11 13:30:28 -05:00
commy2
5e40c24985 Merge pull request #4185 from acemod/cleanup-deprecated
remove deprecated functions
2016-08-09 18:34:43 +02:00
commy2
c2da1b4980 Merge pull request #4225 from acemod/fix-missing-magazine-mass
Fix wrong config path in FUNC(calculateMass)
2016-08-09 18:30:04 +02:00
commy2
9228bb9349 manual merge 2016-08-09 18:28:42 +02:00
jonpas
e909901100 Merge pull request #4226 from acemod/fixTagString
Fix tagging cstring
2016-08-09 18:27:00 +02:00
commy2
36e78e0722 Merge pull request #4171 from acemod/cleanup-hash
deprecate ACE hash functions in favor of CBA versions
2016-08-09 18:25:01 +02:00
commy2
83f32ebc29 Merge pull request #4170 from acemod/cleanup-missionSQM
remove some broken functions
2016-08-09 18:24:52 +02:00
commy2
439a85924c Merge pull request #4188 from acemod/cba-hash-synchedEvent
Convert common to CBA hashes
2016-08-09 18:24:27 +02:00
commy2
7000414df4 Fix wrong config path in FUNC(calculateMass) 2016-08-09 18:20:25 +02:00
PabstMirror
8e10bf5eef Fix tagging cstring 2016-08-09 11:18:52 -05:00
Nicolás Badano
02794a972b Merge pull request #4221 from acemod/dogtagsPboPrefix
Add dogtags $PBOPREFIX$ and Improve function headers
2016-08-08 20:48:28 -03:00