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 |
|
commy2
|
5b877809ed
|
Merge pull request #3560 from acemod/unscheduledactions
execute addActionEvents in unscheduled env
|
2016-03-08 16:13:43 +01: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 |
|
BaerMitUmlaut
|
8c867e5e55
|
Standardised script_component inclusion
|
2016-03-07 20:15:55 +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 |
|
BaerMitUmlaut
|
45383a0c1d
|
Fixed missing bracket
|
2016-03-07 18:55:51 +01:00 |
|
SzwedzikPL
|
46367c003c
|
Fixed EH parameters, prevent wrong fastroping option due to inherition
|
2016-03-07 18:55:50 +01:00 |
|
BaerMitUmlaut
|
7344474658
|
Added RHS Fastroping compatibility
|
2016-03-07 18:55:49 +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 |
|
novichiv
|
955333b0bc
|
Fixed strncpy in parse_imagepath
|
2016-03-06 22:06:11 +03: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 |
|
esteldunedain
|
ae8cbb4834
|
Add "check temperature" and "swap barrel" actions for AARs
|
2016-03-05 23:33:30 -03: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 |
|