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
9,608 Commits 73 Branches 88 Tags 752 MiB
d79cbe0844
Commit Graph

969 Commits

Author SHA1 Message Date
PabstMirror
39edd205f0 Merge pull request #2942 from acemod/CzechTables 
Czech Translations - Update
 2015-12-07 09:32:00 -06: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
commy2
e418cfcf11 Merge pull request #2935 from acemod/fixbinoculars2 
Fix binocular related bugs
 2015-12-04 21:27:53 +01:00
commy2
5d43fa93c6 fix FUNC(binocularMagazine), fix #2916, fix #2917, fix #2918, fix #2922, fix #2928, fix #2933 2015-12-04 19:37:37 +01:00
PabstMirror
91ace4fc9b Fix whitelist string -> array error in checkPbo 
Fix #2913
Use splitString instead of call compile to convert string into an array
 2015-12-02 23:58:41 -06:00
PabstMirror
c928a0d6cb Remove Sleep/WaitUntil from checkPBO 
Fix #2910
 2015-12-01 22:50:28 -06:00
commy2
861262e41c revert false captitalization change 2015-11-30 17:56:25 +01: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
e422388484 fix waitUntil capitalization 2015-11-30 17:28:01 +01:00
commy2
a9ebcf8543 fix setVariable and getVariable capitalization 2015-11-30 17:27:09 +01:00
commy2
b3950bd7f0 fix forEach capitalization 2015-11-30 17:23:48 +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
d9b90258bc fix typeOf capitalization 2015-11-30 17:19:57 +01:00
commy2
34d351c652 fix exitWith capitalization 2015-11-30 17:14:05 +01:00
commy2
0b84bb514b fix Cfg capitalization 2015-11-30 17:09:26 +01:00
commy2
dcf0a68b80 Revert "fix Cfg capitalization" 
This reverts commit 43bda9c462.
 2015-11-30 17:00:32 +01:00
commy2
43bda9c462 fix Cfg capitalization 2015-11-30 16:52:20 +01: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
PabstMirror
ca0cfc9bbf Merge pull request #2861 from acemod/repairRebass 
Repair Overhaul
 2015-11-25 17:00:32 -06:00
PabstMirror
0b9044e3c7 Merge pull request #2753 from acemod/showHudSetter 
Showhud setter
 2015-11-25 11:16:21 -06:00
PabstMirror
ac6390c0b3 Add array info to header 2015-11-25 11:07:56 -06:00
SilentSpike
c731d83642 Merge pull request #2848 from acemod/fixForEachDeleteAt 
fix Issue with forEach Loops and deleteAt Index
 2015-11-25 14:00:37 +00:00
PabstMirror
36bf2d9cb5 Merge pull request #2803 from BaerMitUmlaut/remove-team-synching 
Remove manual team synching
 2015-11-24 21:37:50 -06: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
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
Thomas Kooi
4a19fcc5a5 Merge pull request #2771 from BaerMitUmlaut/inWater-deprecation 
inWater -> isUnderwater
 2015-11-20 22:28:43 +01:00
PabstMirror
69b53af1d3 1.54 - Replace typeName with isEqualType 2015-11-20 11:40:31 -06:00
SilentSpike
d1dff4a24a Merge branch 'master' into fixForEachDeleteAt 
# Conflicts:
#	addons/common/XEH_postInit.sqf
 2015-11-18 13:27:04 +00:00
SilentSpike
49d4f233d9 Revert commit a718c82780 2015-11-18 13:19:12 +00:00
PabstMirror
5cbfe4f2a5 local -> private 2015-11-17 14:02:20 -06:00
PabstMirror
896615beb1 Merge pull request #2826 from acemod/settingsParamsArray 
Read settings from paramsArray (params in description.ext)
 2015-11-17 14:01:16 -06:00
PabstMirror
5823749f0c Merge branch 'master' into settingsErrorChecking 2015-11-17 14:00:22 -06:00
PabstMirror
6d04156f69 local -> private 2015-11-17 13:56:55 -06:00
commy2
a57d1bca75 replace local keyword with private 2015-11-17 17:43:07 +01:00
SilentSpike
a718c82780 Implement nice index deletion iteration solution 
Previously when iterating over an array and modifying the same array via deletion of the current index, incorrect means was used to account for the change in index resulting in any further deletions being applied to the wrong elements.

This solution does not require duplication of the array or the use of external variables to track the number of deleted elements. We simply lower the `_forEachIndex` by 1 whenever an element is removed.
 2015-11-17 16:02:56 +00:00
