Commit Graph

9320 Commits

Author SHA1 Message Date
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
commy2
79db282aca remove obsolete fix, fix #3545 2016-03-06 09:12:49 +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
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
PabstMirror
721aa94a29 Merge pull request #3536 from acemod/dediCaps
Fix captivity system on dedicated
2016-03-05 14:08:53 -06:00
commy2
959750d03b Merge pull request #3539 from acemod/isBackpackParamString
Allow string input for isBackpack
2016-03-05 20:02:32 +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
jonpas
fc54b1180c Merge pull request #3522 from acemod/removeDownloadBadge
Remove download badge
2016-03-03 17:11:41 +01:00
jonpas
a928185ea0 Remove download badge 2016-03-03 17:09:37 +01: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
commy2
303f8d93b9 simplify inheritance 2016-03-02 22:16:40 +01:00
Nicolás Badano
3cafa9f41b Merge pull request #3515 from FFAAMOD/master
Spanish translation of FastRope fixed
2016-03-02 17:08:01 -03: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
jonpas
0f25ac698d Merge pull request #3511 from FFAAMOD/patch-1
Added FFAAMOD to AUTHORS.txt
2016-03-02 20:11:36 +01:00
Nicolás Badano
b8e7c45227 Merge pull request #3510 from FFAAMOD/master
Added Spanish Translation to fastroping module
2016-03-02 16:09:57 -03:00
FFAAMOD
67695286c7 Added FFAAMOD to AUTHORS.txt 2016-03-02 20:01:41 +01: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
Nicolás Badano
597be8ce3b Merge pull request #3501 from acemod/requireCBAVersionIssues
Require specifying the CBA version in issues.
2016-03-02 10:01:13 -03:00
esteldunedain
cb21b20d9f Require specifying the CBA version in issues. 2016-03-02 09:58:47 -03:00
Thomas Kooi
779e2a6bc8 Merge pull request #3428 from acemod/improveGithubFiles
Improve GitHub files
2016-03-02 13:44:59 +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
jonpas
f13517980b Merge branch 'release' 2016-03-01 23:08:17 +01: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
Glowbal
4d0a894ce1 Merge branch 'release' of github.com:acemod/ACE3 into release 2016-03-01 18:54:04 +01:00
Glowbal
84052f50fd Update extension builds 2016-03-01 18:53:52 +01:00