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,383 Commits 73 Branches 88 Tags 752 MiB
8bcf24a9c9
Commit Graph

128 Commits

Author SHA1 Message Date
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
jonpas
98dd60c6ca Alphabetized PREPs, removed newlines and repair references 2015-08-16 22:21:39 +02:00
PabstMirror
30828b83d2 Stringtable fixes 2015-08-15 12:21:49 -05:00
Glowbal
317c73a80e Added Land_PaperBox_closed_F 
fixed initOBject
 2015-08-15 10:22:44 +02:00
Glowbal
03413ef6b6 Merge branch 'cargo' of github.com:acemod/ACE3 into cargo 
Conflicts:
	addons/cargo/functions/fnc_initVehicle.sqf
 2015-08-15 09:51:15 +02:00
Glowbal
d8084e20d7 Added cargo settings and settings module. 2015-08-15 09:50:00 +02:00
PabstMirror
21400b0174 UBC, privates, LSTRING 2015-08-14 15:46:51 -05:00
Glowbal
2062f5dcb6 fixed incorrect variable name 2015-08-14 22:07:49 +02:00
Glowbal
96ec435d0d Added load in cargo containers 2015-08-14 22:01:14 +02:00
Glowbal
55ad706761 fixed car check - invalid variable name 2015-08-14 22:00:55 +02:00
Joko
ec5a1f038a fix Typo issue 2015-08-14 18:42:22 +02:00
jokoho48
c4ed18f39f Fix findNearestVehicle dont return BOOL 
Fix that findNearestVehicle dont return any time the nearest car
Small Performance Improvement in getSizeItem/handleDestroyed/startUnload
Enhance Some legibility
 2015-08-14 18:07:31 +02:00
Glowbal
abc732ac35 Added support for cargo configuration on vehicle spawn 2015-08-11 23:18:01 +02:00
Glowbal
ffa476bee2 Improved action display text 2015-08-10 23:16:58 +02:00
Glowbal
c016d01414 Initial load in cargo module 2015-08-10 23:07:47 +02:00
commy2
67479b733e add PBO to load things into vehicles 2015-03-29 15:20:39 +02:00