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 |
|
jonpas
|
8fc061bfd6
|
Merge branch 'master' into parseList
|
2015-09-05 20:16:59 +02:00 |
|
Jonathan Pereira
|
7147891710
|
Added latest ACE3 PT-BR translations
|
2015-09-05 15:12:31 -03:00 |
|
jonpas
|
a8412361bd
|
Use setting init delay function for addSpareParts
|
2015-09-05 19:33:25 +02:00 |
|
TheMagnetar
|
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 |
|
Glowbal
|
a4b4c5d2a3
|
Merge pull request #2187 from jonpas/trackToTrackedVehicles
Added Spare Parts module handling
|
2015-09-05 13:36:42 +02:00 |
|
[OMCB]kaban
|
85b0127f56
|
Fix due to review
|
2015-09-05 05:00:18 +03:00 |
|
jonpas
|
644460ed96
|
Merge branch 'master' into parseList
Conflicts:
addons/slideshow/functions/fnc_makeList.sqf
|
2015-09-04 18:40:35 +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 |
|
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 |
|
commy2
|
37aec2b3c3
|
enable repairing while on ladder
|
2015-08-31 21:22:22 +02:00 |
|
Grzegorz
|
5662e9eb62
|
proper name for stabilizer
|
2015-08-30 01:54:43 +02:00 |
|
gienkov
|
9187b31b92
|
pitot tube
|
2015-08-30 01:47:20 +02:00 |
|
gienkov
|
17f647f341
|
PL translation
|
2015-08-30 01:42:42 +02:00 |
|
Michael Braun
|
657157d767
|
Merge branch 'master' of https://github.com/acemod/ACE3 into feature/switchToLogMacros
Conflicts:
addons/hearing/functions/fnc_moduleHearing.sqf
|
2015-08-29 22:38:26 +02:00 |
|
jonpas
|
6d27299883
|
Cleaned up spare parts collection after SettingsInitialized, Check if vehicle already in collection
|
2015-08-26 23:43:06 +02:00 |
|
jonpas
|
48e0f5757d
|
Merge branch 'master' into trackToTrackedVehicles
Conflicts:
addons/repair/stringtable.xml
|
2015-08-26 23:38:51 +02:00 |
|
jonpas
|
ef1b4cbd26
|
Merge branch 'master' into trackToTrackedVehicles
Conflicts:
addons/repair/XEH_preInit.sqf
|
2015-08-26 23:33:05 +02:00 |
|
jonpas
|
6a6c5008c0
|
Merge branch 'master' into repairHitpointStrings
Conflicts:
addons/repair/functions/fnc_doRepair.sqf
|
2015-08-26 23:29:36 +02:00 |
|
Glowbal
|
f7679b45ad
|
Merge pull request #2246 from jonpas/repairHitpointGroups
Repair Hitpoint Groups Framework
|
2015-08-26 23:27:08 +02:00 |
|
jonpas
|
ce8da8d720
|
Fixed Full Repair available even when vehicle is already fully repaired
|
2015-08-26 23:09:46 +02:00 |
|
jonpas
|
b6d5db9157
|
Reverted IGNORED_HITPOINTS, Added Taru glasses to it
|
2015-08-26 23:09:04 +02:00 |
|
jonpas
|
cc70580a93
|
Improved comments
|
2015-08-26 22:51:41 +02:00 |
|
jonpas
|
e4123c9730
|
Added 2 strings, changed 1
|
2015-08-26 22:44:30 +02:00 |
|
jonpas
|
8529e5c9b7
|
Merge branch 'master' into trackToTrackedVehicles
|
2015-08-26 21:25:08 +02:00 |
|
Michael Braun
|
5047d4de1c
|
Switched to ACE_LOG<LEVEL>_# variation
|
2015-08-26 17:39:44 +02:00 |
|
jonpas
|
dc2e146e8b
|
Merge branch 'master' into repairHitpointStrings
Conflicts:
addons/repair/functions/fnc_addRepairActions.sqf
|
2015-08-26 17:04:05 +02:00 |
|
jonpas
|
c0379c7809
|
Updated with correct cargo events and settings category
|
2015-08-26 17:02:29 +02:00 |
|
Michael Braun
|
097506076f
|
Fixed format usage in macros requiring ARR_# for it to work
|
2015-08-26 16:48:55 +02:00 |
|
Michael Braun
|
9e10aa86d7
|
Standardize logging format through ACE_LOG macros
|
2015-08-26 15:32:54 +02:00 |
|
jonpas
|
5b6429f23e
|
Made more modules use assignObjectsInList common function
|
2015-08-24 21:55:48 +02:00 |
|
jonpas
|
9718883599
|
Consolidated into 1 function
|
2015-08-24 20:58:54 +02:00 |
|
jonpas
|
3f0909ddd5
|
Fixed typo
|
2015-08-24 20:12:45 +02:00 |
|
jonpas
|
78e7565121
|
Added support for multiple groups, Fixed check group damage returning true even if hitpoint not in a group
|
2015-08-24 20:03:11 +02:00 |
|
jonpas
|
2c521527f4
|
Readded newline
|
2015-08-24 18:19:25 +02:00 |
|
jonpas
|
cb6efc7c9a
|
Removed copy/paste minuses
|
2015-08-24 18:18:54 +02:00 |
|
jonpas
|
04da19190f
|
Changed custom hitpoint positions config entry to 2d array
|
2015-08-24 18:17:56 +02:00 |
|
jonpas
|
449af180c7
|
Moved check for zero position in it's own line
|
2015-08-24 17:58:19 +02:00 |
|
jonpas
|
32d5ac99d9
|
Readded ignored hitpoints
|
2015-08-24 17:56:34 +02:00 |
|
jonpas
|
7f175bad5f
|
Added support for display messages
|
2015-08-24 05:24:25 +02:00 |
|
jonpas
|
144af2ed17
|
Added support for when one of the grouped hitpoints is damaged but not main
|
2015-08-24 05:14:04 +02:00 |
|
jonpas
|
f2bda7c434
|
Added hitpoint groups framework
|
2015-08-24 04:17:24 +02:00 |
|
jonpas
|
94c4c411e2
|
Added custom hitpoint selection framework with a starting example, removed blacklist
|
2015-08-24 03:23:37 +02:00 |
|
jonpas
|
1253d1267c
|
Inlined selection check
|
2015-08-24 01:54:12 +02:00 |
|
jonpas
|
5c33f7736c
|
Added support in repair for hitpoints with non-center selections
|
2015-08-24 01:51:34 +02:00 |
|
jonpas
|
6a1b8cc359
|
Changed to LSTRING
|
2015-08-24 01:25:00 +02:00 |
|
jonpas
|
d33834261f
|
Removed debug
|
2015-08-24 01:14:59 +02:00 |
|
jonpas
|
e368ae28f5
|
Fixed localization on same type hitpoints
|
2015-08-24 01:13:42 +02:00 |
|
jonpas
|
396e01cd6e
|
Added string checking for less needed string multiplicates
|
2015-08-24 01:04:57 +02:00 |
|
jonpas
|
0fc9a33d38
|
Shortened sub-action text localization
|
2015-08-23 21:11:45 +02:00 |
|
jonpas
|
e08bf59ac2
|
Removed 'Repair' word from sub-actions
|
2015-08-23 21:09:36 +02:00 |
|
jonpas
|
ca1b47beb5
|
Use correct module group
|
2015-08-23 19:54:55 +02:00 |
|
Glowbal
|
7d2ca74402
|
Merge pull request #2220 from acemod/fixHitEffectRepair
Fix Hit Effect on Track and Wheel
|
2015-08-22 14:32:03 +02:00 |
|
gienkov
|
cf585790db
|
fixes done
|
2015-08-22 11:41:15 +02:00 |
|
gienkov
|
75c31c10fd
|
optionsmenu and repair first version of translation
|
2015-08-22 00:17:01 +02:00 |
|
jokoho48
|
11f753f873
|
Fix Hit Effect on Track and Wheel
|
2015-08-22 00:13:29 +02:00 |
|
jonpas
|
ccd0a7bd88
|
Merge branch 'master' into trackToTrackedVehicles
Conflicts:
addons/repair/stringtable.xml
|
2015-08-21 21:04:50 +02:00 |
|
Glowbal
|
2f0ed4fba1
|
Merge pull request #2207 from jonpas/readmes
Added and Updated README.md files
|
2015-08-21 14:07:30 +02:00 |
|
Glowbal
|
60ef673896
|
Merge pull request #2198 from jonpas/logistics
Added Logistics Categories
|
2015-08-20 18:43:55 +02:00 |
|
jonpas
|
b627e32a00
|
Added shared logistics categories
|
2015-08-19 16:54:44 +02:00 |
|
jonpas
|
de033f0ff2
|
README.md files added to all modules
|
2015-08-19 04:18:33 +02:00 |
|
jonpas
|
b16d313e35
|
Moved spare parts cargo init to cargo
|
2015-08-19 03:36:31 +02:00 |
|
jonpas
|
ffb765bf7a
|
Changed to AddCargoItem event
|
2015-08-18 23:43:34 +02:00 |
|
jonpas
|
3bcebf9033
|
Moved spare parts adding to init, Added module option to add spare parts or not, Added module to add specific spare part and amount of it to specific vehicle(s)
|
2015-08-18 23:41:25 +02:00 |
|