Commit Graph

9620 Commits

Author SHA1 Message Date
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
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
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
esteldunedain
6cf9787fd1 Fix travis warning 2016-03-05 13:18:41 -03:00
esteldunedain
ebfd76107e The function name was changed in CBA 2016-03-05 13:15:56 -03:00
esteldunedain
62f598b2a6 Use the correct CBA function name, defining it in ACE as long as it doesn't exist already. 2016-03-05 13:11:20 -03:00
jonpas
b37b1a39b2 Allow string input for isBackpack 2016-03-05 14:29:04 +01:00
nomisum
e36198561f Merge remote-tracking branch 'refs/remotes/acemod/master' 2016-03-05 12:43:27 +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
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
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
nomisum
76468d326b fixed license file 2016-03-02 22:49:25 +01:00