Commit Graph

11077 Commits

Author SHA1 Message Date
bux
3f00da7365 decrease concertina "dismount" time, use ace checks (#4812)
IRL it’s just pushing them together again
2017-01-13 13:43:54 -06:00
nomisum
59ca44bb4b [typofix] explosion -> explosive (#4816) 2017-01-11 17:35:35 -06:00
Dedmen Miller
6c12444d85 Fixes #4814 (#4815)
Doesn't fix the core issue behind #4814 but it fixes the issue that bothered me so much that i reported this.
2017-01-11 15:54:03 -06:00
PabstMirror
39181fdea5 Simplify huntIR configs using += (#4521)
* Add huntIR magazine to GL_3GL_F via sub config

* Cleanup RHS 40mm huntIR GL config

* Add huntir to standalone m320 - #4199
2017-01-09 12:11:31 -06:00
PabstMirror
8752b03c12 Hearing - player only event handlers (#4727) 2017-01-09 12:10:52 -06:00
PabstMirror
bce0913019 Cookoff - add function to get ammo (#4779)
* Cookoff - add function to get ammo

Fix #4565 - Function adds virtual ammo for rearm vehicles
Remove FUNC(secondaryExplosions) - which duplicatd detonateAmunition
Tweak timeBetweenAmmoDetonation calculation to use all ammo, not just
the current mag
Allow GVAR(enableAmmoCookoff) effect to work with GVAR(enable)=false

* Fix header

* Cleanup getting ammo from turrets
2017-01-04 15:35:54 -06:00
classic
0046ba4bbb fix Japanese translation for #4785 (#4804)
"j" is replace by a "J"
2017-01-04 16:37:00 +01:00
KoffeinFlummi
5f4a7d7b46 Add Luigium to AUTHORS as requested. 2017-01-03 23:40:28 +01:00
J3aLeiNe
2dcd79fd1d Update MapData (#4786)
* Update Map data

 - Add IFA3LITE maps
 - Add CSA38 map
 - Add Beketov map
 - Add Winter Panthera map
 - Add Nam and Mogadishu maps
 - Add Uhao island map

* Update fnc_getMapData.sqf

 - Add X-Cam-Taunus map
 - Add Unsung 3.1 Delta maps
2017-01-02 21:32:58 -06:00
BaerMitUmlaut
0a05401e74 Fix cookoff locality issues (#4799)
* Fix locality issue with box cookoff

* Add grenade fired EHs on hcs and dedis
2017-01-02 17:55:44 -06:00
classic
9d37d91c71 Jpn translation for overpressure #4770 (#4785)
Japanese translation for #4770
2017-01-02 17:54:51 -06:00
jtj5283449
d4855a7ff3 Korean Translation v1.0 (#4794)
* Add files via upload

* Add files via upload

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

* Added Korean translation

japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml.

* Fix encoding
2017-01-02 17:52:01 -06:00
jonpas
de729ec132 Merge pull request #4801 from acemod/fixDuplicateStrings
Remove duplicated Zeus strings
2017-01-02 16:48:45 +01:00
jonpas
e296c12b30 Remove duplicated Zeus strings 2017-01-02 16:16:37 +01:00
Skully71
9b22f94374 Ensure movingToInjured is false whenever _target no longer needs healing, fixes #4797 (#4800) 2017-01-02 14:02:43 +01:00
markooff
0c069a6bd2 polish translations (#4734)
* some extra polish translations

for details see polish_translations_readme_markooff.txt

* file was deleted as it wasn't the part of the mod (only for information reason)
2017-01-02 13:21:47 +01:00
PabstMirror
3cd80a42d7 Fix cruise heigh on close shots (#4795) 2016-12-29 15:04:19 -06:00
jonpas
e94ca3fab9 Merge pull request #4782 from Dystopian/simplify_class_crawling
Simplify config crawling in nouniformrestrictions
2016-12-29 18:31:50 +01:00
bux
e2ca261f3f Merge pull request #4793 from acemod/update-website-tools
Update website tools
2016-12-28 13:06:16 +01:00
bux
4bef68b73f decrease slider image file size 2016-12-28 09:23:22 +01:00
bux
f0ebc8ac74 update tools 2016-12-28 09:23:08 +01:00
bux
33c19f13ae add missing manifest meta tag 2016-12-28 09:08:59 +01:00
bux
7196876c0c Merge pull request #4790 from acemod/manifest
Add web app manifest file
2016-12-28 09:05:01 +01:00
bux
6ec5be738c Merge pull request #4792 from acemod/noopener
add some rel="noopener" to external links
2016-12-28 09:04:49 +01:00
bux
427d910450 add some rel="noopener" to external links 2016-12-28 08:53:05 +01:00
bux
9728345603 Merge pull request #4789 from acemod/https
Use https for ace3mod
2016-12-27 09:38:14 +01:00
bux
2da04846c8 add web app manifest 2016-12-27 09:36:18 +01:00
bux
d65ffb82f7 use https in PR tempalte 2016-12-27 09:14:10 +01:00
bux578
7ecccde340 use https for ace3mod 2016-12-27 09:11:58 +01:00
ace3mod
dff9e11569 [Docs] Update component dependencies
Automatically committed through Travis CI.

[ci skip]
2016-12-22 20:30:05 +01:00
PabstMirror
c22fce273f Overpressure changes (#4770)
* Add setting to overpressure

* Change overpressure on 2a70 cannon

Close #4691
Also fix gl smoke causing frag

* Handle 2a28 cannon

* Fix base class
2016-12-22 13:29:05 -06:00
Dystopian
78b655bc1f Simplify config crawling 2016-12-22 01:41:16 +03:00
PabstMirror
04d4353b5d Fix reversed RHS compats - Close #4759 (#4760) 2016-12-20 15:37:51 -06:00
bux578
886e23791f Merge pull request #4774 from classicarma/fix-jpn-translate-v383
Fix jpn translate v383
2016-12-17 15:59:50 +01:00
classic
6a93f58b52 added missing localization in jpn translation
added missing localization in jpn translation
2016-12-17 20:50:19 +09:00
classic
552e9ecd87 fix jpn translation for ballistics
fix html tag in the japanese translation.
2016-12-17 20:39:57 +09:00
PabstMirror
988c5b0a25 Minor wind deflection optimization (#4762) 2016-12-16 08:08:10 +01:00
bux578
d8fec7fbe3 improve german translation for entrenchment tool (#4769) 2016-12-15 13:42:13 -06:00
PabstMirror
56c4611919 Fix ace_particles smoke on arty shells (#4768)
Close #4766
2016-12-15 18:28:39 +01:00
bux578
f544d82472 add optionals meta.cpp files (#4763) 2016-12-15 10:55:44 -06:00
PabstMirror
fd09ec5958 Rebuild Dlls for x64 dev branch (#4765) 2016-12-15 10:51:47 -06:00
classic
0842481c2f fix for jpn translate in medical_menu
Delete unnecessary the HTML tags in line 134
2016-12-15 20:58:21 +09:00
Ozan Eğitmen
ef4d289836 Add Zeus Module for FRIES (#4597)
* Initial commit

* Revert unrelated changes

* Add newline

* Fix undefined var, localize text

* Shorten strings, add missing parameters

* Fix logical error

* Fix capitalization, Update string, Only add EH on server

* Add missing uses of the private command

* Remove excess formatting

* Add module category
2016-12-14 23:55:06 -06:00
Dedmen Miller
c009000bd9 Use new private syntax for winddeflection PFH (#4761) 2016-12-14 23:29:07 -06:00
PabstMirror
5379503772 Fix deadman range, fix clacker transfer, use setShotParents (#4689) 2016-12-14 14:06:32 -06:00
Dystopian
4f20d1f7c6 add rearm to Vehicle Ammo boxes (#4750) 2016-12-14 13:18:04 -06:00
Dystopian
cc3b669fcd Fix missing refuel menu on static fuel stations (#4533)
* fix static fuel stations

* Directly compile menus and remove XEH from buildings
2016-12-14 12:48:00 -06:00
Glowbal
2151fcad8f #4692 Update dev homepage for v3.8.3
[ci skip]
2016-12-13 23:16:41 +01:00
Glowbal
86fd9347f8 #4692 update homepage for v3.8.3
[ci skip]
2016-12-13 23:16:12 +01:00
Glowbal
c8ef10341e Merged branch release-v3.8.3 into master 2016-12-13 23:14:12 +01:00