jokoho48
561f6126dc fix missing bracket 2015-11-17 13:34:34 +01:00
jokoho48
f3c5c64390 fix Issue with forEach Loops and deleteAt Index 2015-11-17 04:31:17 +01:00
PabstMirror
5b16638ae5 Always force param settings 2015-11-08 11:22:41 -06:00
PabstMirror
826b4fd20b Cleanup 2015-11-06 20:53:05 -06:00
PabstMirror
e0506f29bc Read settings from paramsArray (params in description.ext) 
for now just limited to SCALAR/BOOL
 2015-11-06 20:46:06 -06:00
PabstMirror
c91789f3c4 Merge remote-tracking branch 'refs/remotes/origin/master' into settingsErrorChecking 2015-11-06 20:30:12 -06:00
PabstMirror
a3443cae43 Merge pull request #2780 from acemod/fixTimeInComments 
Changed ACE_time back to time in comments where appropriate
 2015-11-04 13:04:05 -06:00
PabstMirror
cfba7c01e8 Merge branch 'master' into settingsErrorChecking 
Conflicts:
	addons/map_gestures/stringtable.xml
 2015-11-03 12:09:36 -06:00
Joko
bd97c1ee96 fix Docu in waitUntilAndExecute 2015-11-02 12:05:43 +01:00
BaerMitUmlaut
8f473b4a27 Removed all assignTeam occurrences 2015-10-30 16:50:13 +01:00
commy2
049d40b96e change description in function header 2015-10-28 19:02:54 +01:00
commy2
a0bfcdd04c Revert "rename hasHatch to canTurnOut, change description in function header" 
This reverts commit 932f09ce60.
 2015-10-28 19:01:47 +01:00
commy2
932f09ce60 rename hasHatch to canTurnOut, change description in function header 2015-10-28 18:57:47 +01:00
commy2
643f4d36dc add FUNC(hasHatch) 2015-10-28 08:01:25 +01:00
VKing
069169cc72 Changed ACE_time back to time in comments where appropriate 2015-10-21 22:52:21 +02:00
BaerMitUmlaut
c227f05f8a Deprecated isWater 2015-10-19 23:28:50 +02:00
PabstMirror
64de91ed06 Add warning for duplicate setting modules. 2015-10-18 23:34:11 -05:00
PabstMirror
16180686d2 PV GVAR(settings) after modules, add error debug 2015-10-18 18:49:03 -05:00
Glowbal
76efdbcc1c Merge pull request #2257 from jonpas/parseList 
Parse List Common Function
 2015-10-18 12:14:18 +02:00
PabstMirror
fa7299ba1b Add array info to header 2015-10-16 08:28:54 -05:00
PabstMirror
bec884e581 showHud handler 2015-10-15 22:33:05 -05:00
PabstMirror
616bc9f8a0 local-private waitAndXX PFEH 2015-10-04 11:38:31 -05:00
PabstMirror
f3e61e2136 Merge branch 'master' into commonCleanupX 2015-10-04 11:31:05 -05:00
commy2
d9595b6176 fix fnc_binocularMagazine on remote and dead units 2015-10-04 12:10:08 +02:00
commy2
42ce11cfee Merge pull request #2679 from acemod/340missingmags 
fix missing magazines after certain scenarios
 2015-10-04 11:46:36 +02:00
commy2
040a63bd8f Merge pull request #2254 from acemod/waitUntilAndExecute 
Add WaitUntilAndExecute Function
 2015-10-04 11:45:54 +02:00
commy2
a2b6166aa0 optimization waitUntilAndExecute, add comments 2015-10-04 11:43:13 +02:00
PabstMirror
59da3e1c35 Optimize PFEH Funcs 2015-10-03 23:05:46 -05:00
PabstMirror
c75d219b65 Cleanup Undefined Functions 2015-10-03 21:34:46 -05:00
commy2
38422e6586 fix missing magazines after certain scenarios 2015-10-04 01:26:38 +02:00
commy2
1fdedb5785 delay scroll wheel init 2015-09-30 19:29:17 +02:00
commy2
9f3615ea06 change function header of removeEventhandler and waitAndExecute to public: yes 2015-09-30 00:14:21 +02:00
PabstMirror
6e24d2868c Fix playerChanged event 2015-09-28 22:41:45 -05:00
commy2
bc8cefa5e7 manual merge 2015-09-28 21:06:40 +02:00
commy2
34793ce044 Merge pull request #2635 from acemod/340interactcleanup 
Code Cleanup Interaction
 2015-09-28 21:04:28 +02:00
