365 Commits

Author	SHA1	Message	Date
PabstMirror	2a8e758390	Allow loading fuel canister (#5493) ... Fix #5438 - Also block cargo action when being used	2017-09-16 11:36:42 +02:00
PabstMirror	d4cd0f2286	Add support for orange drone (UAV_06) (#5494) ... * Add support for orange drone (UAV_06) - Remove cargo from orange drones (and apex heli drone) - Allow battery replacement on orange drone * ops	2017-09-10 15:38:10 -05:00
Broström.A | Evul	a50cf4e300	Added drag and Cargo ability to Orange crates (#5421) ... * Added load and carry ability to some new upcoming crates * Added missing crate to dragging * Added missing ones for cargo.	2017-09-07 19:45:37 +02:00
PabstMirror	a67815d072	Disable damage on cars loaded as cargo (#5402)	2017-08-22 13:27:11 -05:00
jonpas	6aad1c8af6	Merge branch 'release'	2017-07-18 23:00:48 +02:00
Pawel W	0538647604	Add missing polish translations (#5370)	2017-07-16 23:14:59 -05:00
jonpas	fa3743ca54	Correct new Chinese stringtable identifiers (#5334)	2017-07-10 16:47:26 +02:00
PabstMirror	e9fb0e9b20	Add cargo space to huron containers (#5315)	2017-07-10 16:46:49 +02:00
PabstMirror	e4ac748f6f	Handle ace_cargo_canLoad set to scalar (#5306)	2017-07-10 16:46:14 +02:00
GodofMonkeys	0ccbeb25e9	Add Chinese Traditional & Simplified Localization (#5295) ... Add Chinese Traditional & Simplified Localization	2017-07-10 16:45:22 +02:00
classic	483b41b717	Jpn translate 73bd37 (#5277) ... * Update the Jpn translation for cargo Update the Japanese translation for cargo * Add the Jpn translation for hellfire Add the Japanese translation for hellfire * Add the Jpn translation for nlaw Add the Japanese translation for nlaw * Add the Jpn translation for rearm Add the Japanese translation for rearm * Update the Jpn translation for refuel Update the Japanese translation for refuel * Update the Jpn translation for repair Update the Japanese translation for repair * Update the Jpn translation for zeus Update the Japanese translation for zeus	2017-07-10 16:43:03 +02:00
PabstMirror	af0f7f36d8	Make array of cargo holders dynamic (#5274)	2017-07-10 16:42:41 +02:00
PabstMirror	bb8d5cadd7	Cleanup heli pod actions (#5271) ... Close #4783 - Make taru pods non loadable - Make taru pods non draggable - Increase interaction range for huron pods	2017-07-10 16:42:28 +02:00
PabstMirror	5c713fcc2a	Add cargo space to huron containers (#5315)	2017-07-08 14:01:15 -05:00
jonpas	5cf7569711	Correct new Chinese stringtable identifiers (#5334)	2017-07-08 09:48:39 -05:00
PabstMirror	fde984ad7b	Handle ace_cargo_canLoad set to scalar (#5306)	2017-06-23 11:31:19 -05:00
GodofMonkeys	60131ee589	Add Chinese Traditional & Simplified Localization (#5295) ... Add Chinese Traditional & Simplified Localization	2017-06-22 16:46:00 +02:00
PabstMirror	feee7f5e1e	Make array of cargo holders dynamic (#5274)	2017-06-14 15:36:23 +02:00
PabstMirror	183eaaecdc	Cleanup heli pod actions (#5271) ... Close #4783 - Make taru pods non loadable - Make taru pods non draggable - Increase interaction range for huron pods	2017-06-14 15:35:17 +02:00
classic	a78c42f49e	Jpn translate 73bd37 (#5277) ... * Update the Jpn translation for cargo Update the Japanese translation for cargo * Add the Jpn translation for hellfire Add the Japanese translation for hellfire * Add the Jpn translation for nlaw Add the Japanese translation for nlaw * Add the Jpn translation for rearm Add the Japanese translation for rearm * Update the Jpn translation for refuel Update the Japanese translation for refuel * Update the Jpn translation for repair Update the Japanese translation for repair * Update the Jpn translation for zeus Update the Japanese translation for zeus	2017-06-13 22:00:38 -05:00
PabstMirror	847832c118	Fix some event names on wiki (#5254) ... * Fix some event names on wiki * Switch callable events to functions	2017-06-08 14:31:27 -05:00
Phyma	ffaa195fe5	Conform function headers to coding guidelines (#5255) ... * Fixed headers to work with silentspike python script * Fixed rest of the files * Fixed ace-team	2017-06-08 15:31:51 +02:00
Andrea Verano	0affa14a1b	Italian Translation Update (#5243) ... Added Italian translation for: -cargo -hellfire -nlaw -quickmount -refuel -zeus	2017-06-03 22:27:51 -05:00
SilentSpike	fea2326488	Add cargo eden attributes (#4780) ... - Add a ace_cargo_space attribute to vehicles to alter how much cargo they can carry. - Add an ace_cargo_size attribute to objects to alter how much cargo space they consume. - Add two public functions `fnc_setSize.sqf` and `fnc_setSpace.sqf` to update the cargo size/space respectively of any given object. - Deprecate cargo makeLoadable module and public function. - Added some macros to get the space/size of a config, making code more readable in places.	2017-05-31 23:54:57 +01:00
PabstMirror	00b91bed45	Minor fixes, cleanup, add lint ignore directives (#5176) ... - Fix bug in getNumberMagazinesIn (func not used) - Fix bug in seekerFindLaserSpot (func not used yet) - Everything else is just cleanup	2017-05-31 22:09:36 +01:00
pokertour	38f691034e	French translation missing (#5217) ... * French translation for the two last entries * French translation for the last entrie * French Translation for the first entrie * correct the spelling error	2017-05-31 20:53:41 +02:00
Dystopian	9f291c86d8	Cargo load menu overhaul (#4871) ... * Add submenu with vehicles to cargo load menu * replace private ARRAY with keyword * fix ace function macro using * filter vehicles without cargo * add Load condition, clean params, fix param reusing * replace nearEntities with nearestObjects, add macro * optimize, del magic, replace count with forEach * del unused functions * del useless _this parameter	2017-05-31 17:02:24 +02:00
Andrea Verano	e3fd1612e2	Italian translation (Add & Fix) (#5193) ... Added Italian translation for: -advanced fatigue -advanced throwing -cook off -dogtags -gunbag -ui-scopes and much more... Fixed a lot of grammatical errors	2017-05-23 13:44:17 -05:00
classic	777d0e6fb0	Improve Japanese translation (#5133) ... * Add the Japanese translation for cargo Add the Japanese translation for cargo, fix to html tag and few improvement * fix the Japanese transltion Fix the Japanese translation for attach. it was used wrong html tag. * changed The Japanese translation Changed the Japanese translation of azimuth angle * fix The Japanese translation Fix the Japanese translation for chemlights. it was used wrong html tag. * fix The Japanese translation Fix the Japanese translation for laserpointer. it was used wrong html tag. * Fix the Japanese translation Fix the Japanese translation for medical_blood. it was used wrong translation. * Fix the Japanese translation Fix the Japanese translation for rearm. it was used wrong translation. * add The Japanese translation add The Japanese translation to new words * Improve The Japanese translation Improve, fix and change The Japanese translation * minor fix to Japanese translation minor fix to Japanese translation. see b1b07c5	2017-05-06 12:01:31 -05:00
Ozan Eğitmen	ea4a159cd2	Add Paradrop Time Coefficient Setting (#5116) ... * Add coef * Show cargo paradrop time in menu * Unary command, not a function call * If drop time is 0 don't show a progress bar * Add the setting to cargo's editor module * Swap values * Remove extra comma * Move unload message to paradrop event This way the message will show up on all paradrops, not just immidiate ones.	2017-05-05 14:02:59 -05:00
Dystopian	83d2183f61	Fix cargo loading to locked vehicle (#5049)	2017-04-01 00:33:36 -05:00
11RDP-LoupVert	33dd0b5707	French additions (Cargo) (#5040) ... Minor French text additions	2017-03-26 19:38:18 -05:00
jtj5283449	d4855a7ff3	Korean Translation v1.0 (#4794) ... * Add files via upload * Add files via upload * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation * Added Korean translation japanese translation caused error while translating process, had to remove some duplicated keys in stringtable.xml. * Fix encoding	2017-01-02 17:52:01 -06:00
PabstMirror	a3c50a6c76	Add dev macro to quickly recompile functions (#4699)	2016-11-23 13:35:25 -06:00
Daniel Jupp	3935299e3c	Fix cargo find nearest vehicle (#4592) ... * Inital Commit * read function call change added object to exclude to function call * Removed TODO comment	2016-11-12 17:52:17 -06:00
PabstMirror	5bf8b642f7	Add cargo configs for some planes (#4650)	2016-11-10 12:05:08 -06:00
commy2	05d30c5573	convert log macros to cba versions (#4282) ... * convert log macros to cba versions * Add changes to AB * remove obsolete macro	2016-10-02 12:55:31 +02:00
KoffeinFlummi	72899643bd	Merge branch 'master' into japanesestringtables	2016-09-27 20:54:17 +02:00
PabstMirror	11b6370e8f	Fix undefined var in paradrop (#4465)	2016-09-25 21:25:11 +02:00
commy2	7f07d4e4b8	fix broken parachutes, fix #4437 (#4462)	2016-09-25 09:45:55 +02:00
commy2	e7bc2e9d62	remove deprecated code for 3.8.0 (#4457) ... * remove deprecated scroll wheel event handler * remove deprecated ace hash functions * remove deprecated execNextFrame * remove deprecated insertionSort * remove deprecated getConfigType * remove deprecated binocularMagazine * remove deprecated wait(Until)AndExecute * remove old ass and deprecated alternative syntax setHitPointDamage * remove deprecated event handlers (#4459) * remove deprecated event handlers# * remove ACE_newEvents * Remove old ACE PlayerEventHandler wrappers	2016-09-24 22:31:10 +02:00
Grzegorz	a63dcb49d0	PL Translation 3.7.1 (#4395) ... * translate advanced fatigue * translate advanced throwing * translate cargo * translate chemlights * translate cookoff * translate explosives * translate fastroping * translate gforce * translate googles * translate grenades * translate gunbag * translate maptools * translate medical * translate medical_ai * translate minedetector * translate nametags * translate overheating * translate repair * translate tagging * translate ui * translate zeus	2016-09-18 22:00:13 +02:00
classicarma	78ee33b46f	translate cargo	2016-09-17 00:57:09 +09:00
commy2	bfb88efe9a	Fix script error in cargo drop function (#4369)	2016-09-10 21:21:09 +02:00
Glowbal	b489750d5b	Minor optimizations using private, params, and isEqualType (#4323) ... * Optimizations with private, params, and isEqualType * Fixed tab being used instead of space * Fixed tabs inserted by notepad++ * More usage of new private syntax and params - changed a few checks for an array being empty to `_arr isEqualTo []` rather than `count _arr == 0` - added more uses of `private` on the same line as the variable is declared - added more uses of params to assign variables passed as parameters - removed unnecessary parentheses - removed several unnecessary variable declarations with private array syntax * clean up and formatting	2016-09-04 16:44:22 +02:00
PabstMirror	d448ea8916	Improve interaction position for air units. (#4285) ... Fix #4233	2016-08-27 10:37:58 +02:00
commy2	9ef24d25ba	paradrop crates from helicopter or plane cargo (#2468)	2016-08-27 10:14:54 +02:00
Broström.A | Evul	0dfee34a56	Added additional cargo and dragging for crates (#4129) ... * Added Cargo and Dragging for `Land_WoodenBox_F` and `Land_WoodenCrate_01_F`.	2016-08-13 11:33:41 +02:00
[OMCB]kaban	8fc2cbd0ef	Russian Translations - Update (#4217)	2016-08-13 11:25:43 +02:00
PabstMirror	dc7ac4c42c	Fix static weapons not being loadable in cargo (#4205) ... - Fix #4165	2016-08-05 12:03:45 -05:00
esteldunedain	28c41e0518	Rename cargo events: ... - ace_cargoAddedByClass -> ace_cargoAdded - ace_addCargoByClass -> ace_addCargo	2016-06-24 12:12:19 -03:00
esteldunedain	18f09b9310	Rename events: ... - ace_addedHeartRateAdjustment -> ace_heartRateAdjustmentAdded - ace_cargoAddedByClass -> ace_cargoByClassAdded - ace_enteredCardiacArrest -> ace_cardiacArrestEntered - ace_itemAddedToTriageCard -> ace_triageCardItemAdded - ace_reload_linkedAmmo -> ace_reload_ammoLinked - ace_reload_returnedAmmo -> ace_reload_ammoReturned - ace_treatmentSuccess -> ace_treatmentSucceded - ace_common_engineOn -> ace_common_setEngine - ace_explosives_clientRequestOrientations -> ace_explosives_requestOrientations - ace_explosives_serverSendOrientations -> ace_explosives_sendOrientations - ace_interaction_lampTurnOff -> ace_interaction_setLampOff - ace_interaction_lampTurnOn -> ace_interaction_setLampOn - ace_overheating_spareBarrelsLoadCoolest -> ace_overheating_loadCoolestSpareBarrel - ace_overheating_spareBarrelsSendTemperatureHint -> ace_overheating_sendSpareBarrelTemperatureHint Close #3533	2016-06-24 10:45:13 -03: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	7c9dcf6bdb	Merge branch 'pr/3480' ... Conflicts: addons/advanced_ballistics/stringtable.xml addons/cargo/stringtable.xml addons/flashlights/stringtable.xml addons/hearing/stringtable.xml addons/interact_menu/stringtable.xml addons/interaction/stringtable.xml addons/inventory/stringtable.xml addons/main/stringtable.xml addons/map/stringtable.xml	2016-06-18 16:26:46 +02:00
jonpas	03e923aa68	Cleanup Function Headers titles	2016-06-18 11:50:41 +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
SilentSpike	9e4fd77745	Update common event names to meet new standard	2016-06-03 22:39:43 +01:00
PabstMirror	77baeda976	Merge branch 'master' into huehuehue	2016-06-03 00:01:13 -05:00
PabstMirror	d7f9c52c2f	Merge branch 'master' into cbaEventSystem	2016-06-02 19:29:30 -05: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
commy2	9d61dd6159	Merge pull request #3850 from acemod/fixCfgPatchesAuthor ... Fix CfgPatches author/ is not a value	2016-06-01 14:24:17 +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
PabstMirror	598c3dc181	Fix 1.60 UBC (slingloads)	2016-05-30 17:11:06 -05:00
jonpas	7a307393a4	Merge branch 'master' into useQuotedPathMacros	2016-05-30 21:14:17 +02:00
jonpas	30b15ee3d3	Fix quotes in cargo	2016-05-24 19:22:48 +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
ProfessorCZ	7d0fcde9fa	CZ Translate - Update ... 04/30/2016	2016-04-30 00:57:24 +02:00
jonpas	3389bc5e1b	Add cargo to Taru pods	2016-04-28 04:44:57 +02:00
jonpas	85b4366368	Use new QPATHTOF and QPATHTOEF macros	2016-04-08 20:34:50 +02:00
jonpas	d931eb4e15	Improve XEH adding in cargo	2016-04-03 14:17:16 +02:00
jonpas	357045a0ed	Merge pull request #3518 from ColdEvul/CargoAndInteractionCase ... Carry, drag and load metal and plastic cases	2016-04-03 11:43:11 +00:00
commy2	92af6ffe2e	add cargo space to csat attack heli (can transport 8 troops)	2016-03-31 01:03:40 +02:00
commy2	28468bec82	specify helicopter cargo spaces, fix #3591	2016-03-31 00:57:04 +02:00
ColdEvul	8b4892598a	added EventHandlers	2016-03-02 22:17:19 +01:00
ColdEvul	b91897de3b	Added comment	2016-03-02 16:41:45 +01:00
ColdEvul	e7ec87d284	Added carry and interaction for case.	2016-03-02 16:38:23 +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
NorXAengell	772c4cc100	Another batch of translations and corrections (Fr)	2016-03-01 02:27:19 +01:00
BlackWindowS	c61e7b5104	Tweaked & added translations ... Translation of almost every STR to French	2016-02-28 14:48:04 +01:00
NorXAengell	ea461446f9	Translation Fr	2016-02-26 19:24:53 +01:00
jonpas	8375694368	Merge pull request #3403 from acemod/fixCargoEventsParams ... Reimplement old parameter syntax for (Un)LoadCargo events	2016-02-25 16:01:57 +01:00
jonpas	b2b781957f	Reimplement old parameter syntax for (Un)LoadCargo events	2016-02-25 15:35:47 +01:00
esteldunedain	71707bc81a	Some spanish translations for 3.5.0	2016-02-25 10:54:19 -03:00
PabstMirror	a437326032	Merge pull request #3400 from acemod/fixLampUnload ... Fix lamp unloading	2016-02-23 17:07:31 -06:00
jonpas	60fba483fe	Fix #3334 replace Purista with Roboto in cargo menu	2016-02-23 22:30:15 +01:00
jonpas	168ec5344d	Fix #3363 lamp unloading bug, Correct cargo menu button classnames	2016-02-23 22:17:36 +01: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
bux578	55a6ef1937	Merge pull request #3367 from licht-im-Norden87/patch-43 ... Update German Stringtable	2016-02-22 08:26:23 +01:00
PabstMirror	8b932fd5a0	Fix some undefined functions / strings	2016-02-20 16:58:45 -06:00
licht-im-Norden87	b41efc39ff	cargo	2016-02-20 23:02:02 +01:00
ChairborneIT	0021bc08df	Added translation for most Italian stringtable entries	2016-02-20 21:39:05 +01:00
Thomas Kooi	27c6934ff2	Merge pull request #2230 from SzwedzikPL/interactions_lamps ... Interaction with portable lamps	2016-02-20 16:47:28 +01:00
PabstMirror	488d24bc01	Fix cargo loading on the big huron containers	2016-02-19 15:30:23 -06:00
PabstMirror	ed653456e5	Merge pull request #3338 from acemod/translations156merge ... Fix Merge Conflicts on More Italian Translations	2016-02-19 15:09:40 -06:00
PabstMirror	d2a3f35c80	Fix deleted czech strings from merge	2016-02-18 13:39:14 -06:00
bux	49f565f541	fix merging errors	2016-02-18 20:05:30 +01:00
PabstMirror	dccc1d33fd	Merge remote-tracking branch 'it/translation/15bn/alef' into translations156merge	2016-02-17 12:30:03 -06:00
licht-im-Norden87	b1990b1586	Update stringtable.xml	2016-02-10 17:08:48 +01:00
licht-im-Norden87	3583e95e1f	cargo	2016-02-10 17:07:05 +01:00
SzwedzikPL	388b00f58c	remove unnecessary code, aesthetic tweak	2016-02-10 01:38:14 +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	7b8be590b4	Merge branch 'acemod/master' into interactions_lamps	2016-02-05 01:43:06 +01:00
PabstMirror	35333cbe9d	Merge branch 'cargoCleanup'	2016-02-04 12:51:52 -06:00
Thomas Kooi	038befbce0	Merge pull request #3191 from acemod/cargoCleanup ... Cargo Cleanup, Add makeLoadable	2016-02-04 19:44:27 +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	7a7e0d689a	Improve underwater cargo unloading	2016-01-27 14:56:25 -06:00
PabstMirror	17a882fe4d	Add findUnloadPosition integration	2016-01-26 18:01:01 -06:00
PabstMirror	1a98726716	Add makeLoadable sync module	2016-01-21 22:12:54 -06:00
PabstMirror	3d4fc66bb1	Cargo Cleanup, Add makeLoadable	2016-01-19 14:51:58 -06:00
Alessandro Foresi	c16d97cad0	Merge branch 'master' into translation/15bn/alef	2016-01-03 12:23:27 +01:00
kaban	fd06472f4d	Russian Translations - Update	2015-12-10 20:32:16 +03: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
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	5a1aae6028	manual merge	2015-11-30 17:44:15 +01:00
commy2	b3950bd7f0	fix forEach capitalization	2015-11-30 17:23:48 +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	d9b90258bc	fix typeOf capitalization	2015-11-30 17:19:57 +01:00
bux578	35ecef454f	Merge pull request #2825 from gienkov/pl-translation ... pl translation	2015-11-29 07:35:04 +01:00
Thomas Kooi	ced94d73a7	Merge pull request #2797 from ColdEvul/RoadBarrierRoadCone ... [REMADE] RoadCone_F and its inhered RoadBarrier_F intractable	2015-11-28 20:51:39 +01:00
PabstMirror	5850f78c1f	Merge branch 'master' into isEqualTypeRepalcement	2015-11-27 21:08:21 -06:00
gienkov	b091b73e24	fixes	2015-11-27 21:54:04 +01:00
gienkov	3250245587	3.4.0 translations and fixes	2015-11-27 21:50:57 +01:00
Glowbal	67345b0178	Fix incorrect variable ... _items was the old variable name.	2015-11-20 23:28:52 +01:00
PabstMirror	69b53af1d3	1.54 - Replace typeName with isEqualType	2015-11-20 11:40:31 -06:00
PabstMirror	5823749f0c	Merge branch 'master' into settingsErrorChecking	2015-11-17 14:00:22 -06:00
Jonathan Pereira	6ebd76ff2f	Added PT-BR translations to Cargo	2015-11-14 12:24:01 -02:00
Thomas Kooi	d91ae9082e	Merge pull request #2628 from acemod/cargoClassnames ... Add support for virtual cargo	2015-11-10 08:38:17 +01:00
PabstMirror	cfba7c01e8	Merge branch 'master' into settingsErrorChecking ... Conflicts: addons/map_gestures/stringtable.xml	2015-11-03 12:09:36 -06:00
ColdEvul	b82350baa2	Made ``RoadCone_F` and its inhered `RoadBarrier_F`` dragable, carryable and storeable. ... I remade it and removed comments and unnecessary strings. I also removed the unworking one from the last version.	2015-10-28 21:33:00 +01:00
ColdEvul	6ac1d8361d	Fixed small UAV carrying allot of cargo.	2015-10-28 16:00:24 +01:00
PabstMirror	64de91ed06	Add warning for duplicate setting modules.	2015-10-18 23:34:11 -05:00
SzwedzikPL	98f6bb3589	Merge branch 'master' of https://github.com/acemod/ACE3 into interactions_lamps ... Conflicts: addons/cargo/CfgVehicles.hpp addons/interaction/CfgVehicles.hpp addons/interaction/XEH_preInit.sqf addons/interaction/stringtable.xml	2015-10-15 11:49:08 +02:00
PabstMirror	7062f60f0a	Fix UBC from #2726	2015-10-12 01:07:20 -05:00
PabstMirror	53f833b68c	#2702 - Cargo: Make "Supply Box" pallets heavy	2015-10-10 00:19:09 -05:00
PabstMirror	21f35dc7d0	#2664 - Disable loading into locked vehicles.	2015-10-03 19:42:40 -05:00
SilentSpike	f5e46bf089	Merge remote-tracking branch 'origin/master' into cargoClassnames	2015-09-27 17:41:38 +01:00
SilentSpike	f65f6e9b72	Add support for virtual cargo ... Allows cargo objects to be added via classname and reduces simulation/synchronization overhead. Objects become physical upon unloading and cannot be re-made virtual, only scripts can add such virtual objects. Also separates the player feedback from the loading/unloading code and adds a progress bar.	2015-09-27 17:34:37 +01:00
commy2	3211e6432e	Merge pull request #2614 from jonpas/loadCargoOptionalHint ... Optionalized Cargo Loaded Hint	2015-09-27 13:48:27 +02:00
jonpas	151903ace4	Expanded optional hint to addCargoItem and AddCargoByClass event	2015-09-27 00:31:23 +02:00
jonpas	30544dc757	Make cargo loaded hint optional, disable it when not loading manually	2015-09-26 23:16:05 +02:00
commy2	8affae9f7a	dont access cargo of destroyed vehicles, fix #2523	2015-09-26 18:16:38 +02:00
PabstMirror	45e44251b6	Merge branch 'release' ... Conflicts: addons/repair/stringtable.xml	2015-09-21 17:14:53 -05:00
PabstMirror	789f3843d5	#2488 - Fix cargo setVariable on server with InitPost	2015-09-20 10:05:34 -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
commy2	42a754a981	display text when loading / unloading cargo	2015-09-17 13:43:55 +02:00
commy2	b7715152e2	correct cargo capacities for quads, karts, boats and jets	2015-09-16 20:12:56 +02:00
commy2	f383e8701d	increase trucks cargo space	2015-09-16 19:27:32 +02:00
jokoho48	c1baf4f8f7	tweak Vales for B_Truck_01_Base and B_Truck_01_box_F	2015-09-16 12:45:08 +02:00
Ivan Navarro Cabello	463e21dd91	330	2015-09-16 12:40:30 +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	d5ec534f5b	Add: IT cargo and common	2015-09-12 09:39:04 +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
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
ProfessorCZ	a28e9d96c7	Czech Translations - Update	2015-09-07 17:40:14 +02:00
Jonathan Pereira	7147891710	Added latest ACE3 PT-BR translations	2015-09-05 15:12:31 -03: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
jonpas	0bbf4d4128	Prevent Cargo opening if vehicle is locked	2015-09-02 22:24:46 +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
PabstMirror	9c8e9732ed	Add canInteractWith checks for cargo	2015-08-26 16:26:08 -05:00
Michael Braun	9e10aa86d7	Standardize logging format through ACE_LOG macros	2015-08-26 15:32:54 +02:00
Glowbal	222e0183ed	Merge pull request #2202 from jonpas/cargoEvents ... Cargo Events	2015-08-26 08:36:31 +02:00
SzwedzikPL	074ae2c2da	fix conflict	2015-08-22 20:02:27 +02:00
SzwedzikPL	3e19b33493	interaction with portable lamps	2015-08-22 20:00:26 +02:00
jonpas	18f5a2ca94	Renamed cargo events	2015-08-22 16:45:50 +02:00
gienkov	cf585790db	fixes done	2015-08-22 11:41:15 +02:00
gienkov	f22531cc59	cargo translation	2015-08-21 23:50:54 +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
SzwedzikPL	a8c11a249d	cargo sup for bodybag and concertina	2015-08-20 21:41:28 +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	583682396f	Changed cargo initVehicle to event driven, Added listenable event cargo_itemAdded	2015-08-18 23:59:01 +02:00
jonpas	4c86db9505	Added AddCargoItem event and function to add an item by classname	2015-08-18 23:51:30 +02:00
jonpas	e110874800	Added cargo listenable and callable events	2015-08-18 18:48:21 +02:00
jonpas	16add9d376	Changed cargo_hideUnit for already existing hideObjectGlobal event	2015-08-18 18:19:18 +02:00
jonpas	7b89784aae	Removed semi-colons from return statements, command capitalization	2015-08-16 22:48:52 +02:00
jonpas	bbc715b2ee	Cleaned function headers	2015-08-16 22:41:35 +02:00