Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
9,390 Commits 73 Branches 88 Tags 752 MiB
8555f00889
Commit Graph

9390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
PabstMirror
2bdeff1639 Fix for all missionVersions 2016-02-29 16:34:51 -06:00
PabstMirror
cb370c4f70 Merge branch 'release' into 3den_-1 2016-02-29 14:16:34 -06:00
PabstMirror
fe967ff2bd Don't read medic setting that is not in module 2016-02-29 14:07:15 -06:00
PabstMirror
2b3b6083cb Try to handle bad 3den mission modules 2016-02-29 14:06:14 -06:00
Nicolás Badano
bc126fca34 Merge pull request #3463 from BaerMitUmlaut/fr-rc-fixes 
Fast roping RC fixes
 2016-02-29 15:49:10 -03:00
BaerMitUmlaut
5b4072bf50 Added vehicle existance check 2016-02-29 19:29:11 +01:00
BaerMitUmlaut
05c16a5dfb Removed TOH animations 2016-02-29 19:29:10 +01:00
BaerMitUmlaut
11a66d98e2 Cleanup & fix interaction conditions 2016-02-29 19:29:09 +01:00
PabstMirror
f85a886b83 Merge pull request #3474 from acemod/fixFastropeRepairError 
Don't try adding repair actions to fastrope helper
 2016-02-29 12:12:27 -06:00
PabstMirror
c0c6d3c52f Merge branch 'release' into fixFastropeRepairError 2016-02-29 12:10:34 -06:00
PabstMirror
35860c8204 Merge pull request #3458 from acemod/fixFastropeRepairError 
Don't try adding repair actions to fastrope helper
 2016-02-29 11:55:57 -06:00
Nicolás Badano
9fe7c5f189 Merge pull request #3473 from acemod/addDefinesBlank 
Add defines to blank component
 2016-02-29 14:08:34 -03:00
jonpas
e0cfef0eed Add defines to blank component 2016-02-29 17:50:38 +01:00
Nicolás Badano
b7329a77ee Merge pull request #3471 from acemod/350disableTaggingLog 
Disable logging in tagging
 2016-02-29 12:44:02 -03:00
jonpas
7b96fe6c28 Disable logging in tagging - fix #3468 2016-02-29 16:37:19 +01:00
Nicolás Badano
8fc4a9d901 Merge pull request #3461 from acemod/revert-3451-350fixFastropeAnimsBoneErrors 
Revert "Convert fastroping animations to Arma 3, fix bone errors"
 2016-02-28 19:24:28 -03:00
jonpas
f5ff593dea Revert "Convert fastroping animations to Arma 3, fix bone errors" 2016-02-28 23:16:44 +01:00
jonpas
99cd7b427f Merge pull request #3460 from acemod/350fixDupString 
Remove duplicate medical string
 2016-02-28 22:55:58 +01:00
jonpas
8d326a0a1b Remove duplicate medical string 2016-02-28 22:54:24 +01:00
PabstMirror
e5b79d7b33 Don't try adding repair actions to fastrope helper 2016-02-28 14:17:14 -06:00
BaerMitUmlaut
75c2e3d032 Added QUOTE macros to fastroping configs 2016-02-28 18:56:45 +01:00
VKing
8bb7b072d4 Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro. 
This prevents any possible confusion when the GVARs are used in code.
 2016-02-28 15:18:15 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
Thomas Kooi
6bfe86e91a Merge pull request #3455 from acemod/fix3450 
Fix #3450
 2016-02-28 13:07:03 +01:00
Thomas Kooi
a09d0be0d4 Merge pull request #3453 from acemod/hideEmptyCategories 
Hide categories that have no user settable options
 2016-02-28 13:05:55 +01:00
commy2
69f810f32b add missing pee 2016-02-28 07:25:11 +01:00
commy2
03b8e2b590 fix reloadMutex nil, fix#3450 2016-02-28 06:12:40 +01:00