Commit Graph

7671 Commits

Author SHA1 Message Date
jonpas
b37b1a39b2 Allow string input for isBackpack 2016-03-05 14:29:04 +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
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
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
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
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
commy2
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +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
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
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
c0c6d3c52f Merge branch 'release' into fixFastropeRepairError 2016-02-29 12:10:34 -06:00
jonpas
7b96fe6c28 Disable logging in tagging - fix #3468 2016-02-29 16:37:19 +01:00
jonpas
f5ff593dea Revert "Convert fastroping animations to Arma 3, fix bone errors" 2016-02-28 23:16:44 +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
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
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
PabstMirror
147cd1a5af Hide categories that have no user settable options 2016-02-27 18:06:02 -06:00
jonpas
0e606224c7 Convert fastroping animations to Arma 3, fix bone errors 2016-02-27 22:28:12 +01:00
jonpas
905586bddc Make unused medical strings be used 2016-02-27 21:04:04 +01:00
Glowbal
428b828c27 Increase version 3.5.0 2016-02-27 20:44:38 +01:00
Thomas Kooi
f758a90351 Merge pull request #3445 from acemod/preventSelfIMFromClosing
Prevent Self Interact Menu from bugging out during animations
2016-02-27 20:35:18 +01:00
Thomas Kooi
d0b1ac56ba Merge pull request #3440 from System98/Update-german-translations
Update german translations
2016-02-27 20:33:51 +01:00
esteldunedain
a86bbdb162 Prevent the interact menu from closing when moving the mouse during animations 2016-02-27 15:47:23 -03:00
ElTyranos
9d50812a65 Fastrope French translation 2016-02-27 19:46:15 +01:00
esteldunedain
121663226c Make the auto-expanding of SelfActions and ZeusActions work at all animation speeds, but keep the animation in all cases. 2016-02-27 15:44:53 -03:00
commy2
a7ec4d9d2f Merge pull request #3398 from acemod/fix3317
Resync mine orientations in JIP.
2016-02-27 16:52:53 +01:00
Thomas Kooi
a9fa3a99b8 Merge pull request #3441 from acemod/fixNametagsError
Fix error in nametags when a player disconnects
2016-02-27 15:17:15 +01:00
esteldunedain
30d62859dc Fix error in nametags when a player disconnects 2016-02-27 10:17:26 -03:00
esteldunedain
188941a9b7 Filter the GVAR(explosivesOrientations) list before sending it 2016-02-27 10:07:51 -03:00
esteldunedain
fba1a322ac Yet more fixes 2016-02-27 09:50:44 -03:00
esteldunedain
823eb116ae more fixes 2016-02-27 09:37:57 -03:00
esteldunedain
8280335d07 Fix event name typo 2016-02-27 09:26:42 -03:00
esteldunedain
b9e1028f23 Merge branch 'fix3317' of github.com:KoffeinFlummi/ACE3 into fix3317 2016-02-27 09:14:16 -03:00
esteldunedain
834cbb4d24 Debug stuff 2016-02-27 09:14:07 -03:00
esteldunedain
849fa4f1ee Redo markers, lost in the merge 2016-02-27 09:06:19 -03:00
System98
df3ec3a179 Fix length of a display name
- Fix the length of a display name so it doesn't get cut off in the
settings.
2016-02-27 12:51:32 +01:00
System98
a13b029b4a Merge remote-tracking branch 'refs/remotes/acemod/master' into Update-german-translations 2016-02-27 12:50:07 +01:00
esteldunedain
db4974eae2 Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into fix3317
Conflicts:
	addons/medical/CfgEden.hpp
	addons/repair/CfgEden.hpp
2016-02-27 08:48:57 -03:00