Commit Graph

134 Commits

Author SHA1 Message Date
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
commy2
82086efca0 manual merge 2016-02-10 10:11:33 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
PabstMirror
f11c2af921 Update XEH_clientInit.sqf 2015-12-30 14:55:25 -06:00
PabstMirror
d372111d3f Sitting Cleanup
- Add modern privates
- Don't add actions, canInteractWith, or EH if not enabled
2015-12-30 12:23:35 -06:00
PabstMirror
358228f5bb Cleanup De Stringtables 2015-12-06 15:03:15 -06:00
licht-im-Norden87
291f4df072 Update German Stringtables
Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

kommas...........................................................................................................................................................

Rallypoint

Update stringtable.xml

slideshow, not finished yet

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

What does Curator mean in this context?
l. 294, l 302

cargo

Update stringtable.xml

Update stringtable.xml

I left a few things out. I'd like if someone gives me  advice
Z.698 Pionier oder Instandsetzer o.Ä. Was genau ist die deutsche Bezeichung der Klasse in ACE bzw Arma?
Z.707 Ich habe mich einfach mal auf Mechatroniker festgelegt, da Reperaturspezialist sich doch ein wenig ungelenk anhört...

Update stringtable.xml

Habe engineer als Pionier übersetzt (halte es selbst für etwas unpassend) Der specialist ist bei mir zum Mechatroniker geworden.

Update stringtable.xml

Update stringtable.xml

Update stringtable.xml

Fix Mistakes from merge

Fix Empty Entries

Fix Mistake

Fix
2015-12-04 22:06:44 -06:00
commy2
ae1f35c042 remove superfluous private 2015-11-29 16:55:44 +01:00
commy2
caa5585044 simplify getRandomAnimation in sitting 2015-11-29 16:50:08 +01:00
commy2
e5c4d35969 1.55 use new selectRandom command 2015-11-29 16:33:25 +01:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
PabstMirror
26c051d397 Sitting - Fix missing semicolon 2015-10-18 11:48:21 -05:00
Glowbal
f57eb08ce5 Merge pull request #2620 from jonpas/sittingFramework
Sitting Framework
2015-10-18 12:26:53 +02:00
PabstMirror
f7fe0c08e0 #2391 - Use AGL for sitting setPos 2015-10-14 11:15:44 -05:00
jonpas
ae07a71b0d Minimized XEH to ThingX config level 2015-09-27 02:13:32 +02:00
jonpas
cd510c8ff7 Added carrying to chairs 2015-09-27 02:05:38 +02:00
jonpas
85cff04e0c Stored scroll-wheel action ID into already existing player setVariable instead of having 2 2015-09-27 01:37:19 +02:00
jonpas
dbd0beb514 Stored a global variable in player setVariable 2015-09-27 01:31:23 +02:00
jonpas
a7a716ca8d Better sitting framework in terms of interactions 2015-09-27 01:20:40 +02:00
jonpas
e3985dce3e Cleanup sitRotation as it's no longer needed 2015-09-27 00:40:59 +02:00
PabstMirror
1ea1094a73 Merge branch 'release' 2015-09-15 16:16:10 -05:00
Glowbal
7e5ab07e32 Merge pull request #2387 from acemod/FixHCPPE
Fix that PPEffects Throw a error on HC
2015-09-15 21:04:37 +02:00
Glowbal
478b618e4b Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
jonpas
6fb22ebd11 Added isNull check to PFH for explicity 2015-09-11 17:55:28 +02:00
jonpas
efa8252b45 Remove debug 2015-09-11 17:43:29 +02:00
jonpas
2d3a02085e Improved comment 2015-09-11 17:27:08 +02:00
jonpas
d49798144c Replaced hasChairMoved with isEqualTo, fixed missing variable 2015-09-11 17:25:46 +02:00
jokoho48
b7e02da1cc remove if (!hasInterface) from PFH
move ! in ()
2015-09-11 16:58:26 +02:00
jonpas
c5f9f85d27 Updated comment 2015-09-11 16:53:09 +02:00
jonpas
0b9c6254e4 Removed redundant rotation control - changed to config 2015-09-11 16:46:51 +02:00
KoffeinFlummi
c2ffe7cad0 Merge branch 'release' into russian 2015-09-10 21:05:32 +02:00
KoffeinFlummi
a5621604fd Merge branch 'release' into czech 2015-09-10 20:51:33 +02:00
KoffeinFlummi
83aa2cc68c Merge branch 'release' into french 2015-09-10 19:36:56 +02:00
FreeZbe
fa7943c8be Update French translations 2015-09-10 19:14:51 +02:00
Michael Braun
a5fb09a7e1 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/repair/functions/fnc_moduleRepairSettings.sqf
2015-09-09 02:55:12 +02:00
kaban
08b7110e58 Russian Translations - Update 2015-09-03 04:54:52 +03:00
kaban
91cae690c0 Russian Translations - Update 2015-09-03 03:36:15 +03:00
ProfessorCZ
44fa520bdd Czech Translations - Update 2015-09-03 01:20:24 +02:00
commy2
237d5b6536 stand up action (uses get out shortcut) and less awkward standing animaton 2015-09-01 21:03:28 +02:00
commy2
405d85eaaa fix leaning back through chair while sitting, fix #1795 2015-09-01 19:06:20 +02:00
Michael Braun
035b3432c5 Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
	addons/common/XEH_postInit.sqf
