Commit Graph

35 Commits

Author SHA1 Message Date
Thomas Kooi
d91ae9082e Merge pull request #2628 from acemod/cargoClassnames
Add support for virtual cargo
2015-11-10 08:38:17 +01: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
commy2
42a754a981 display text when loading / unloading cargo 2015-09-17 13:43:55 +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
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
jonpas
18f5a2ca94 Renamed cargo events 2015-08-22 16:45:50 +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
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
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