jonpas
4521df0a57 Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter 2015-09-28 16:17:12 +02:00
jonpas
db2572acfd Merge branch 'master' into parseList 
Conflicts:
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
 2015-09-28 16:06:32 +02:00
commy2
9189148b3f more interaction cleanup 2015-09-28 15:37:18 +02:00
commy2
4b536425b1 Code Cleanup Interaction 2015-09-28 14:36:51 +02:00
commy2
a078d73230 Code Cleanup WeaponSelect 2015-09-27 08:51:42 +02:00
commy2
dc7d24a3fd fix fixFloating resetting reflector hitpoints, close #2279 2015-09-26 14:38:50 +02:00
commy2
2fe142032e rework modifier key, cleanup sandbags, tripod, ladder, fix #2590 2015-09-26 03:16:55 +02:00
jokoho48
4ad16ed938 fix that waitUntilAndExecute have a return 2015-09-25 13:29:39 +02:00
jokoho48
998fbcc403 Merge remote-tracking branch 'remotes/acemod/master' into waitUntilAndExecute 
Conflicts:
	addons/common/XEH_postInit.sqf
 2015-09-25 13:19:19 +02:00
commy2
43cdfaecc0 Merge branch 'master' of https://github.com/acemod/ACE3 2015-09-25 11:15:46 +02:00
commy2
412685e0ff fix some code was commented out in loadPersonLocal and unloadPersonLocal 2015-09-25 11:15:25 +02:00
PabstMirror
079d88ded7 Merge pull request #2509 from acemod/miscFixNilFunctions 
Fix some nil functions
 2015-09-21 20:36:09 -05:00
commy2
24f0df55a2 Merge pull request #2559 from acemod/340disableuserinputcleanup 
Use CBA PFH in disableUserInput
 2015-09-22 00:52:58 +02:00
jonpas
2e3014daa3 Merge branch 'master' into parseList 
Conflicts:
	addons/common/functions/fnc_assignObjectsInList.sqf
 2015-09-21 22:46:01 +02:00
commy2
23e3db9cc0 use CBA pfh in disableUserInput and fix key input weirdness 2015-09-21 22:42:31 +02:00
commy2
f134a77e98 add and use deprecated macro 2015-09-21 22:09:54 +02:00
PabstMirror
d3c2420381 Merge branch 'master' into miscFixNilFunctions 
Conflicts:
	addons/common/functions/fnc_doAnimation.sqf
 2015-09-21 15:08:43 -05:00
commy2
f8676afca4 use correct macro for rpt writing 2015-09-21 21:56:18 +02:00
commy2
441efcd65f change version number in deprecated log 2015-09-21 21:48:18 +02:00
commy2
af309b937b add depracted warnings 2015-09-21 21:25:18 +02:00
commy2
5a5242f1c9 more common code cleanup 2015-09-21 19:19:49 +02:00
commy2
8503d15c9b more common code cleanup 2015-09-21 18:37:19 +02:00
commy2
1a4ebdac51 more common code cleanup 2015-09-21 17:32:21 +02:00
commy2
13b487e13b fix missing ; 2015-09-21 17:13:28 +02:00
commy2
b5b5c761c4 fix missing '' in info log macro 2015-09-21 17:09:10 +02:00
commy2
3037181fc2 more common code cleanup 2015-09-21 17:00:53 +02:00
commy2
df3211cc42 more common code cleanup 2015-09-21 14:20:53 +02:00
commy2
b0f9eab1f7 more common code cleanup 2015-09-21 13:53:12 +02:00
commy2
5adca6616d Merge branch '323cleanuphitpoints' into commoncleanup10 2015-09-21 13:24:12 +02:00
commy2
9fa6eb0651 more common code cleanup 2015-09-21 13:08:10 +02:00
commy2
ef099861a3 Merge pull request #2545 from acemod/commoncleanup9 
common code cleanup part 9
 2015-09-21 09:24:41 +02:00
commy2
d802cdfb23 more common code cleanup 2015-09-21 01:41:17 +02:00
commy2
d449e4bd83 more common code cleanup 2015-09-21 01:07:49 +02:00
Grzegorz
fe75aa55cf Add missing english string 2015-09-21 00:39:13 +02:00
commy2
5f7d8c0095 more common code cleanup 2015-09-21 00:34:04 +02:00
commy2
1679235b51 more common code cleanup 2015-09-21 00:28:25 +02:00
PabstMirror
345b1f0f98 Merge branch 'master' into miscFixNilFunctions 
Conflicts:
	addons/common/functions/fnc_execPersistentFnc.sqf
	addons/common/functions/fnc_execRemoteFnc.sqf
 2015-09-20 17:02:49 -05:00
