Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,522 Commits 73 Branches 88 Tags 752 MiB
30a8d2db7b
Commit Graph

9419 Commits

Author SHA1 Message Date
PabstMirror
c001be5b09 Add keybind to toggle interaction menu (#5095) 2017-05-05 13:20:54 -05:00
jonpas
8dde674105 Fix jerry can refuel interaction overlapping (#5107) 2017-05-05 13:10:50 -05:00
PabstMirror
a08ed0e307 Fix refuel nozzle dropping to ground (#5119) 2017-05-01 18:06:34 -05:00
PabstMirror
0a7033a186 Remove CfgAiSkill config changes (#5091) 
* Remove CfgAiSkill config changes

* Add note to wiki about removal
 2017-04-22 11:18:56 -05:00
11RDP-LoupVert
bcd73edaba French localization complete (#5079) 
* French localization complete

* STR_ACE_MapTools_drawStaightLines_description fix

"l'on doit survoler le milieu du trait pour pouvoir le supprimer"

* Space management

alganthe :
Espace en trop après référence.

* Diapo

alganthe :
Slideshow -> diaporama
Slide -> diapo

* Cohesion fix

alganthe :
Vous avez traduit le nom du module juste au dessus (displayname).
Il est vrai que les créateurs de missions doivent consulter une documentation principalement écrite en anglais, donc vous avez le choix de traduire la ligne ci-dessus ou la garder, les deux semblent valide à mes yeux.

Reasoning : since French mission makers read reference material in English, it makes sense not to translate it and thus keep it simple for them.

* Caisses de munitions

caisse de mun -> caisses de munitions

* STR_ACE_Scopes_Description

Oops, forgot that one.
 2017-04-12 10:39:41 +02:00
11RDP-LoupVert
a0e1205e54 (Medical) French text - minor changes (#5043) 
Minor changes due to users feedback
 2017-04-12 08:40:31 +02:00
PabstMirror
8d43b899e6 Frag - Cleanup and Performance (#5010) 
* Frag - Cleanup and Performance

* Add dots
 2017-04-11 10:33:56 -05:00
PabstMirror
f44da354d5 Fix tagging model cache (#5055) 2017-04-11 10:12:03 -05:00
PabstMirror
6c592e5a10 Virtual units - skip goggles/hearing effects (#4988) 
* Disable goggles and hearing fx for virtual units

* Cleanup some other CBA_fnc_addPlayerEventHandler
 2017-04-11 10:06:29 -05:00
PabstMirror
fb73286242 Tweak overheating (#4969) 
* Tweak overheating

* Add define for constant magic num
 2017-04-11 10:04:57 -05:00
PabstMirror
f0c8d5ad95 Fix FCS Vehicle Init (#5063) 2017-04-11 10:02:59 -05:00
jonpas
fd139abb42 Use setShotParents in Advanced Throwing (#5052) 
* Use setShotParents in Advanced Throwing - close #5034

* Execute setShotParents on server (server-only command)
 2017-04-11 16:59:32 +02:00
Cuel
53943c7503 Filter headless clients from zeus teleportation (#5070) 2017-04-11 16:59:06 +02:00
commy2
a16fafd697 fix highlighted info box color (#5075) 2017-04-11 09:41:32 -05:00
commy2
a9d562e5f7 use https for main men 2017-04-11 12:03:47 +02:00
commy2
0a0929cdc5 use https for main menu 2017-04-11 12:00:34 +02:00
commy2
8a25cd9c0c tweak ACE main menu info box 2017-04-11 02:37:53 +02:00
Dystopian
83d2183f61 Fix cargo loading to locked vehicle (#5049) 2017-04-01 00:33:36 -05:00
PabstMirror
4a24759650 Fix dagr not showing bearing in mils (#5047) 2017-03-30 10:02:13 -05:00
11RDP-LoupVert
94826cc8d6 French loc fixes (ballistics) (#5041) 
Minor French loc fixes
 2017-03-26 19:39:05 -05:00
11RDP-LoupVert
33dd0b5707 French additions (Cargo) (#5040) 
Minor French text additions
 2017-03-26 19:38:18 -05:00
11RDP-LoupVert
fc860e7b43 French loc improvement (#5017) 
* French loc improvement

(French) text as it is clutters the interface interface, making it
uneasy for medic to use the it smoothly.
https://i.gyazo.com/8d7a5bb2f15dd1332cec36f2eef510c8.png

Hopefully suggested changes fixes that.

There were a few typos and, in my opinion, unaccurate or missing
translation.
Based on French Army Field Manual, actual paramedical personnel and past
work on XMedSys.

* Pull 5017 with spaces instead of tabs

https://github.com/acemod/ACE3/pull/5017

* Fixes a minor typo

Selectioner -> Sélectionner

* Duplicate entry (French)

Removes a duplicate entry, didn't saw first time
 2017-03-25 10:52:37 -05:00
11RDP-LoupVert
fcd57a9492 Duplicate French entry (#5032) 
Removes a duplicate French entry, didn't saw it :/
 2017-03-25 10:46:23 -05:00
PabstMirror
15346d0919 Add custom CfgUIGrids for microDagr (#5014) 2017-03-23 11:15:42 -05:00
11RDP-LoupVert
5d8cf43199 Dupplicate Polish entry (#5018) 
https://i.gyazo.com/c7557980d7d4c36709be78ef1f2c2a8f.png
 2017-03-22 11:05:43 -05:00
Glowbal
bb228fa2b3 Merge branch 'release' 2017-03-21 20:49:11 +01:00
Glowbal
b143af0b8c Prep 3.9.1 release 2017-03-21 20:42:39 +01:00
classic
67a4e4e5ab Jpn translate to v391 (#5011) 
* jpn translate slideshow

Add the Japanese translation for slideshow for v3.9.1

* jpn translate for cookoff

Add the Japanese translation for cookoff of the v3.9.1
 2017-03-20 12:20:45 -05:00
simpo
c162739d4f Translation: Missing 3 strings in Polish (#5008) 2017-03-19 23:37:36 -05:00
PabstMirror
1208e441ac Fix unarmed sprint->prone + minor perf improvments (#4887) 2017-03-15 10:12:07 -05:00
jonpas
b31abee4fd Sandbags surfaces update (#4971) 
* Use private keyword, move surface blacklist to script_component.hpp

* Check height above terrain

* Add Tanoa surfaces, Check if in water

* Use 'dust' config entry to determine surface, Add common canDig (checks dustyness)

* Re-enable compile cache

* Revert to surface blacklist with dust as fallback

* Move surface blacklist to script_component because SQF validator complains
 2017-03-15 10:11:37 -05:00
PabstMirror
9e27960b86 Add rearm config for Nemmera (#4992) 2017-03-15 10:10:53 -05:00
commy2
c51b755770 also fix cooking off ammo boxes 2017-03-15 09:09:42 +01:00
commy2
371caaa623 Fix cookoff desynch, fix #4900 
Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.
 2017-03-15 09:09:02 +01:00
commy2
81f3387dbb Merge pull request #4991 from acemod/fix-cookoff-2 
also fix cooking off ammo boxes
 2017-03-14 10:09:13 +01:00
commy2
2c4f286593 also fix cooking off ammo boxes 2017-03-14 10:08:06 +01:00
commy2
2334d501d0 Fix cookoff desynch, fix #4900 
Randomness would be calculated on every machine, but only vehicle explosion and sound are done by the server. Smoke, light and fire sfx are done by each client.
 2017-03-14 10:04:56 +01:00
Glowbal
71d9694eb6 Prep 3.9.1 release 2017-03-13 20:48:02 +01:00
jonpas
27ef320542 Fix vehicle lock lockpick condition, Fix lockpicking from inside (#4985) 2017-03-13 20:43:55 +01:00
Mark Ruffner
6403132a9b Add validation on group id for map gesture color mapping (#4976) 2017-03-13 20:43:06 +01:00
PabstMirror
11de1326ef Cleanup use of ACE_HashLocation (#4975) 2017-03-13 20:42:43 +01:00
PabstMirror
d18ad0c087 Give options menu list focus (#4965) 2017-03-13 20:42:25 +01:00
PabstMirror
d9be3c0ffc Fix rangecard not showing wind/lead (#4964) 2017-03-13 20:42:05 +01:00
J3aLeiNe
ca5f3fa1cf Update maps' latitude (#4961) 
- add Dingor
 - add MSKE 2017
 - add G.O.S Leskovets
 - add Trung Si
 - add I44: Omaha v2
 - add I44: Neaville and Neaville (Winter)
 - add I44: Battle of the Bulge
 2017-03-13 20:41:37 +01:00
PabstMirror
43786786de Fix gforce avg on switching to aircraft (#4955) 
* Fix gforce avg on switching to aircraft

* Dont use for-loop for neutral g-forces array
 2017-03-13 20:41:14 +01:00
jonpas
ca4060b852 Require CBA v3.2.1 (#4954) 
Conflicts:
	addons/main/script_mod.hpp
 2017-03-13 20:40:52 +01:00
PabstMirror
a1853e0d52 Fix intergrated scopes (#4945) 2017-03-13 20:40:11 +01:00
PabstMirror
76e9b132d7 Add RHS GREF compat for RKG-3 grenade (#4944) 2017-03-13 20:39:42 +01:00
PabstMirror
bda09296ed Fix lost magazines when restoring gunbag mags (#4942) 2017-03-13 20:39:24 +01:00
PabstMirror
1952dc5798 Reload medical configs into extension on save load (#4941) 2017-03-13 20:39:01 +01:00
PabstMirror
2c7a5fee76 Fix setVariablePublic reseting to old values (#4938) 
* Fix setVariablePublic reseting to old values

* Don't drop delay time
 2017-03-13 20:38:41 +01:00
PabstMirror
863d54973d Verify params in atragmx profile gunlist (#4917) 2017-03-13 20:38:12 +01:00
PabstMirror
19e1a1f4c5 Pass map gestures draw by reference (#4914) 2017-03-13 20:37:47 +01:00
PabstMirror
0c479859af Hide earplug actions if setting disabled (#4913) 
* Hide earplug actions if setting disabled

* Add lines that are new
 2017-03-13 20:37:29 +01:00
Mark Ruffner
cd526b7f5e Medical/Repair 3den Toolbox State Fix (Bug fix for #4902) (#4905) 
* Update medical/repair 3den away from missionNamespace

* Simplify save
 2017-03-13 20:37:11 +01:00
Glowbal
5240c225e6 Update CBA required version (#4899) 
* prep v3.9.0

* Update required CBA version
 2017-03-13 20:36:49 +01:00
PabstMirror
f3d6a4d90d Use createSimpleObject to create tags (#4892) 2017-03-13 20:35:39 +01:00
PabstMirror
b0741f48d7 Fix getPos order (#4889) 2017-03-13 20:35:15 +01:00
PabstMirror
2e8651deac Fix passenger actions - Ensure order of MainActions (#4883) 2017-03-13 20:34:42 +01:00
commy2
bd7c8ce409 Optimize Laserpointer (#4859) 
* only process one unit every 0.1 seconds

* exitWith to keep indentation low

* use event to determine isIR and isTI

* correctly remove units with turned on lights from their arrays

* handle weaponAccessories command reporting nil

Conflicts:
	addons/laserpointer/XEH_postInit.sqf
 2017-03-13 20:33:32 +01:00
PabstMirror
e8418f6df0 Fix Javelin for AI (#4857) 2017-03-13 20:31:16 +01:00
Dedmen Miller
1b951231da Cache Nametags onDraw3D flags. (#4847) 
* Cache Nametag flags

* Remove unused privates

* Fix fading, cursorOnly mode, improve cache reset

* Fix header
 2017-03-13 20:30:53 +01:00
Ozan Eğitmen
d3af5f0e64 New Function to Show BIS Style Curator Messages (#4844) 
* Add showMessage fnc that shows BIS curator messages

* Add documentation

* Make function simpler

* Modify to fir new syntax

* Handle non-string args
 2017-03-13 20:29:39 +01:00
Ozan Eğitmen
2554aba559 Frag Superanal Cleanup (#4803) 
* Minimal frag cleanup

* Why did this even happen in the first place

Conflicts:
	addons/frag/functions/fnc_frago.sqf
 2017-03-13 20:28:58 +01:00
PabstMirror
a2f1a4684e Generic cycle attack profile key for missile guidance (#4787) 
* Generic cycle attack profile key for missile guidance

* Add hint for weapons without huds

* Fix Korean strings

* Cleanup
 2017-03-13 20:25:30 +01:00
NorXAengell
e20666ba9a French translation to "Advanced throwing" and "Advanced fatigue" (#4415) 
* French translation of "Advanced fatigue" and "Advanced throwing"

Full translation of "Advanced fatigue" and "Advanced throwing".

* New batch of translation/correction
 2017-03-13 20:25:09 +01:00
PabstMirror
a3750b3160 Pass functions by "reference" to bis event handlers (#4898) 
* Pass functions by "reference" to bis event handlers

* Add Doc

* Fix

Conflicts:
	addons/laserpointer/XEH_postInit.sqf
 2017-03-13 20:24:27 +01:00
Dedmen Miller
5105394f29 Prevent starting additional vital loops on full heal (#4885) 2017-03-13 20:21:57 +01:00
J3aLeiNe
9733ddc1c0 Update CfgWeapons.hpp (#4893) 2017-03-13 20:21:10 +01:00
sbng-PAPA
11b4a4a2bc More accurate Korean translate for medical (#4897) 2017-03-13 20:20:46 +01:00
jonpas
f0977a18ac Fix multiple slideshows sub-actions, Add set name setting (#4904) 
* Fix all slides being in multiple slideshows setup, Use private keyword

* Add setting for slides main interaction name

* Update Slideshow documentation

* Add not about new argument added in version
 2017-03-13 20:20:23 +01:00
PabstMirror
32c5d1c80c Add getInteractionDistance and fix VTOL refuel/arm (#4882) 2017-03-13 20:19:51 +01:00
PabstMirror
d3bfcf0aa9 Fix MUL macros (#4888) 
Conflicts:
	addons/frag/functions/fnc_frago.sqf
 2017-03-13 20:19:16 +01:00
jonpas
5ef06590cc Fix double single quote to single double quote (#4876) 2017-03-13 20:16:56 +01:00
PabstMirror
796eba5297 Handle changes to CBA_fnc_addPlayerEventHandler (#4878) 
* Handle changes to CBA_fnc_addPlayerEventHandler

* Fix var spelling
 2017-03-13 20:16:35 +01:00
commy2
d2bcfe02b5 fix HK416 name, fix #4873 (#4874) 2017-03-13 20:15:40 +01:00
jonpas
43dc1f020e Fix vehicle lock lockpick condition, Fix lockpicking from inside (#4985) 2017-03-11 22:49:54 -06:00
PabstMirror
d313d53b02 Fix gforce avg on switching to aircraft (#4955) 
* Fix gforce avg on switching to aircraft

* Dont use for-loop for neutral g-forces array
 2017-03-09 16:49:50 -06:00
PabstMirror
f3d2833b28 Fix rangecard not showing wind/lead (#4964) 2017-03-08 19:40:48 +01:00
PabstMirror
d900871da4 Pass map gestures draw by reference (#4914) 2017-03-08 19:34:58 +01:00
PabstMirror
c49e5bcfa0 Reload medical configs into extension on save load (#4941) 2017-03-08 19:33:28 +01:00
PabstMirror
110bce763f Fix intergrated scopes (#4945) 2017-03-08 19:31:26 +01:00
PabstMirror
19af072c99 Give options menu list focus (#4965) 2017-03-08 19:26:05 +01:00
Mark Ruffner
acf422b774 Add validation on group id for map gesture color mapping (#4976) 2017-03-08 09:58:29 -06:00
PabstMirror
0841c05a6d Cleanup use of ACE_HashLocation (#4975) 2017-03-08 10:15:15 +01:00
sbng-PAPA
e2c04a80c4 More accurate Korean translate for medical (#4897) 2017-03-02 17:48:48 -06:00
Ozan Eğitmen
3aa55b1452 New Function to Show BIS Style Curator Messages (#4844) 
* Add showMessage fnc that shows BIS curator messages

* Add documentation

* Make function simpler

* Modify to fir new syntax

* Handle non-string args
 2017-03-02 17:47:49 -06:00
Dedmen Miller
512592b79d Prevent starting additional vital loops on full heal (#4885) 2017-03-02 17:22:16 -06:00
J3aLeiNe
6ce9ede1b5 Update maps' latitude (#4961) 
- add Dingor
 - add MSKE 2017
 - add G.O.S Leskovets
 - add Trung Si
 - add I44: Omaha v2
 - add I44: Neaville and Neaville (Winter)
 - add I44: Battle of the Bulge
 2017-03-02 14:00:18 -06:00
J3aLeiNe
dd76a91844 Update CfgWeapons.hpp (#4893) 2017-02-28 19:14:01 -06:00
jonpas
b9fa3e404d Require CBA v3.2.1 (#4954) 2017-02-27 14:22:45 -06:00
jonpas
bc70571765 Use CBA Accessory Functions for Laser mode switching (#4855) 
* Use CBA Accessory Functions for Laser mode switching

* Use CBA ACC EH to prevent switching to unusable lzr (#4860)

* Use CBA ACC EH to prevent switching to unusable lzr

* Re-call CBA_accessory_fnc_switchAttachment

* Require CBA 3.2.0
 2017-02-25 17:16:40 +01:00
PabstMirror
287d3b475b Add RHS GREF compat for RKG-3 grenade (#4944) 2017-02-24 19:21:42 -06:00
PabstMirror
0bc1e12775 Verify params in atragmx profile gunlist (#4917) 2017-02-24 19:20:27 -06:00
PabstMirror
02ea214ade Fix setVariablePublic reseting to old values (#4938) 
* Fix setVariablePublic reseting to old values

* Don't drop delay time
 2017-02-24 19:19:39 -06:00
PabstMirror
e41fbcb0fd Fix lost magazines when restoring gunbag mags (#4942) 2017-02-24 19:19:05 -06:00
jonpas
1590948b92 Fix multiple slideshows sub-actions, Add set name setting (#4904) 
* Fix all slides being in multiple slideshows setup, Use private keyword

* Add setting for slides main interaction name

* Update Slideshow documentation

* Add not about new argument added in version
 2017-02-24 14:08:18 +01:00
Mark Ruffner
0900bf964b Medical/Repair 3den Toolbox State Fix (Bug fix for #4902) (#4905) 
* Update medical/repair 3den away from missionNamespace

* Simplify save
 2017-02-18 12:27:36 -06:00
PabstMirror
9d128152a3 Hide earplug actions if setting disabled (#4913) 
* Hide earplug actions if setting disabled

* Add lines that are new
 2017-02-16 10:16:46 -06:00
Glowbal
19d5fa0a4e Update CBA required version (#4899) 
* prep v3.9.0

* Update required CBA version
 2017-02-14 16:53:35 -06:00
Glowbal
283c372291 Merge branch 'release' 2017-02-14 22:43:31 +01:00
Glowbal
df693d69b6 Prepare v3.9.0 release 2017-02-14 21:25:22 +01:00
PabstMirror
dfca4fdcf8 Pass functions by "reference" to bis event handlers (#4898) 
* Pass functions by "reference" to bis event handlers

* Add Doc

* Fix
 2017-02-14 10:54:37 -06:00
PabstMirror
036bb0ecd4 Use createSimpleObject to create tags (#4892) 2017-02-14 10:54:21 -06:00
NorXAengell
1be278fbda French translation to "Advanced throwing" and "Advanced fatigue" (#4415) 
* French translation of "Advanced fatigue" and "Advanced throwing"

Full translation of "Advanced fatigue" and "Advanced throwing".

* New batch of translation/correction
 2017-02-11 15:16:56 -06:00
PabstMirror
33b19f7b4c Fix MUL macros (#4888) 2017-02-11 15:07:10 -06:00
PabstMirror
f678f4a3b1 Fix getPos order (#4889) 2017-02-10 21:23:33 -06:00
PabstMirror
159e762576 Handle changes to CBA_fnc_addPlayerEventHandler (#4878) 
* Handle changes to CBA_fnc_addPlayerEventHandler

* Fix var spelling
 2017-02-10 13:03:12 -06:00
PabstMirror
78a55d4436 Generic cycle attack profile key for missile guidance (#4787) 
* Generic cycle attack profile key for missile guidance

* Add hint for weapons without huds

* Fix Korean strings

* Cleanup
 2017-02-10 13:01:17 -06:00
PabstMirror
70f4dd3e6b Fix passenger actions - Ensure order of MainActions (#4883) 2017-02-10 12:49:10 -06:00
commy2
97a0624375 Optimize Laserpointer (#4859) 
* only process one unit every 0.1 seconds

* exitWith to keep indentation low

* use event to determine isIR and isTI

* correctly remove units with turned on lights from their arrays

* handle weaponAccessories command reporting nil
 2017-02-10 12:47:08 -06:00
PabstMirror
3ce0865913 Add getInteractionDistance and fix VTOL refuel/arm (#4882) 2017-02-10 12:34:51 -06:00
Ozan Eğitmen
d2ee1e987a Frag Superanal Cleanup (#4803) 
* Minimal frag cleanup

* Why did this even happen in the first place
 2017-02-10 12:28:27 -06:00
Dedmen Miller
5351b43ff3 Cache Nametags onDraw3D flags. (#4847) 
* Cache Nametag flags

* Remove unused privates

* Fix fading, cursorOnly mode, improve cache reset

* Fix header
 2017-02-10 12:19:14 -06: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
Glowbal
c0c41667e7 prep v3.9.0 2017-02-05 13:48:09 +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
Glowbal
b72541df23 Jpn translation v382 (#4710) 
* jpn scopes translation

this is Japanese translation for scope

* fix jpn weather translation

Fix for Weather japanese translation

* fix jpn Repair translation

fix jpn Repair translation

* jpn zeus translation

Japanese localization for zeus
 2016-12-12 19:29:58 +01:00
PabstMirror
8d1f988f5d AdvThrow - Make sure ammo setVar is not empty (#4743) 2016-12-02 12:44:39 -06:00
commy2
d75eeac1e4 fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 (#4742) 2016-12-02 10:09:48 -06:00
PabstMirror
4eba77f328 Fix blood drop selection if blood loss is high 
close #4739
 2016-12-01 20:36:10 -06:00
ulteq
3e0f85b4f1 RangeCard - Take bore height into account (#4715) 2016-12-01 21:20:51 +01:00
PabstMirror
3566e6e7f5 Update SMG_02 base class for 1.66 (#4718) 2016-12-01 12:05:28 -06:00
PabstMirror
321bb0bc57 Add frag definitions for remaining ammo (#4736) 
Remove rpt warning
Close #342
 2016-12-01 11:01:55 -06:00
ulteq
448dcddc55 ATragMX - cleanup and some fixes (#4714) 
* ATragMX - Improved the default gun profiles
* Recalculated all muzzle velocities (based on 15 degrees Celsius)
* Recalculated all scope base angle (based on the new muzzle velocities)

* ATragMX - Removed lots of duplicate code
* Introduced dynamic simulation interval (based on muzzle velocity)

* ATragMX - Fixed simulation interval for the truing drop feature
 2016-12-01 10:23:03 +01:00
ulteq
50e144672f Ballistics - Cleanup (#4721) 
* Ballistics - Removed 'caliber', 'hit' and 'typicalSpeed' entries
* from all vanilla ammo types

* Removed all unused ammo types

* Ballistics - Removed more unnecessary config entries
 2016-12-01 10:21:59 +01:00
William Giokas
b9fbd2723a Realisticweights: Updated cyrus weight 
Cyrus was set to weigh 300 units (~30lb?). The NATO equivalent, the Noreen
Bad News (or MAR-10) weighed 130, or 13lbs, equivalent to it's real life
counterpart. This just changes the weight to 140, similar to that of the
SVDK, a possible real-life counterpart for this rifle.
 2016-12-01 01:27:02 -06:00
PabstMirror
bc89a260ff AF - Remove setVar when removing eh 2016-11-27 16:38:33 -06:00
ulteq
dff577d5d1 ATragMX - Simplified Coriolis calculation (#4716) 2016-11-27 09:56:23 +01:00
classic
05ddca5b90 Jpn translation v382 (#4710) 
* jpn scopes translation

this is Japanese translation for scope

* fix jpn weather translation

Fix for Weather japanese translation

* fix jpn Repair translation

fix jpn Repair translation

* jpn zeus translation

Japanese localization for zeus
 2016-11-25 18:50:07 +01:00
ulteq
aaebdc3752 ATragMX - Minimize the integration error (#4703) 
* The goal is to keep the error below 0.1 MRAD
 2016-11-25 10:29:49 +01:00
ulteq
7d22fce8da Advanced Ballistics - New default simulation interval (#4707) 2016-11-25 00:15:41 +01:00
ulteq
b2ba95913a ATragMX - Truing Drop fix (#4704) 
* Fixes a bug in the truing drop feature that occurs when the zero range is greater than the truing range
 2016-11-25 00:15:04 +01:00
Glowbal
050384e960 Merge branch 'release' 
Conflicts:
	docs/_config.yml
	docs/_config_dev.yml
 2016-11-25 00:08:32 +01:00
ulteq
87b9671757 AdvancedBallistics - Abort after adjusting the muzzle velocity (#4700) 
* Always adjust the muzzle velocity when advanced ballistics is enabled
 2016-11-24 00:11:25 +01:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
Glowbal
9d08ad8238 Prep 3.8.2 release 2016-11-22 18:38:58 +01:00
ulteq
dcd4137491 Fixed several bugs in the unit conversion code 
* Proper min, max capping for both metric and imperial units
* Fixed unit conversion issues on the interpolation table input fields
 2016-11-21 21:20:48 +01:00
ulteq
cb3693f664 ATragMX - Fixes possible divison through zero 2016-11-21 21:20:48 +01:00
ulteq
dbb59c8fd1 New 'overwriteZeroRange' setting 2016-11-20 09:05:42 +01:00
ulteq
bb71885b42 Added config settings to optic_Nightstalker, optic_NVS and optic_TWS 2016-11-20 09:05:42 +01:00
ulteq
273e603cad Fix 'ACE_ScopeZeroRange' setting being ignored when placed in weapon classes 
* Only relevant for weapons with integrated scopes
 2016-11-20 09:05:42 +01:00
ulteq
1f364da0df Fix 'forceUseOfAdjustmentTurrets` affecting all scopes including iron sights 2016-11-20 09:05:42 +01:00
ulteq
f94b1a7a10 ATragMX - Improved gun list readability (#4674) 
* Reduced the gun list font size
* Redesigned the listbox scrollbars (new colors, smaller width)
* Added a negative offset for the horizontal text position in the gun list
* Limited the max. allowed length of custom gun names to 14 characters
 2016-11-19 18:05:26 +01:00
PabstMirror
491aaa89cb Update laser code if laser is already on (#4677) 2016-11-17 13:28:25 -06:00
PabstMirror
0137009060 Add RHS MELB fastrope, add 3d debuging of mem points 
Close #4683
Config from @Whigital
 2016-11-17 20:11:18 +01:00
PabstMirror
3fc8774d49 Change mortar to ammo handling weapon on init (#4678) 
Fix #4649
 2016-11-17 20:10:54 +01:00
BaerMitUmlaut
b08270742d Tweaked fatigue in water 2016-11-17 20:10:06 +01:00
BaerMitUmlaut
60651fcb1e Tweaked prone animation duty 2016-11-17 20:10:02 +01:00
BaerMitUmlaut
264fddd1c4 Fix AF for adjusted stances, fixes #4591 2016-11-17 20:09:10 +01:00
ulteq
f679b1d6bb Ballistics - AmmoBox update (Apex magazines) (#4675) 
* Added 20Rnd 6.5mm Lapua Scenar / Creedmor magazines
 2016-11-17 20:08:35 +01:00
PabstMirror
d14127ba4f Use head direction for drawing microdag wp 2016-11-17 20:08:09 +01:00
PabstMirror
0669dd6568 spaces 2016-11-17 20:07:20 +01:00
PabstMirror
054831f370 Use vehicle eh to hide bar 2016-11-17 20:07:17 +01:00
PabstMirror
948442fafb Hide bar when mounted 2016-11-17 20:07:14 +01:00
PabstMirror
8d9bd5005b Hide advFatigue bar on map / spectator 2016-11-17 20:07:10 +01:00
PabstMirror
0909d5727e Don't compile action menu for playable logics (#4666) 
Fix #4664
 2016-11-17 20:06:19 +01:00
Daniel Jupp
fa36955ffb Fix cargo find nearest vehicle (#4592) 
* Inital Commit

* read function call change

added object to exclude to function call

* Removed TODO comment
 2016-11-17 20:05:42 +01:00
PabstMirror
ed061d66ba Invert logic for isRefueling 2016-11-17 20:04:53 +01:00
jonpas
c2e933355d Prevent switching to weapon while carrying fuel nozzle - fix #4601 2016-11-17 20:04:43 +01:00
Broström.A | Evul
e73d20f3c3 ACE_Chemlight_Shield not public (#4612) 
Changed `ACE_Chemlight_Shield` to `public` from `protected`
 2016-11-17 20:03:50 +01:00
PabstMirror
1f6ce7ff81 Fix tagTestingThread error (#4662) 
Close #4659
 2016-11-17 20:03:08 +01:00
SilentSpike
27cc4ed7c0 Clean some cook off code 
- Use unary `createVehicle` syntax
- Removed some parenthesis
- Simpify 3den property condition
 2016-11-17 20:02:14 +01:00
SilentSpike
5976415b0d Add cook off 3den setting to ammo boxes 2016-11-17 20:02:11 +01:00
SilentSpike
47e1444747 Fix #4630 
Not all explosives detonate on destruction, so their ammo config must be checked to see if they will.

ACE_Explosives adds a property to define the associated ammo which *will* detonate on destruction, which is used if present. Otherwise a generic small explosion happens.
 2016-11-17 20:02:07 +01:00
ulteq
c756537d3d ATragMX - Estimate bullet length instead of using a fixed value (#4651) 2016-11-17 20:00:34 +01:00
PabstMirror
da85fc1be5 Add RHS MELB fastrope, add 3d debuging of mem points 
Close #4683
Config from @Whigital
 2016-11-16 17:42:11 -06:00
PabstMirror
6fd561f1f0 Change mortar to ammo handling weapon on init (#4678) 
Fix #4649
 2016-11-16 11:00:50 -06:00
ulteq
ba097e719f Ballistics - AmmoBox update (Apex magazines) (#4675) 
* Added 20Rnd 6.5mm Lapua Scenar / Creedmor magazines
 2016-11-16 10:49:48 +01:00
BaerMitUmlaut
14cf9817b4 Merge pull request #4672 from acemod/af-tweaks 
Advanced Fatigue swimming/diving/crawling tweaks
 2016-11-16 06:05:48 +01:00
esteldunedain
4df561e13a Fix airburst ammo when the ACE_FCS is not enabled (the code is not reached anyway) 2016-11-15 23:11:34 +01:00
ulteq
9641d306e6 Reused already calculated initSpeed 2016-11-15 23:11:34 +01:00
esteldunedain
4854b963db Apply a correction to the FCS based on vanilla zeroing 2016-11-15 23:11:34 +01:00
ulteq
9fdf3ceb00 Refined the range card calculation abort conditions 
* Max. elevation now never exceeds 40 MRADs
* Min. velocity now also depends bullet stability (e.g. lower for .408 CheyTac)
 2016-11-15 23:11:22 +01:00
ulteq
16f3f2ca37 Optimized range card calculations 
* Removed dead code
 2016-11-15 23:11:22 +01:00
ulteq
69cd53de2a Optimized ATragMX solution calculations 2016-11-15 23:11:22 +01:00
ulteq
79d087e784 Reset scope adjustments when either the weapon or the scope change. 2016-11-15 23:11:22 +01:00
ulteq
8c49433b49 Added new ace_scopes module setting 'correctZeroing' (default on) 2016-11-15 23:11:22 +01:00
ulteq
2f23f1ca6c Bugfix - Fixes ace_scopes affecting under-barrel grenade launchers 2016-11-15 23:11:22 +01:00
ulteq
7fa73744e9 Cleanup - partly merged #4658 
* Removed getVariable QGVAR(Adjustment) boilerplate
* Less calls to setVariablePublic
* Removed vanilla zeroing element hiding (fixes warning in log file)
* Moved settings evaluation into ace_settingsInitialized event handler
 2016-11-15 23:11:22 +01:00
ulteq
10cc0ba951 Moved all zero angle calculations into the advanced_ballistics.dll 
* Speeds up ATragMX
* Speeds up RangeCards
* Speeds up Scopes
 2016-11-15 23:11:22 +01:00
ulteq
789a169b0e Allow using adjustment turrets on weapons with integrated scopes 2016-11-15 23:11:22 +01:00
ulteq
429bffd039 Moves the bore height calculation into FUNC(inventoryCheck) 2016-11-15 23:11:22 +01:00
ulteq
a687c49d2a Adds settings module for ace_scopes 
* Interconnects the rangecard and scopes modules
* Hides the zeroing text when the vanilla zeroing is overwritten
* Makes the scopes module fully compatible with any 3rd party weapon pack without the need for addition compat pbos (though their use is still recommended)
 2016-11-15 23:11:22 +01:00
ulteq
36c14c5dc4 Feature - Vanilla zeroing fix 2016-11-15 23:11:22 +01:00
BaerMitUmlaut
21502d7b7b Merge pull request #4562 from acemod/mgCleanup 
Missile Guidance Overhaul
 2016-11-15 19:16:04 +01:00
PabstMirror
b4315b6a65 Javelin overhaul (#4580) 
* Javelin overhaul

* header spelling fix
 2016-11-15 12:15:25 -06:00
ulteq
f0279726ce Fixed typo (copy & paste remains) (#4673) 2016-11-15 16:14:35 +01:00
Remco Speekenbrink
324bf68614 Add Zeus utility modules 
- Add categories to zeus modules to group them based on their functionality
- Add new utility modules:
  1. Toggle simulation
  2. Update editable objects
- Clean up some of the zeus module code (standardise function headers, camel case, etc.)
 2016-11-15 12:07:48 +00:00
PabstMirror
4bb02a320b Run attack profile even if no target 2016-11-14 20:19:24 -06:00
BaerMitUmlaut
1d8030d196 Tweaked fatigue in water 2016-11-14 21:55:26 +01:00
BaerMitUmlaut
e4a4d8f56d Tweaked prone animation duty 2016-11-14 21:54:51 +01:00
ulteq
608f8bbfdc ATragMX - Added 7.62x39mm ammo to gun profile 2016-11-14 21:01:04 +01:00
ulteq
2e81f7c104 Ballistics - Overworked .408 CheyTac based on new JBM Ballistics data 
* Added 419gr and 305gr variants (vanilla ammo == 419gr)
* Muzzle velocities from http://www.cheytac.com
* G7 BCs from http://www.jbmballistics.com/
 2016-11-14 21:01:04 +01:00
BaerMitUmlaut
88596aaaf1 Merge pull request #4671 from acemod/fix-af-adj-stances 
Fix advanced fatigue for adjusted stances
 2016-11-14 19:59:27 +01:00
BaerMitUmlaut
a4c6daef50 Fix AF for adjusted stances, fixes #4591 2016-11-14 19:24:21 +01:00
PabstMirror
95699f267c Use head direction for drawing microdag wp 2016-11-14 12:13:41 -06:00
BaerMitUmlaut
d40c3fd2bf Merge pull request #4655 from acemod/fixStamBar 
Hide advFatigue bar on map / spectator / in vehicles
 2016-11-13 18:06:34 +01:00
PabstMirror
6f640ddc45 spaces 2016-11-13 10:56:45 -06:00
PabstMirror
b3e313f52b Use vehicle eh to hide bar 2016-11-13 10:55:57 -06:00
PabstMirror
e32bca3d14 Don't compile action menu for playable logics (#4666) 
Fix #4664
 2016-11-12 19:39:40 -06:00
Daniel Jupp
3935299e3c Fix cargo find nearest vehicle (#4592) 
* Inital Commit

* read function call change

added object to exclude to function call

* Removed TODO comment
 2016-11-12 17:52:17 -06:00
jonpas
d69b48bac5 Merge pull request #4629 from acemod/fixRefuelShooting 
Prevent switching to weapon while carrying fuel nozzle
 2016-11-13 00:13:48 +01:00