Commit Graph

10010 Commits

Author SHA1 Message Date
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
nomisum
9b55aa1555 Merge remote-tracking branch 'refs/remotes/acemod/master' 2016-03-02 22:40:33 +01:00
nomisum
48e9e9c9e4 added CBA-PFH, added QUOTE 2016-03-02 22:36:42 +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
nomisum
730e79def0 added fastroping sounds 2016-03-02 22:17:49 +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
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
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
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
commy2
467075ad67 replace timePFH with CBA_missionTime 2016-03-02 11:01:39 +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
esteldunedain
d886289716 Display the new weapon temperature right after swapping barrels 2016-03-01 19:27:39 -03:00
esteldunedain
850a499c0e Localize spare barrel's displayName 2016-03-01 19:26:20 -03:00
esteldunedain
e6a2ca7102 Fix typos 2016-03-01 19:25:45 -03:00
jonpas
f13517980b Merge branch 'release' 2016-03-01 23:08:17 +01:00
esteldunedain
f130d6c253 Increase spare barrel mass to 60 (2.7 Kg) 2016-03-01 18:17:58 -03:00
esteldunedain
b8c8c21a02 Remove spare barrels from starting equipments 2016-03-01 18:17:23 -03:00
esteldunedain
a041555381 Add an animation and progressbar to the "Check spare barrels temperatures" action 2016-03-01 18:16:14 -03:00
esteldunedain
46a96dd5da Move spare barrel event handlers out of postInit 2016-03-01 18:14:36 -03:00
VKing
353b5e9ef4 Replace transportMax... with maximumLoad for mortar boxes.
Fixes 3490
2016-03-01 21:58:21 +01:00
esteldunedain
bc4a338d32 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into spareBarrelSimulation 2016-03-01 17:15:14 -03:00