commy2
1d4eb209a4 fix missing ; in dumpPerformanceCounters 2015-09-20 23:50:30 +02:00
commy2
ffc5a16384 more common code cleanup 2015-09-20 23:40:51 +02:00
commy2
a98a45e5d1 more common code cleanup 2015-09-20 23:18:51 +02:00
commy2
62ec00a251 more common code cleanup 2015-09-20 22:36:05 +02:00
commy2
5fd1938f25 more common code cleanup 2015-09-20 22:29:38 +02:00
commy2
493ce1b092 more common code cleanup 2015-09-20 22:16:51 +02:00
commy2
2348c25e1a more common code cleanup 2015-09-20 20:25:25 +02:00
PabstMirror
610fb0bb2c Fix Merge 2015-09-20 11:28:43 -05:00
PabstMirror
7687374fcf Merge branch 'master' into miscFixNilFunctions 
Conflicts:
	addons/common/functions/fnc_resetAllDefaults.sqf
 2015-09-20 11:25:33 -05:00
commy2
0a01bbdc76 more common code cleanup 2015-09-20 16:56:35 +02:00
commy2
e62683a0c4 more common code cleanup 2015-09-20 16:40:49 +02:00
commy2
e8ebe87450 more common code cleanup 2015-09-20 15:52:40 +02:00
commy2
4c4785c140 Merge pull request #2535 from acemod/commoncleanup7 
common code cleanup part 7
 2015-09-20 11:06:38 +02:00
commy2
d33a98c612 set variable public didn't work / didn't work on server and headless client 2015-09-20 11:02:15 +02:00
commy2
8c8b23ec18 Merge pull request #2530 from acemod/commoncleanup6 
common code cleanup part 6
 2015-09-20 10:44:31 +02:00
commy2
dfa6d71a64 more common code cleanup 2015-09-20 00:55:58 +02:00
commy2
73a9c1b5f8 more common code cleanup 2015-09-19 23:18:07 +02:00
commy2
6b96c7fd7c more common code cleanup 2015-09-19 22:27:23 +02:00
commy2
bfd5d13de8 more common code cleanup 2015-09-19 21:33:25 +02:00
bux578
450ee98004 Merge pull request #2515 from acemod/340fixinventoryeh 
fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513
 2015-09-19 21:04:48 +02:00
commy2
09f133b7f8 more common code cleanup 2015-09-19 20:55:35 +02:00
commy2
3ddaa5ed4a more common code cleanup 2015-09-19 20:34:07 +02:00
commy2
1636e3976d more common code cleanup 2015-09-19 20:17:38 +02:00
commy2
cbc7f961b2 more common code cleanup 2015-09-19 19:40:56 +02:00
commy2
20a5c79431 more common code cleanup 2015-09-19 19:26:45 +02:00
commy2
fb71e0594e lsd module, use global variable for color 2015-09-19 18:47:00 +02:00
commy2
e08c6c343e fix LSD module, cutback on global variable usage 2015-09-19 09:24:28 +02:00
commy2
1357d72f16 fix broken LSD module 2015-09-19 02:44:02 +02:00
commy2
25d1e46422 Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5 2015-09-19 01:50:37 +02:00
commy2
c7d636a533 more common code cleanup 2015-09-19 01:50:17 +02:00
jokoho48
e7ff41a03c Merge branch 'commoncleanup5' of https://github.com/acemod/ACE3 into commoncleanup5 2015-09-19 01:12:20 +02:00
jokoho48
f2070deee8 Change spawn while to CBA PFH 2015-09-19 01:12:03 +02:00
commy2
f8ecf1b8ab fnc_debug was broken 2015-09-19 00:30:36 +02:00
commy2
56f4cbb39e fix playerInventoryChanged eventhandler triggers when current weapon is changed fix #2513 2015-09-18 23:03:35 +02:00
commy2
85fd9d9d75 more common code cleanup 2015-09-18 21:46:21 +02:00
PabstMirror
5f0d73bab6 Cleanup more stuff 2015-09-18 14:24:20 -05:00
commy2
f3a175e9d6 remove obsolete private 2015-09-18 21:15:06 +02:00
commy2
5d0a7ed062 more common code cleanup 2015-09-18 21:12:40 +02:00
PabstMirror
c62ea5e406 Fix some nil functions 2015-09-18 13:47:19 -05:00
commy2
a53d158a89 Merge pull request #2501 from acemod/commoncleanup4 
common code cleanup part 4
 2015-09-18 19:54:04 +02:00