2015-09-01 08:45:59 +02:00
KoffeinFlummi
a7f2a7fefc Merge branch 'translate-hu' of https://github.com/Harakhti/ACE3 2015-08-30 00:35:11 +02:00
Michael Braun
9e10aa86d7 Standardize logging format through ACE_LOG macros 2015-08-26 15:32:54 +02:00
jonpas
de033f0ff2 README.md files added to all modules 2015-08-19 04:18:33 +02:00
Glowbal
c69aa09d55 Merge pull request #2054 from MikeMatrix/codeCleanupSitting
Code cleanup of Sitting module
2015-08-08 17:00:07 +02:00
jonpas
52ac13273c Fixed #1937 - Made use of CfgMoves to make free-look head movement visible, Fixed grenade throwing while sitting 2015-08-08 02:13:14 +02:00
jonpas
9e64e8c2aa Increased sitting interaction distance - fixes #1950 2015-08-07 21:41:07 +02:00
Michael Braun
d192f7eea4 Added parentheses back 2015-08-07 15:35:52 +02:00
Michael Braun
60e4c2e601 Code cleanup of sitting module 2015-08-07 15:12:24 +02:00
PabstMirror
b3741f4036 Capitalization for macro CBA_fnc_addPerFrameHandler 2015-08-04 02:34:38 -05:00
Harakhti
d0f91c5ebf Row 1
Not a miracle, but it's something.
2015-07-30 14:40:51 +02:00
Glowbal
5ec59045c1 Default disable sitting 2015-07-27 22:00:30 +02:00
Glowbal
7d30bc53ed Removed non chairs 2015-07-27 21:59:38 +02:00
Glowbal
3514f07d31 Merge pull request #1806 from jonpas/sittingFixes
Akward Sitting Fixes Part 2
2015-07-25 20:42:38 +02:00
jonpas
e1fb4db63a Fixed chairs inheritance in sitting 2015-07-15 00:42:41 +02:00
Ivan Navarro Cabello
78529af60c Update spanish translation 2015-07-08 20:57:46 +02:00
jonpas
815b7984aa Fixed event statement arguments, reworded comment 2015-07-07 03:46:54 +02:00
jonpas
cb210f92a0 Prevented sitting on flipped chairs, Stand when chair gets knocked away/otherwise moves 2015-07-05 17:07:34 +02:00
jonpas
34dea7d971 Fixed #1796 sitting above ground level 2015-07-05 13:55:45 +02:00
ProfessorCZ
89a9218e59 CZ Translation - Update 2015-07-04 15:56:00 +02:00
gienkov
70862c5de9 PL translation 2015-07-02 23:55:26 +02:00
ToasterBR
f4a51d57ef Translation to Brazilian Portuguese (PT-BR)
Made all remaining translations, including new ones like the sitting
module, for example.
2015-06-27 15:48:39 -03:00
jonpas
c8c1f76e7d Macro usage, privates fix 2015-06-26 21:31:48 +02:00
jonpas
922e88d31e Fixed handcuffing not breaking sitting animation 2015-06-22 15:25:10 +02:00
jonpas
083d34b62b Removed redundant GVAR 2015-06-18 00:21:56 +02:00
jonpas
b974a63947 Lowercased function, comment 2015-06-11 21:51:41 +02:00
jonpas
491e2a4429 Handle handcuffing 2015-06-11 20:01:38 +02:00
jonpas
0a71bd6931 Restricted sitting rotation 2015-06-11 19:46:16 +02:00
jonpas
46020259fd Fixed typo 2015-06-11 16:48:08 +02:00
jonpas
51e83ba0fa Handle kileld and disconnect while sitting 2015-06-09 18:52:12 +02:00
jonpas
5bfa2425bb Git hates me 2015-06-09 18:33:39 +02:00
jonpas
3a4cd99001 Changed setPos to setPosASL for reliability, Fixed module icon name 2015-06-09 18:33:07 +02:00
jonpas
f1f9ee1365 Added module icon, removed comment 2015-06-09 18:27:58 +02:00
jonpas
36d4d01a30 Adjusted Chair (Plastic) sitting position 2015-06-09 16:55:06 +02:00
jonpas
3e0d4d1f7b Fixed Rattan Chair position, doAnimation before moving player 2015-06-09 16:48:58 +02:00
jonpas
951f9d32c3 Allow interaction menu while sitting 2015-06-09 16:04:37 +02:00
jonpas
f9d292e9c2 Missing privates 2015-06-09 15:52:41 +02:00
jonpas
95ec2ea1f9 Added isNotSitting exception, Renamed sitting QGVAR 2015-06-08 23:39:14 +02:00
jonpas
c6b5c705c7 Added Sitting Settings and Module 2015-06-08 23:25:15 +02:00
jonpas
2104e5b45f Optimized condition functions, Removed redundant toLower for animation names 2015-06-08 17:52:33 +02:00
jonpas
4cea9bd1bc Added Sitting README.md 2015-06-07 22:38:23 +02:00
jonpas
eb0541d726 Added icons 2015-06-07 22:36:22 +02:00
jonpas
78c9991f68 Added Polish stringtable 2015-06-07 22:25:43 +02:00
jonpas
c3c2fd0074 Initial Sitting commit 2015-06-07 22:00:43 +02:00