Alessandro Foresi
e97c7c0f65
Translation: IT completed (with BOM)
2016-03-27 21:22:15 +02:00
Alessandro Foresi
e5a7578f92
Translation: IT completed (no BOM)
2016-03-27 21:20:15 +02:00
PabstMirror
e90609d043
Fix AB Terrain Extension
2016-03-24 12:23:48 -05:00
PabstMirror
86ad2ab415
Only warn for weapon compat if AB is on
2016-03-24 11:53:55 -05:00
PabstMirror
b0df31783d
Merge branch 'master' into compatPboWarnings
2016-03-24 11:23:29 -05:00
SzwedzikPL
cdcde46a7d
Fix double displayName in medical settings
2016-03-22 13:05:47 +01:00
Nicolás Badano
b4f6dbbc18
Merge pull request #3568 from acemod/settingsNameDescp
...
Ace_Settings - add name,descption,categories
2016-03-21 21:24:22 -03:00
esteldunedain
ec2920ed35
Improve protractor accuracy. Close #3606
2016-03-20 22:24:30 -03:00
commy2
5aeb19312b
fix script error in tagging
2016-03-20 17:09:03 +01:00
commy2
a841839aa6
don't overwrite helicopter sub class self actions
2016-03-19 19:37:26 +01:00
SzwedzikPL
8555f00889
remove needless tolower from mortarinit
2016-03-18 17:26:37 +01:00
Thomas Kooi
daceaa9dd8
Merge branch 'master' into settingsNameDescp
2016-03-18 14:48:11 +01:00
Thomas Kooi
e8b26a7a14
Merge pull request #3593 from BaerMitUmlaut/release
...
Fixed fastroping race condition
2016-03-18 12:07:43 +01:00
BaerMitUmlaut
fc06782256
Fixed broken ropeDetach
2016-03-18 00:16:31 +01:00
BaerMitUmlaut
b25ffdb54f
Fixed network race condition
2016-03-18 00:15:57 +01:00
commy2
5e52e22e81
Merge branch 'release' into fixNametagsRank
2016-03-17 20:14:40 +01:00
PabstMirror
218d333738
Fix nametag error when rank is empty string
2016-03-17 11:56:20 -05:00
Glowbal
485900dce8
increment patch version
2016-03-16 22:59:28 +01:00
Thomas Kooi
559d111e66
Merge pull request #3584 from SzwedzikPL/fixmk6mortarinit
...
Fix mortar ammo handling init on dedicated
2016-03-16 22:48:49 +01:00
commy2
0c42bb5345
Merge branch 'release' into revc65656a0
2016-03-16 22:44:19 +01:00
jonpas
72c9e9da39
Replace usage of filter to select in tagging
2016-03-16 20:17:23 +01:00
jonpas
c568c18865
Add module icon
2016-03-14 19:14:52 +01:00
jonpas
89924e927a
Disable debug
2016-03-14 17:25:20 +01:00
Nicolás Badano
8ff4fb8851
Merge branch 'release' into revc65656a0
2016-03-14 12:21:11 -03:00
esteldunedain
14183470bc
Revert "Improved rope glitchyness"
...
This reverts commit c65656a016
2016-03-14 12:16:23 -03:00
SzwedzikPL
32846014a1
fix ammo handling init on dedicated
2016-03-14 14:21:02 +01:00
PabstMirror
2ab169eb73
Merge branch 'release' into FixTrue
2016-03-12 13:46:44 -06:00
PabstMirror
1985e7e20a
Fix versioning true when compiled
2016-03-12 13:42:52 -06:00
Thomas Kooi
61f1959109
Fix morphine increasing viscosity
...
Morphine should decrease viscosity instead of increase. Closes #3579
2016-03-12 18:55:42 +01:00
commy2
fca8b51bb2
reset interaction menu time variables on save game load
2016-03-12 17:08:08 +01:00
esteldunedain
aad79eda85
The dead shouldn't interact (it's not TWD)
2016-03-12 10:06:45 -03:00
jonpas
32c32b6cc5
Add stamina bar selective UI
2016-03-09 18:58:46 +01:00
PabstMirror
ad3a03a9c7
versioning - Add warnings for missing compat PBOs
2016-03-08 13:52:34 -06:00
PabstMirror
94adcf4ccb
MicroDagr Scalar Values
2016-03-08 13:17:20 -06:00
esteldunedain
3122542814
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2016-03-08 15:25:04 -03:00
esteldunedain
69bd858167
Merge branch 'fr-fix-quotes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fix-quotes
...
Conflicts:
addons/fastroping/CfgMoves.hpp
addons/fastroping/CfgVehicles.hpp
2016-03-08 15:24:23 -03:00
Thomas Kooi
bfe738ba80
Merge pull request #3513 from acemod/cbaVersioning
...
Add CBA 2.3.1 to versioning check
2016-03-08 19:21:36 +01:00
Thomas Kooi
ddd8187b19
Merge pull request #3534 from GitHawk/refuel_isEngineOn
...
Disallow refueling with running engine
2016-03-08 19:20:28 +01:00
esteldunedain
2b33dd7686
Merge branch 'fr-ai-deploy' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-ai-deploy
...
Conflicts:
addons/fastroping/XEH_preInit.sqf
2016-03-08 15:13:50 -03:00
esteldunedain
88f4c49c08
Merge branch 'master' of github.com:KoffeinFlummi/ACE3
2016-03-08 15:08:53 -03:00
esteldunedain
afe835816f
Merge branch 'fr-fixes' of https://github.com/BaerMitUmlaut/ACE3 into BaerMitUmlaut-fr-fixes
...
Conflicts:
addons/fastroping/CfgVehicles.hpp
2016-03-08 15:07:45 -03:00
commy2
4ceb1b34b8
Merge pull request #3566 from acemod/removeDragCarryFromCannons
...
Disable drag and carry for StaticCannon
2016-03-08 19:05:04 +01:00
jonpas
70100825cf
Fix params in clientInit
2016-03-08 18:49:19 +01:00
PabstMirror
1a77b0fcd4
Disable drag and carry for StaticCannon
...
#3528
2016-03-08 11:43:35 -06:00
jonpas
e90ef30904
Add return value to public setElementVisibility function
2016-03-08 18:42:37 +01:00
jonpas
23e2617db8
Change params order and improve clientInit
2016-03-08 18:40:23 +01:00
Thomas Kooi
60af0d3162
Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR
...
Standardize GVAR array brackets in configs.
2016-03-08 18:19:50 +01:00
jonpas
64fe944b0f
Add public setter function, Optimize some checks
2016-03-08 18:12:01 +01:00
PabstMirror
3232654e13
Close #3565 -Fix spelling of local var _woundEffectiveness
2016-03-08 11:02:54 -06:00
PabstMirror
b5e95f3945
Add some names/descriptions to settings configs
2016-03-08 01:17:40 -06:00
commy2
e605ede04a
execute addActionEvents in unscheduled env
2016-03-08 01:19:32 +01:00
BaerMitUmlaut
35857f4523
Cleanup canPrepareFRIES
2016-03-07 20:42:13 +01:00
Thomas Kooi
d86f58f418
Merge pull request #3525 from acemod/sandbag3den
...
Set sandbag side to civ to show in 3den
2016-03-07 19:30:24 +01:00
Thomas Kooi
8946779c1a
Merge pull request #3527 from acemod/fixHrCallbackVar
...
Fix empty callback for hr adjustment
2016-03-07 12:51:23 +01:00
BaerMitUmlaut
c65656a016
Improved rope glitchyness
2016-03-06 20:33:23 +01:00
BaerMitUmlaut
84af4b7676
Force open ramps on helicopters
2016-03-06 19:53:37 +01:00
commy2
a85c5b14cf
Merge pull request #3547 from acemod/fixsavegamecrashmaybe
...
Store Interact Menus on CBA Namespaces
2016-03-06 19:28:26 +01:00
commy2
a9578ab473
Merge pull request #3524 from acemod/fixCancelAction
...
Fix Cancel (RMB) Action
2016-03-06 19:16:40 +01:00
commy2
81c29d8120
Merge pull request #3551 from acemod/disableOnlyActionMenuOnMouseHint
...
Disable only action menu on mouse hint and modifier where unnecessary
2016-03-06 19:13:10 +01:00
commy2
391aaeba89
Merge pull request #3548 from acemod/namespaceforcargofilters
...
use namespace for cargo filters, fixes problem with save games
2016-03-06 19:10:53 +01:00
commy2
c90775091e
Merge pull request #3549 from acemod/fixmagincompat
...
remove obsolete fix, fix #3545
2016-03-06 19:10:45 +01:00
jonpas
858c68f8d7
Don't use modifier for rotation where not needed
2016-03-06 16:54:27 +01:00
jonpas
c378cd9f12
Disable action menu on mouse hint with inGameUISetEventHandler rather than showHud, as showHud disables UI script commands
2016-03-06 16:47:46 +01:00
jonpas
f956675d35
Merge pull request #3542 from acemod/refuelGlobalEvents
...
Replace execRemoteFnc with events and increase fuel update delay in refuel
2016-03-06 16:23:02 +01:00
jonpas
b47b887a21
Fix event name already being used
2016-03-06 16:20:16 +01:00
jonpas
9b46e8856e
Merge modules, Add base allow client settings toggle, Add requires descriptions
2016-03-06 15:41:17 +01:00
jonpas
a064c0c98d
Modernize code
2016-03-06 12:50:16 +01:00
jonpas
0dc1e37874
Merge branch 'master' into uiSettings
2016-03-06 12:41:27 +01:00
jonpas
52007fab6a
Add sanity checks, fix explosives checks
2016-03-06 12:06:17 +01:00
commy2
79db282aca
remove obsolete fix, fix #3545
2016-03-06 09:12:49 +01:00
commy2
8892aeed9d
missed one
2016-03-06 07:55:34 +01:00
commy2
8603f2062a
simplify
2016-03-06 07:14:43 +01:00
commy2
f43b287093
use namespace for cargo filters, fixes problem with save games
2016-03-06 06:53:59 +01:00
commy2
6a58af5b33
fix save game crash?, ref #3397
2016-03-06 06:22:38 +01:00
jonpas
ae3a41e6d8
Move common event handlers closer to their counterparts
2016-03-06 02:38:05 +01:00
Nicolás Badano
de6af27912
Merge pull request #3492 from acemod/Fix3491_MortarBoxes
...
Replace transportMax... with maximumLoad for mortar boxes.
2016-03-05 22:09:07 -03:00
Nicolás Badano
9f205b4a54
Merge pull request #3509 from acemod/fix3379
...
Increase interaction distance with explosives from 1m to 1.5m.
2016-03-05 22:08:31 -03:00
Nicolás Badano
1d3950bfff
Merge pull request #3497 from acemod/liteDrag
...
Fix portable light floating / dir when carrying
2016-03-05 22:07:43 -03:00
Nicolás Badano
e2c2495d52
Merge pull request #3496 from looterz/bftbug
...
Fix for player markers not showing up correctly with BFT_ShowPlayerNames
2016-03-05 22:05:33 -03:00
esteldunedain
e15d534fd1
Rename event, removing prefix. Back to square one.
2016-03-05 21:11:53 -03:00
BaerMitUmlaut
8e895e8cff
Added gantry hiding animation
2016-03-05 23:21:10 +01:00
BaerMitUmlaut
b20e433f43
Fixed bug with fastroping simultaneously
2016-03-05 23:20:44 +01:00
BaerMitUmlaut
8039332743
Switched to preStart + XEH_PREP
2016-03-05 23:19:53 +01:00
BaerMitUmlaut
21d546ac1c
Added note concerning BIS_fnc_guiMessage
2016-03-05 21:22:45 +01:00
PabstMirror
721aa94a29
Merge pull request #3536 from acemod/dediCaps
...
Fix captivity system on dedicated
2016-03-05 14:08:53 -06:00
BaerMitUmlaut
b8a4349c10
Added deployment API and waypoint
2016-03-05 20:25:35 +01:00
jonpas
9463b05218
targetEvent -> objectEvent
2016-03-05 18:16:09 +01:00
jonpas
881eaf951a
Move setVectorDirAndUp and setHitPointDamage events to common, Make refuel set nozzle position execute only on target where local
2016-03-05 18:07:07 +01:00
jonpas
589ca27b60
Fix missing comma
2016-03-05 18:02:21 +01:00
jonpas
015a60e6c4
Increase fuel update to 1s
2016-03-05 17:44:03 +01:00
jonpas
401d457a46
Replace execRemoteFnc with global/targetEvent in refuel
2016-03-05 17:41:47 +01:00
jonpas
b37b1a39b2
Allow string input for isBackpack
2016-03-05 14:29:04 +01:00
PabstMirror
4826a89ef5
Fix captivity system on dedicated
...
Fix #3532
2016-03-04 11:45:38 -06:00
GitHawk
0b3abd55d3
Disallow refueling with running engine
2016-03-04 13:59:14 +01:00
esteldunedain
5450954fc2
Rename the event as "ace_tagging_tagCreated"
2016-03-04 09:16:42 -03:00
esteldunedain
02616ebbb2
Throw a globalEvent when a tag is created. Close #3521 .
2016-03-03 19:43:26 -03:00
PabstMirror
e3deebff7e
Fix empty callback for hr adjustment
...
Fix #3526
Same issue as #3384
2016-03-03 13:23:53 -06:00
PabstMirror
53a36f8783
Add REQUIRED_CBA_VERSION macro to script_mod.hpp
2016-03-03 13:00:47 -06:00
PabstMirror
56c5343bd7
Set sandbag side to civ to show in 3den
...
ref #3102 #2633
2016-03-03 12:54:13 -06:00
jonpas
ef95e278f9
Fix Cancel Action by moving it to MouseButtonDown display EH
2016-03-03 17:35:43 +01:00
PabstMirror
137a512a9e
close main display if using incompatible cba
2016-03-02 16:33:29 -06:00
commy2
e6c6e55968
Merge pull request #3507 from acemod/mouseZChangedEH
...
Replace addScrollWheelEventHandler with MouseZChanged Display EH
2016-03-02 23:15:50 +01:00
commy2
92fddff833
also fix modifier key
2016-03-02 23:14:23 +01:00
commy2
9a0c839ced
Merge pull request #3508 from acemod/fix3504
...
Make the FRIES inherit from Helicopter_Base_F. Fix #3504
2016-03-02 22:28:01 +01:00
ColdEvul
80bada0365
Fixed carrying rotation.
2016-03-02 22:27:29 +01:00
ColdEvul
8b4892598a
added EventHandlers
2016-03-02 22:17:19 +01:00
commy2
303f8d93b9
simplify inheritance
2016-03-02 22:16:40 +01:00
FFAAMOD
95007d8ccd
Spanish translation of FastRope fixed
...
Fixed wrong tag in Spanish Translation of Fast Rope module.
2016-03-02 21:00:46 +01:00
esteldunedain
e0493458c0
Reduce interaction distance for defusing back to 1m
2016-03-02 16:19:38 -03:00
PabstMirror
e6a5d2dacd
Add CBA 2.3.1 to versioning check
2016-03-02 13:19:20 -06:00
FFAAMOD
6b13ea287e
Added Spanish Translation to fastroping module
...
Added Spanish Translations, some of these can have multiple translations but according to the context, they match properly their meanings.
2016-03-02 19:56:50 +01:00
esteldunedain
928a9b9485
Increase interaction distance with explosives from 1m to 1.5m. Fix #3379
2016-03-02 15:25:41 -03:00
esteldunedain
0399335a3f
Make the FRIES inherit from Helicopter_Base_F. Fix #3504
2016-03-02 14:41:41 -03:00
jonpas
4918dbacb0
Replace and depreacate EFUNC(common,addScrollWheelEventHandler) with MouseZChanged Display EH
2016-03-02 17:33:46 +01:00
ColdEvul
b91897de3b
Added comment
2016-03-02 16:41:45 +01:00
ColdEvul
e7ec87d284
Added carry and interaction for case.
2016-03-02 16:38:23 +01:00
PabstMirror
8f620f2e61
Fix portable light floating / dir when carrying
...
#3486
2016-03-01 18:49:41 -06:00
looterz
b86e5d8ad6
Fixes player markers not showing up correctly when BFT_ShowPlayerNames is enabled in multiplayer
2016-03-01 18:23:33 -06:00
VKing
353b5e9ef4
Replace transportMax... with maximumLoad for mortar boxes.
...
Fixes 3490
2016-03-01 21:58:21 +01:00
Glowbal
e2c7576251
Remove headless client component from ACE.
...
The component does not fit properly within the scope of the ACE project. In order to avoid difficulties at a later point in time, project management has decided to pull the HC component from the ACE 3.5.0 release. We are going to look into alternative options for the HC component, such as a separate repository maintained by the ACE team.
2016-03-01 19:09:42 +01:00
commy2
fa3913752b
replace XEH_ENABLED macro with actual class, fix #3482 , fix #3483
2016-03-01 17:05:00 +01:00
esteldunedain
bafe714ab5
Remove spare barrels from starting equipment, as they make some grenades not fit in the uniforms.
2016-03-01 10:05:06 -03:00
PabstMirror
2bdeff1639
Fix for all missionVersions
2016-02-29 16:34:51 -06:00
PabstMirror
cb370c4f70
Merge branch 'release' into 3den_-1
2016-02-29 14:16:34 -06:00
PabstMirror
fe967ff2bd
Don't read medic setting that is not in module
2016-02-29 14:07:15 -06:00
PabstMirror
2b3b6083cb
Try to handle bad 3den mission modules
2016-02-29 14:06:14 -06:00
BaerMitUmlaut
5b4072bf50
Added vehicle existance check
2016-02-29 19:29:11 +01:00
BaerMitUmlaut
05c16a5dfb
Removed TOH animations
2016-02-29 19:29:10 +01:00
BaerMitUmlaut
11a66d98e2
Cleanup & fix interaction conditions
2016-02-29 19:29:09 +01:00
PabstMirror
c0c6d3c52f
Merge branch 'release' into fixFastropeRepairError
2016-02-29 12:10:34 -06:00
jonpas
7b96fe6c28
Disable logging in tagging - fix #3468
2016-02-29 16:37:19 +01:00
jonpas
f5ff593dea
Revert "Convert fastroping animations to Arma 3, fix bone errors"
2016-02-28 23:16:44 +01:00
jonpas
8d326a0a1b
Remove duplicate medical string
2016-02-28 22:54:24 +01:00
PabstMirror
e5b79d7b33
Don't try adding repair actions to fastrope helper
2016-02-28 14:17:14 -06:00
BaerMitUmlaut
75c2e3d032
Added QUOTE macros to fastroping configs
2016-02-28 18:56:45 +01:00
VKing
8bb7b072d4
Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro.
...
This prevents any possible confusion when the GVARs are used in code.
2016-02-28 15:18:15 +01:00
BlackWindowS
c61e7b5104
Tweaked & added translations
...
Translation of almost every STR to French
2016-02-28 14:48:04 +01:00
Thomas Kooi
6bfe86e91a
Merge pull request #3455 from acemod/fix3450
...
Fix #3450
2016-02-28 13:07:03 +01:00
commy2
69f810f32b
add missing pee
2016-02-28 07:25:11 +01:00
commy2
03b8e2b590
fix reloadMutex nil, fix#3450
2016-02-28 06:12:40 +01:00
PabstMirror
147cd1a5af
Hide categories that have no user settable options
2016-02-27 18:06:02 -06:00
jonpas
0e606224c7
Convert fastroping animations to Arma 3, fix bone errors
2016-02-27 22:28:12 +01:00
jonpas
905586bddc
Make unused medical strings be used
2016-02-27 21:04:04 +01:00
Glowbal
428b828c27
Increase version 3.5.0
2016-02-27 20:44:38 +01:00
Thomas Kooi
f758a90351
Merge pull request #3445 from acemod/preventSelfIMFromClosing
...
Prevent Self Interact Menu from bugging out during animations
2016-02-27 20:35:18 +01:00
Thomas Kooi
d0b1ac56ba
Merge pull request #3440 from System98/Update-german-translations
...
Update german translations
2016-02-27 20:33:51 +01:00
esteldunedain
a86bbdb162
Prevent the interact menu from closing when moving the mouse during animations
2016-02-27 15:47:23 -03:00
ElTyranos
9d50812a65
Fastrope French translation
2016-02-27 19:46:15 +01:00
esteldunedain
121663226c
Make the auto-expanding of SelfActions and ZeusActions work at all animation speeds, but keep the animation in all cases.
2016-02-27 15:44:53 -03:00
commy2
a7ec4d9d2f
Merge pull request #3398 from acemod/fix3317
...
Resync mine orientations in JIP.
2016-02-27 16:52:53 +01:00