commy2
8704cd0321 fix additional bracket, formatting 2015-09-18 19:40:48 +02:00
commy2
a18f63d861 more common code cleanup 2015-09-18 19:12:38 +02:00
commy2
2674310e65 remove another deprecated function 2015-09-18 18:45:41 +02:00
esteldunedain
a621a0c693 Fixes to spanish translations 2015-09-18 13:36:57 -03:00
commy2
1fd2fcafb0 remove old, not working functions 2015-09-18 18:34:29 +02:00
commy2
1b96caedc0 more common code cleanup 2015-09-18 18:28:19 +02: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
commy2
a8ba96a01b more common code cleanup 2015-09-18 16:41:00 +02:00
commy2
39786420fa more common cleanup 2015-09-18 16:33:53 +02:00
commy2
c0fdd80ba4 formating 2015-09-18 16:00:58 +02:00
commy2
7efcfcc8a0 more common cleanup 2015-09-18 15:40:51 +02:00
commy2
f83dea6e01 formatting, remove an obsolete private 2015-09-18 14:32:58 +02:00
commy2
b0704e486f more common cleanup 2015-09-18 13:09:40 +02:00
commy2
3a027ff26f more common cleanup 2015-09-18 09:38:19 +02:00
commy2
e833c3fc42 more common cleanup 2015-09-18 08:47:14 +02:00
commy2
fc82018c49 more common cleanup 2015-09-18 08:23:18 +02:00
commy2
df2c7dce78 replace old pushback macro 2015-09-18 07:53:36 +02:00
commy2
475c193060 common code cleanup part 2 2015-09-18 07:42:10 +02:00
commy2
37c1dbd6f7 Merge pull request #2490 from acemod/commoncleanup 
cleanup common
 2015-09-17 23:59:10 +02:00
commy2
27ca3dc7bd Merge pull request #2471 from acemod/340noactionmenu 
optional pbo to hide select weapon actions
 2015-09-17 22:47:35 +02:00
commy2
ca43520b7f Merge pull request #2482 from acemod/340fixdaylaserlight 
fix daylasers being a virtual light source
 2015-09-17 22:47:13 +02:00
commy2
36a279012c cleanup common 2015-09-17 18:25:02 +02:00
commy2
864c0b4baf fix daylasers being a virtual light source, fix #2416 2015-09-17 14:17:48 +02:00
commy2
a09ca8fb80 tweak doAnimation switchMove to do no akward camera jumps whenever possible, fix #2474 2015-09-17 12:23:56 +02:00
commy2
014203413d handle optional pbos in checkFiles 2015-09-17 02:13:21 +02:00
Ivan Navarro Cabello
463e21dd91 330 2015-09-16 12:40:30 +02:00
PabstMirror
e254af9964 Fix missing ) 2015-09-15 19:26:37 -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
Alessandro Foresi
eed3fab483 Merge branch 'translation/15bn/alef' of github.com:alef/ACE3 into translation/15bn/alef 2015-09-12 09:50:26 +02:00
Alessandro Foresi
d5ec534f5b Add: IT cargo and common 2015-09-12 09:39:04 +02:00
jokoho48
b7e02da1cc remove if (!hasInterface) from PFH 
move ! in ()
 2015-09-11 16:58:26 +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
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
jokoho48
defbdf1b1a fix that HC throw a issue if PPEffect was used/applyed 2015-09-09 17:05:48 +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
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
jonpas
a2dd77ca70 Use splitString instead of BIS_fnc_splitString 2015-09-05 20:15:31 +02:00
Jonathan Pereira
7147891710 Added latest ACE3 PT-BR translations 2015-09-05 15:12:31 -03:00
jonpas
f22072a94d Use pushBack instead of array compiling 2015-09-05 19:57:35 +02:00
Alessandro Foresi
03b5ae1408 Add: IT cargo and common 2015-09-05 13:13:09 +02:00
[OMCB]kaban
9f416b796c Fix due ti review 2015-09-05 02:07:26 +03:00
jonpas
644460ed96 Merge branch 'master' into parseList 
Conflicts:
	addons/slideshow/functions/fnc_makeList.sqf
 2015-09-04 18:40:35 +02:00
PabstMirror
024dc3effe Cleanup 2015-09-03 00:16:48 -05:00