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 |
|
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 |
|
SzwedzikPL
|
3e19b33493
|
interaction with portable lamps
|
2015-08-22 20:00:26 +02:00 |
|
jonpas
|
b627e32a00
|
Added shared logistics categories
|
2015-08-19 16:54:44 +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
|
96ec435d0d
|
Added load in cargo containers
|
2015-08-14 22:01:14 +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 |
|