PabstMirror
39edd205f0
Merge pull request #2942 from acemod/CzechTables
...
Czech Translations - Update
2015-12-07 09:32:00 -06:00
bux578
af31d43567
fix german typos
2015-12-07 10:20:35 +01:00
PabstMirror
358228f5bb
Cleanup De Stringtables
2015-12-06 15:03:15 -06:00
ProfessorCZ
cf41ac5fba
Czech Translations - Update
2015-12-04 22:28:10 -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
PabstMirror
419af195e9
#2902 - Remove error and don't exit if veh has no hit points
...
B_UAV_01_F has no hitpoints and would throw error
Don't exit so "fullRepair" action still gets added
2015-12-01 13:43:27 -06:00
SilentSpike
c426bfc9c1
Merge pull request #2888 from acemod/repairPositions
...
Define custom repair points for a few vehicles
2015-11-28 20:09:37 +00:00
PabstMirror
f676e6d9c9
Add some more typeNames replacements
2015-11-27 21:23:27 -06:00
PabstMirror
5850f78c1f
Merge branch 'master' into isEqualTypeRepalcement
2015-11-27 21:08:21 -06:00
SilentSpike
0ffb9ea5ad
Define custom repair points for a few vehicles
...
Some helicopters have the main rotor point on the tip of a single blade which can be problematic depending on the orientation of the helicopter so those have been moved to the center (to match others). The tail rotor is also in the complete wrong position for some.
2015-11-27 20:06:57 +00:00
PabstMirror
ab769757d9
Skip Depends Hitpoints - Use HitPoints selPos for wheels
...
Stuff
Normalize Depends - Skip Glass Repair
Fix spawned wheel/track not having correct damage
getHitpointString robustness, hatchback fuelHitpoint, fix count errors
-
Formatting
local -> private
Fix Stuff
2015-11-20 21:11:50 -06:00
SilentSpike
839c022b84
Fix broken repair point selection code
...
Only valid hit selection + hit point combinations are usable for repair points:
- Empty hit points mean there isn't enough information to display to the user
- Empty hit selections mean that the hit point doesn't actually exist
2015-11-20 21:11:23 -06:00
PabstMirror
4e93b9c72d
2307 - Repair sub-turrets
...
Privates
Cleanup debug
Add repair actions for sub turrets
Cleanup
Fix Header
Error Handling
Cleanup setHitpointDamage
Fix common ACE_isEngineer to handle scalar or bool
Claim and release repair objects (wheel/track)
Repair sub-turrets
2015-11-20 21:11:05 -06:00
PabstMirror
69b53af1d3
1.54 - Replace typeName with isEqualType
2015-11-20 11:40:31 -06:00
PabstMirror
cfba7c01e8
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
Jonathan Pereira
ce5364d7af
Added PT-BR translations
...
Added all remaining translations, including dagr, dragging, map,
map_gestures, medical, repair, tacticalladder and zeus.
2015-10-26 22:04:03 -02:00
PabstMirror
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
jonpas
db2572acfd
Merge branch 'master' into parseList
...
Conflicts:
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
2015-09-28 16:06:32 +02:00
KoffeinFlummi
3471ebef16
Merge https://github.com/dudakov/ACE3 into russian-merge
2015-09-23 19:17:52 +02:00
[OMCB]kaban
49d1355ad8
Fix due to review
2015-09-22 11:52:06 +03:00
PabstMirror
45e44251b6
Merge branch 'release'
...
Conflicts:
addons/repair/stringtable.xml
2015-09-21 17:14:53 -05:00
jonpas
2e3014daa3
Merge branch 'master' into parseList
...
Conflicts:
addons/common/functions/fnc_assignObjectsInList.sqf
2015-09-21 22:46:01 +02:00
Glowbal
42b2c18509
Merge pull request #2542 from acemod/FixSparePartsCargo
...
Fix cargo setVariable on server with InitPost
2015-09-21 22:28:59 +02:00
Glowbal
bbed98fbef
Merge pull request #2394 from jonpas/cleanupRepairRelease
...
Minor Repair Cleanup for release
2015-09-21 22:25:58 +02:00
PabstMirror
9c61f256bc
Rem debug
2015-09-20 10:06:24 -05:00
PabstMirror
789f3843d5
#2488 - Fix cargo setVariable on server with InitPost
2015-09-20 10:05:34 -05:00
PabstMirror
3c93c2c95c
#2525 - Add CanInteractWith checks for repair
2015-09-19 11:07:03 -05:00
esteldunedain
3422f5a7f1
Merge branch 'master' of https://github.com/Legolasindar/ACE3 into spanish-translation
...
Conflicts:
addons/medical/stringtable.xml
addons/repair/stringtable.xml
2015-09-18 13:20:22 -03:00
PabstMirror
a9946e26a5
Merge pull request #2489 from acemod/fixSpareParts
...
only run addSpareParts on server
2015-09-17 16:44:31 -05:00
PabstMirror
3b1a9ab415
#2488 - only run addSpareParts on server
2015-09-17 11:19:47 -05:00
KoffeinFlummi
067b08611e
Fix missing newlines
2015-09-17 12:54:26 +02:00
kaban
4d2707eae2
Russian Translations - Update
2015-09-17 12:21:21 +03:00
kaban
341e122e4c
Russian Translations - Update
2015-09-17 11:43:14 +03:00
Ivan Navarro Cabello
463e21dd91
330
2015-09-16 12:40:30 +02:00
gienkov
e2f9b31fb2
small fix + repair translation
2015-09-16 11:53:05 +02:00
PabstMirror
db37fa0e04
Update stringtable.xml
2015-09-15 11:45:02 -05:00
PabstMirror
c50c53e5bb
remove debug
2015-09-15 09:57:53 -05:00
PabstMirror
9cd470b849
Add Setting for toolkit requirement for wheel repair
2015-09-15 09:54:55 -05: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
3de783d3a7
Cleanup for branch release, picked from #2366
2015-09-11 19:57:21 +02:00
KoffeinFlummi
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +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
jonpas
e07b71faf0
Merge branch 'master' into parseList
...
Conflicts:
addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
2015-09-09 19:13:04 +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
gienkov
ad50c1ab4b
medical and repair translation
2015-09-07 16:15:18 +02:00
gienkov
c4475ff5be
Merge branch 'pl-translation-7' of https://github.com/gienkov/ACE3 into pl-translation-7
2015-09-07 16:06:17 +02:00
gienkov
1edcc320d1
Merge remote-tracking branch 'origin' into pl-translation-7
2015-09-07 16:05:45 +02:00
Glowbal
a745b07cb6
Merge pull request #2365 from jonpas/addSparePartsSettingInitDelay
...
Used new setting init delay function in addSpareParts
2015-09-05 21:18:25 +02:00
jonpas
06baa5e4d3
Fixed nilCheck, changed moduleAddSpareParts to use new parseList
2015-09-05 20:51:48 +02:00
