Commit Graph

9367 Commits

Author SHA1 Message Date
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
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
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
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
PabstMirror
e6a5d2dacd Add CBA 2.3.1 to versioning check 2016-03-02 13:19:20 -06: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
Thomas Kooi
7d53e1f4d2 Merge pull request #3488 from acemod/removeXEHENABLED
replace XEH_ENABLED macro with actual class, fix #3482, fix #3483
2016-03-01 18:52:08 +01:00
commy2
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
commy2
9cb40dab14 Merge pull request #3485 from acemod/removeSpareBarrelsEquipment
Remove spare barrels from starting equipment, as they make some grena…
2016-03-01 14:08:09 +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
Nicolás Badano
b69827aea8 Merge pull request #3476 from acemod/3den_-1
Try to handle -1 from eden modules
2016-02-29 20:17:52 -03:00