Commit Graph

9098 Commits

Author SHA1 Message Date
jonpas
b2986cea8a Merge branch 'master' into armake 2017-02-07 03:51:29 +01:00
PabstMirror
231346a199 Fix Javelin for AI (#4857) 2017-02-05 23:01:48 +01:00
commy2
10756ff02d fix HK416 name, fix #4873 (#4874) 2017-02-05 23:01:06 +01:00
jonpas
4d872b84b7 Fix double single quote to single double quote (#4876) 2017-02-05 23:00:35 +01:00
Dystopian
06f99f044c Fix deprecated AW159 and CH-47I config (#4726) 2017-02-02 17:45:32 -06:00
commy2
9d68fbf987 fix script error caused by new arguments passed to handleDamage (#4866)
* fix script error caused by new arguments passed to handleDamage

* Copy array to not break other handleDamage ehs

* Resize to 7
2017-02-02 13:03:13 -06:00
Dorbedo
aa393ccf92 typo in ace_interaction_fnc_getDoorAnimations (#4854) 2017-01-28 13:43:42 -06:00
Dystopian
b30705661c add real name for civilian kamaz trucks (#4851) 2017-01-23 12:14:55 -06:00
Neviothr
9b36ccadcc Aircraft cleanup (#4818)
* Cleanup

* Returned lines between classes

* Add files via upload
2017-01-23 12:13:37 -06:00
PabstMirror
e9b5bde371 Add ace_setting for scaling cookoff effect length (#4842)
* Add getVar for scaling cookoff effect length

* Switch to ace_setting

* Add notes about merging settings
2017-01-23 12:13:02 -06:00
Dystopian
7cdf2d75a3 fix win newline in repo (#4849) 2017-01-23 00:56:52 +01:00
Dystopian
d5d8413ee9 fix kamaz medical can repair (#4850) 2017-01-22 10:39:02 -06:00
jonpas
b7f36ffd12 Add orange map chemlight entry (#4839) 2017-01-18 18:18:28 -06:00
ViperMaul
5deb305906 Fix ace_gunbag track named properties (#4838) 2017-01-17 18:03:27 -06:00
Grzegorz
15f2e6b2fe PL translation 3.9.0 (#4821)
* translate/fix cookoff PL translation

* translate/fix laser/map PL translation

* fix/translate maptools PL translation

* fix/translate medical_blood PL translation

* fix scopes PL translation

* fix zeus PL translation

* translate overpressure
2017-01-17 15:33:22 -06:00
PabstMirror
4f3f847930 Fix ace_track named properties (#4837)
* Fix ace_track named properties

* Fix 4 more
2017-01-17 15:32:14 -06:00
Neviothr
ade87adf46 Modules Cleanup (#4813)
* Cleanup

* Added newlines
2017-01-14 15:47:03 -06:00
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
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
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
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
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
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
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
c8ef10341e Merged branch release-v3.8.3 into master 2016-12-13 23:14:12 +01:00
Glowbal
0df98f794c Prep 3.8.3 2016-12-12 19:50:16 +01:00
PabstMirror
06caea825b AdvThrow - Make sure ammo setVar is not empty (#4743) 2016-12-12 19:33:34 +01:00
commy2
757ab78191 fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 (#4742) 2016-12-12 19:33:05 +01:00
PabstMirror
11b464b585 Fix blood drop selection if blood loss is high
close #4739
2016-12-12 19:32:23 +01:00
PabstMirror
de34d57d5b Update SMG_02 base class for 1.66 (#4718) 2016-12-12 19:31:52 +01:00
PabstMirror
14c7e9af17 AF - Remove setVar when removing eh 2016-12-12 19:30:58 +01:00