Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,858 Commits 73 Branches 88 Tags 752 MiB
missile_manpad
Commit Graph

470 Commits

Author SHA1 Message Date
[OMCB]kaban
8fc2cbd0ef Russian Translations - Update (#4217) 2016-08-13 11:25:43 +02:00
PabstMirror
afe3e5ccd3 Fix repair cargo not added to zeus created objects (#4201) 
- Fix #4200 (add delay for units created via zeus)
- Use ace_settingsInitialized to add events
 2016-08-03 13:44:04 -05:00
PabstMirror
787a57c12b Fix track repair selection placement 2016-08-01 21:19:48 -05:00
Ozan Eğitmen
8f80cd59c8 Use GVAR where applicable 2016-07-20 07:15:18 +03:00
PabstMirror
0281bc8f3d Fix 3den attribute layout for 1.62 2016-07-12 17:54:16 +02:00
esteldunedain
893866ff39 Remove >> signs from interaction menu 2016-07-06 22:38:03 -03:00
PabstMirror
d15330d245 Fix cargo event name - spare parts not being added 2016-07-01 23:14:20 -05:00
commy2
3fdc0dd521 Merge pull request #3955 from acemod/add_name 
add 'name' to components
 2016-06-20 19:25:58 +02:00
BaerMitUmlaut
88b58216ee Added beautified component names 2016-06-20 11:44:36 +02:00
commy2
c481ddedaf add 'name' to components 2016-06-19 09:38:39 +02:00
Josuan Albin
d26f133733 Add missing french entries in stringtables and update older ones 
Take changes from #3480 and completed empty entries
 2016-06-19 01:18:12 +02:00
jonpas
b97ba4990d Normalize 2 more files 2016-06-09 14:25:57 +02:00
Glowbal
8c9b31b1c7 Merge pull request #3815 from acemod/cbaEventSystem 
Deprecate ACE events framework
 2016-06-09 14:20:26 +02:00
SilentSpike
90ebf9638b Update common event names to meet new standard 2016-06-04 11:12:56 +01:00
Jonathan Pereira
b64b7e431e Translated remaining strings 2016-06-03 23:11:40 -03:00
PabstMirror
77baeda976 Merge branch 'master' into huehuehue 2016-06-03 00:01:13 -05:00
PabstMirror
db78dd53a8 Cleanup Merge and remoteFnc events 2016-06-02 19:59:18 -05:00
PabstMirror
d7f9c52c2f Merge branch 'master' into cbaEventSystem 2016-06-02 19:29:30 -05:00
jonpas
c110121b1a Merge pull request #3811 from acemod/abolishExecRemoteFnc 
Replace execRemoteFnc with events
 2016-06-02 17:08:01 +02:00
PabstMirror
637b5e02e9 Update 3den attributes to use 1.60 scaling (#3857) 2016-06-02 09:26:57 -05:00
jonpas
590d4fa70b Merge branch 'master' into abolishExecRemoteFnc 2016-06-02 14:28:43 +02:00
jonpas
95573ee711 Stringtable URL (#3855) 
* Move url into stringtable to display it properly, Add some missing author and url entries

* Fix main

* Remove duplicate author
 2016-06-01 23:45:51 +02:00
jonpas
1354826d56 Put semi-colon to the correct place 2016-06-01 14:11:32 +02:00
jonpas
1331265e65 Move url into a macro 2016-06-01 13:49:10 +02:00
jonpas
6730d016c2 Convert CfgPatches to new Eden format and CBA 2.4.1 compatibility 2016-06-01 13:27:02 +02:00
jonpas
26fbc36cab Merge branch 'master' into cbaEventSystem 2016-05-31 22:36:08 +02:00
jonpas
7a307393a4 Merge branch 'master' into useQuotedPathMacros 2016-05-30 21:14:17 +02:00
commy2
272775445f Merge pull request #3670 from acemod/useQuotedFuncMacros 
Use new quoted function macros
 2016-05-30 21:00:23 +02:00
jonpas
331c3c70cb Verify and fix cargo, nametags, rearm, reload, repair, ui, Convert infoDisplayChanged in common and mk6mortar Rsc's 2016-05-24 18:58:27 +02:00
SilentSpike
207d6612da Remove duplicate ACE_newEvents entries 2016-05-24 15:06:17 +01:00
SilentSpike
c4b75160a4 Run event renaming script 2016-05-24 14:13:11 +01:00
SilentSpike
108ff4f644 Replace ACE event system calls with CBA counterparts 
Regex used:

\[(.+?),(.+?),(.+?)\]\s+call\s+E?FUNC\((common,)?(target|object)Event\)
[$1,$3,$2] call CBA_fnc_targetEvent

E?FUNC\((common,)?(server|global|local)Event\)
CBA_fnc_$2Event

E?FUNC\((common,)?(add|remove)EventHandler\)
CBA_fnc_$2EventHandler
 2016-05-22 16:47:39 +01:00
jonpas
d902d1182a Replace ace_common_fnc_execRemoteFunc with events 2016-05-21 23:55:48 +02:00
Glowbal
36e48554c2 Merge pull request #3787 from acemod/motorcycleInteraction 
Add interaction support to Motorcycle class
 2016-05-14 09:33:41 +02:00
jonpas
e984fcf715 Fix part name for Tank class 2016-05-12 21:56:12 +02:00
jonpas
2d2d5bc828 Readd mistakenly removed spare part adding 2016-05-12 21:52:06 +02:00
jonpas
58cc686aac Remove initial spare part adding for classes not Car or Tank, Improve addSpareParts 2016-05-12 21:49:45 +02:00
jonpas
f6e4bd7a6b Remove redundant spare part adding 2016-05-12 21:37:54 +02:00
jonpas
c591c7af64 Add interaction support to Motorcycle class 2016-05-12 21:30:32 +02:00
PabstMirror
2a5ec42148 Repair - Improve wheel detection for RHS (#3760) 
* Repair - Improve backup wheel detection

Fix #3759

* Cleanup
 2016-05-07 16:04:27 -05:00
Ozan Eğitmen
b8abec0c61 Fix Capitalization of ACE Settings classes. (#3627) 2016-05-07 22:14:56 +02:00
Glowbal
83a8c488d9 Merge pull request #3751 from acemod/wipeoutWhitespace 
Cleaned up excessive whitespace
 2016-05-04 11:46:56 +02:00
BaerMitUmlaut
7fcbe93b71 Cleaned up excessive whitespace 2016-05-03 02:32:44 +02:00
ProfessorCZ
7d0fcde9fa CZ Translate - Update 
04/30/2016
 2016-04-30 00:57:24 +02:00
PabstMirror
32cd23076f Merge pull request #3690 from acemod/engineRepairMsg 
Clarify repair while engine is running
 2016-04-15 15:56:52 -05:00
jonpas
839d067797 Exclude base FRIES class 2016-04-14 17:38:11 +02:00
jonpas
300d069e78 Exclude FRIES from repair interactions 2016-04-14 13:59:31 +02:00
PabstMirror
f16a65f381 Fix default 2016-04-12 20:05:56 -05:00
PabstMirror
4f6b11c2a6 Clarify repair while engine is running 
#3348
- Show action, but exit and show warning when selected
- Optional (default off) setting to auto shut off engine to keep
compatibility with missions
 2016-04-12 20:04:12 -05:00
jonpas
ccaec31a90 Use new QFUNC and QEFUNC macros 2016-04-08 20:43:26 +02:00
jonpas
85b4366368 Use new QPATHTOF and QPATHTOEF macros 2016-04-08 20:34:50 +02:00
Thomas Kooi
60af0d3162 Merge pull request #3456 from acemod/StandardizeConfigArrayGVAR 
Standardize GVAR array brackets in configs.
 2016-03-08 18:19:50 +01:00
commy2
fa3913752b replace XEH_ENABLED macro with actual class, fix #3482, fix #3483 2016-03-01 17:05:00 +01:00
Jonathan Pereira
309f48ee0b Added remaining PT-BR translarions 2016-03-01 08:56:43 -03:00
PabstMirror
c0c6d3c52f Merge branch 'release' into fixFastropeRepairError 2016-02-29 12:10:34 -06:00
PabstMirror
e5b79d7b33 Don't try adding repair actions to fastrope helper 2016-02-28 14:17:14 -06:00
VKing
8bb7b072d4 Standardize grammar of GVAR arrays in configs to place the square brackets outside the GVAR macro. 
This prevents any possible confusion when the GVARs are used in code.
 2016-02-28 15:18:15 +01:00
BlackWindowS
c61e7b5104 Tweaked & added translations 
Translation of almost every STR to French
 2016-02-28 14:48:04 +01:00
jonpas
10abe5cd57 Merge branch 'master' into German-translations 2016-02-27 01:36:07 +01:00
System98
48d312cb8e Add german translations 
- add missing german translations
- small fixes to existing texts
- remove unused strings in "medical" addon
 2016-02-25 18:10:26 +01:00
esteldunedain
3fa3512509 Remaining spanish translations 2016-02-25 12:25:42 -03:00
PabstMirror
7cf912222b Merge pull request #3393 from acemod/3denReplaceDropDown 
Fix 3den attributes
 2016-02-23 17:09:03 -06:00
bux578
aa8d3a3fd0 Merge pull request #3221 from BaerMitUmlaut/unified-ellipsis 
Unified ellipsis
 2016-02-23 08:27:28 +01:00
BaerMitUmlaut
74ea79e2cc Unified ellipsis 2016-02-22 23:51:47 +01:00
PabstMirror
330792ba7a Add medic threeden control 2016-02-22 11:26:32 -06:00
commy2
0f7bfc0f66 Merge pull request #3389 from acemod/precompileongamestart 
precompile on game start
 2016-02-22 16:00:19 +01:00
commy2
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
PabstMirror
ed96307f2f 3den repair - Replace bad combo with custom control 2016-02-22 02:50:20 -06:00
PabstMirror
2467fa7b0c Fix empty callbacks in medical/repair 2016-02-21 11:34:25 -06:00
PabstMirror
8b932fd5a0 Fix some undefined functions / strings 2016-02-20 16:58:45 -06:00
ChairborneIT
0021bc08df Added translation for most Italian stringtable entries 2016-02-20 21:39:05 +01:00
PabstMirror
fc3bb0de6b Fix #3355 - add missing semi-colons 2016-02-19 18:51:25 -06:00
commy2
5d0d8576ea Merge pull request #3288 from SzwedzikPL/edenassignsettings 
Repair & medical object attributes for eden editor
 2016-02-19 11:47:26 +01:00
SzwedzikPL
0c80551fd8 ace attribute category, lower case classes 2016-02-10 01:17:18 +01:00
gienkov
d5dd718b8d fix endlines 2016-02-09 12:01:13 +01:00
gienkov
fafd25dee7 pl translation 2016-02-09 11:50:35 +01:00
SzwedzikPL
3bfac35b65 ace repair and medical attributes 2016-02-07 23:56:45 +01:00
ProfessorCZ
61611d0ec7 Czech Translation - Update 
Update
 2016-02-03 18:31:31 +01:00
PabstMirror
46d6e92bca Add quick debug defines to all script_components 2016-01-28 23:26:02 -06:00
PabstMirror
c0eccc67c3 Change all SCALAR to NUMBER in headers 2016-01-28 18:19:15 -06:00
Glowbal
c042703786 Merge branch 'release' 2016-01-05 22:55:34 +01:00
commy2
427628045c fix ThingX capitalization, fix #3076 2016-01-03 15:21:38 +01:00
PabstMirror
fb0738bd30 Merge branch 'master' into release 2015-12-31 20:27:26 -06:00
PabstMirror
7258a0084a Merge pull request #2995 from acemod/repairThreshholdToolkit 
Fix PostRepairDamage and toolkit consumtion setting
 2015-12-14 19:30:19 -06:00
PabstMirror
f2bcd66784 Toolkit also consumed on fullRepair 2015-12-14 19:28:31 -06:00
PabstMirror
ee0812ad15 RHS Compat - Combine all ERA Hitpoints 
Put all ERA hitpoints (up to 46 of them) onto a single point
and put that point on the main interaction point
 2015-12-10 20:57:23 -06:00
PabstMirror
e964b2c135 Fix PostRepairDamage and toolkit consumtion setting 
Fix #2982
 2015-12-08 20:31:40 -06:00
PabstMirror
cae9f436f6 Merge branch 'release' 2015-12-08 15:14:33 -06:00
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
commy2
411a8d58f3 fix more setVariable and getVariable capitalization 2015-11-30 17:53:57 +01:00
commy2
5a1aae6028 manual merge 2015-11-30 17:44:15 +01:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
commy2
a8228f60c2 fix configFile capitalization 2015-11-30 17:23:02 +01:00
commy2
2b05f6f451 fix isNil capitalization 2015-11-30 17:22:16 +01:00
commy2
5e41643cff fix pushBack capitalization 2015-11-30 17:21:28 +01:00
commy2
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +01: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
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
Glowbal
4d10f2a72d Merge pull request #2182 from jonpas/repairClean 
Repair Cleanup
 2015-08-17 11:31:57 +02:00
jonpas
dcf074ed5a Changed Optional parameter comment to default value 2015-08-16 23:05:26 +02:00
PabstMirror
359ee1d23b #2180 - Fix QGVAR(fullRepairLocation) switch statement 2015-08-16 15:31:20 -05:00
jonpas
fb73d3a436 Fixed dependencies 2015-08-16 22:17:04 +02:00
jonpas
b2824c82bb Removed redundant function 2015-08-16 21:54:04 +02:00
jonpas
fda0850ad7 Condensed duplicated function, alphabetized PREPs 2015-08-16 21:39:42 +02:00
jonpas
161a75adc7 Added missing arguments in header, replaced QOUTE(DFUNC()) with QFUNC() 2015-08-16 20:34:02 +02:00
jonpas
701c98e0da Cleaned up repair function headers and some code 2015-08-16 20:14:54 +02:00
jokoho48
8a5e572baf Fix Model Warning Unsupported UVSet 2015-08-16 19:52:28 +02:00
jonpas
85cc662fa4 ACE_Repair capitalization 2/2 2015-08-16 16:46:32 +02:00
jonpas
68359974f1 ACE_Repair capitalization 1/2 2015-08-16 16:46:17 +02:00
jonpas
b7282e476c Used macros, getVariable capitalization, removed start of file newlines, separated CfgActions 2015-08-16 16:45:46 +02:00
Glowbal
9f3af45a8f Fixed repair items not registered as loadable 2015-08-16 16:16:04 +02:00
Glowbal
fe9751f725 Added category to settings 
Fixed client setting attribute spelling mistake
 2015-08-15 16:00:37 +02:00
Glowbal
d3aa6a7f6b Added missing assign modules 2015-08-15 15:49:41 +02:00
PabstMirror
2be74dfdca Privates 2015-08-14 15:14:36 -05:00
PabstMirror
066a78d9aa Fix var 2015-08-14 14:36:54 -05:00
Glowbal
83f46be990 Fixes and improvements for the repair module 
1. Added full repair,
2. Added missing settings to modules and settings framework,
3. added assign engineer module.
4. Fixed animation bug
 2015-08-14 20:49:51 +02:00
Glowbal
0080335617 Added config attributes for cargo on wheel and tracks 2015-08-11 23:21:44 +02:00
Glowbal
aadddaa2c5 Added wheel as initial cargo when cargo module is enabled 2015-08-11 23:20:25 +02:00
Glowbal
c7b7418ae0 Removed "can only remove damaged wheels" 2015-08-11 21:42:20 +02:00
Glowbal
b45aa51d47 hacked approach for repair tracks. 
Could probably better go with config entries, but this seems to be a very good value for 90% of the vanilla tracked vehicles. It's also still easily accessible and on an acceptable place for the remaining vehicles.
 2015-08-11 21:35:13 +02:00
jokoho48
5db5e34edf Fix Git Shit 2015-08-09 23:50:02 +02:00
jokoho48
a3fd072328 Make New Model 2015-08-09 22:44:39 +02:00
Glowbal
e4abf7c8cc added spare wheel to config 2015-08-09 18:26:49 +02:00
Glowbal
ed6a53a402 Attempt at repairing tracks. Improved repair wheel actions 2015-08-09 18:08:53 +02:00
Glowbal
872d026cd0 All repair actions are now functional 2015-08-09 17:23:32 +02:00
Glowbal
9adbb07367 Moved replace and repair wheel actions into the repair action framework 2015-08-09 15:53:52 +02:00
PabstMirror
ec97cd2edd Fix wheel texture 2015-08-09 01:58:49 -05:00
PabstMirror
4b603ff46f Localization, params 2015-08-09 01:54:44 -05:00
Glowbal
e9d51aa57b Updated repair config 2015-07-05 10:31:12 +02:00
Glowbal
071a673f28 Implemented repair action framework 
copied across treatment framework from medical and adjusted it to suit the repair actions
 2015-07-03 23:14:23 +02:00
commy2
0658620181 disable vanilla repair near trucks 2015-04-25 10:17:18 +02:00
commy2
6d92a0fe88 abort if stuff changes 2015-04-22 21:31:42 +02:00
commy2
f72e171247 work on repairing vehicles 2015-04-22 21:01:22 +02:00
commy2
78470d804a insert icon for repair module 2015-04-21 18:34:08 +02:00
commy2
9e3d9f23a5 add module options 2015-04-21 13:17:09 +02:00
commy2
61583ef35f localization 2015-03-29 13:54:50 +02:00
commy2
54c9cadf38 replace wheel logic 2015-03-29 11:01:23 +02:00
commy2
f231b2b14c removing wheels logic, carryable wheels 2015-03-29 03:35:55 +02:00