34d351c652
fix exitWith capitalization
2015-11-30 17:14:05 +01:00
c426bfc9c1
Merge pull request #2888 from acemod/repairPositions
...
Define custom repair points for a few vehicles
2015-11-28 20:09:37 +00:00
f676e6d9c9
Add some more typeNames replacements
2015-11-27 21:23:27 -06:00
5850f78c1f
Merge branch 'master' into isEqualTypeRepalcement
2015-11-27 21:08:21 -06:00
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
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
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
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
69b53af1d3
1.54 - Replace typeName with isEqualType
2015-11-20 11:40:31 -06:00
cfba7c01e8
Merge branch 'master' into settingsErrorChecking
...
Conflicts:
addons/map_gestures/stringtable.xml
2015-11-03 12:09:36 -06:00
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
64de91ed06
Add warning for duplicate setting modules.
2015-10-18 23:34:11 -05:00
db2572acfd
Merge branch 'master' into parseList
...
Conflicts:
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
2015-09-28 16:06:32 +02:00
3471ebef16
Merge https://github.com/dudakov/ACE3 into russian-merge
2015-09-23 19:17:52 +02:00
49d1355ad8
Fix due to review
2015-09-22 11:52:06 +03:00
45e44251b6
Merge branch 'release'
...
Conflicts:
addons/repair/stringtable.xml
2015-09-21 17:14:53 -05:00
2e3014daa3
Merge branch 'master' into parseList
...
Conflicts:
addons/common/functions/fnc_assignObjectsInList.sqf
2015-09-21 22:46:01 +02:00
42b2c18509
Merge pull request #2542 from acemod/FixSparePartsCargo
...
Fix cargo setVariable on server with InitPost
2015-09-21 22:28:59 +02:00
bbed98fbef
Merge pull request #2394 from jonpas/cleanupRepairRelease
...
Minor Repair Cleanup for release
2015-09-21 22:25:58 +02:00
9c61f256bc
Rem debug
2015-09-20 10:06:24 -05:00
789f3843d5
#2488 - Fix cargo setVariable on server with InitPost
2015-09-20 10:05:34 -05:00
3c93c2c95c
#2525 - Add CanInteractWith checks for repair
2015-09-19 11:07:03 -05:00
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
a9946e26a5
Merge pull request #2489 from acemod/fixSpareParts
...
only run addSpareParts on server
2015-09-17 16:44:31 -05:00
3b1a9ab415
#2488 - only run addSpareParts on server
2015-09-17 11:19:47 -05:00
067b08611e
Fix missing newlines
2015-09-17 12:54:26 +02:00
4d2707eae2
Russian Translations - Update
2015-09-17 12:21:21 +03:00
341e122e4c
Russian Translations - Update
2015-09-17 11:43:14 +03:00
463e21dd91
330
2015-09-16 12:40:30 +02:00
e2f9b31fb2
small fix + repair translation
2015-09-16 11:53:05 +02:00
db37fa0e04
Update stringtable.xml
2015-09-15 11:45:02 -05:00
c50c53e5bb
remove debug
2015-09-15 09:57:53 -05:00
9cd470b849
Add Setting for toolkit requirement for wheel repair
2015-09-15 09:54:55 -05:00
478b618e4b
Merge pull request #2429 from MikeMatrix/feature/switchToLogMacros
...
Feature/switch to log macros
2015-09-15 14:51:23 +02:00
3de783d3a7
Cleanup for branch release, picked from #2366
2015-09-11 19:57:21 +02:00
63c2712360
Merge branch 'release' into portuguese
2015-09-10 21:59:30 +02:00
c2ffe7cad0
Merge branch 'release' into russian
2015-09-10 21:05:32 +02:00
a5621604fd
Merge branch 'release' into czech
2015-09-10 20:51:33 +02:00
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
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
ad50c1ab4b
medical and repair translation
2015-09-07 16:15:18 +02:00
c4475ff5be
Merge branch 'pl-translation-7' of https://github.com/gienkov/ACE3 into pl-translation-7
2015-09-07 16:06:17 +02:00
1edcc320d1
Merge remote-tracking branch 'origin' into pl-translation-7
2015-09-07 16:05:45 +02:00
a745b07cb6
Merge pull request #2365 from jonpas/addSparePartsSettingInitDelay
...
Used new setting init delay function in addSpareParts
2015-09-05 21:18:25 +02:00
06baa5e4d3
Fixed nilCheck, changed moduleAddSpareParts to use new parseList
2015-09-05 20:51:48 +02:00
8fc061bfd6
Merge branch 'master' into parseList
2015-09-05 20:16:59 +02:00
7147891710
Added latest ACE3 PT-BR translations
2015-09-05 15:12:31 -03:00
a8412361bd
Use setting init delay function for addSpareParts
2015-09-05 19:33:25 +02:00
27a0e8f639
Repair: Fix possible out of bounds setting
...
Setting "engineerSetting_fullRepair" had an out of bounds default value.
2015-09-05 16:30:00 +02:00
a4b4c5d2a3
Merge pull request #2187 from jonpas/trackToTrackedVehicles
...
Added Spare Parts module handling
2015-09-05 13:36:42 +02:00
