IngoKauffmann
01c20d4544
Minor formating and docu
2015-08-21 22:57:14 +02:00
IngoKauffmann
22576f938e
Added dropping and progress bars
2015-08-21 22:43:45 +02:00
jonpas
ccd0a7bd88
Merge branch 'master' into trackToTrackedVehicles
...
Conflicts:
addons/repair/stringtable.xml
2015-08-21 21:04:50 +02:00
PabstMirror
cc9eee5609
Typo
2015-08-21 09:42:23 -05:00
PabstMirror
e0f20350a2
Merge branch 'master' into virtualExplosivesPlace
2015-08-21 09:16:15 -05:00
SilentSpike
5112bd9bdf
Merge pull request #2163 from acemod/add-objects-to-curator
...
Add objects to all curators
2015-08-21 13:53:45 +01:00
Glowbal
bf8318530e
Merge pull request #2081 from acemod/close-med-menus-distance
...
Fixed #1893 - Menu closes when patient is more as 10 meters away
2015-08-21 14:20:41 +02:00
Glowbal
b3ee889cac
Merge pull request #2113 from MikeMatrix/codeCleanupSafemode
...
Code cleanup Safemode module
2015-08-21 14:20:08 +02:00
Glowbal
f0792233ae
Merge pull request #2173 from jokoho48/codeCleanupMagazineRepack
...
Code Cleanup Magazine Repack Module
2015-08-21 14:09:55 +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
Glowbal
26c172ff11
Merge pull request #2066 from acemod/fixDisableUserInput
...
Fix and enhancement of two common functions
2015-08-21 14:05:47 +02:00
Glowbal
20918f2c70
Merge pull request #2183 from acemod/treatmentWhileDeployed
...
Fix treatment when weapon deployed
2015-08-21 14:04:51 +02:00
Glowbal
969d675f90
Merge pull request #2217 from SzwedzikPL/cargo_bodybag_concertina
...
Cargo support for bodybag and concertina
2015-08-21 09:40:33 +02:00
PabstMirror
51a8cb7974
Only force Animation for FFV Cargo Seats
2015-08-20 23:58:06 -05:00
IngoKauffmann
f44060c6a0
Cleanup and improvements
2015-08-20 22:10:26 +02:00
SzwedzikPL
a8c11a249d
cargo sup for bodybag and concertina
2015-08-20 21:41:28 +02:00
IngoKauffmann
9162789579
Manny things
...
Added dummy objects
Added carrying
Added dropping
Added storing
Added more progress bars
...
2015-08-20 19:51:22 +02:00
SilentSpike
5b8708a179
Prevent CBA keybindings in zeus interface
...
Checks if the key pressed matches the zeus menu keybind and only fires the code to handle CBA keybinds if true. Should fix the majority of weirdness with keybinds in zeus. However, not perfect as shared keybinds with different modifiers will still fire and it's really an un-ideal workaround.
2015-08-20 18:17:37 +01:00
Glowbal
60ef673896
Merge pull request #2198 from jonpas/logistics
...
Added Logistics Categories
2015-08-20 18:43:55 +02:00
PabstMirror
645e8a63ef
Captive FFV Lock Animation
2015-08-20 04:20:46 -05:00
IngoKauffmann
dd1917464d
Preliminary carrying and dropping of carried ammo
...
Could not use ace_dragging since it block interact menu
2015-08-20 01:20:31 +02:00
SilentSpike
33ef60266b
Fix medical CPR code and log message
...
Performing CPR would never succeed when the patient was in revive state because the code was accidentally using `exitWith` instead of `then`. The log message string was also incorrect.
2015-08-19 23:30:13 +01:00
PabstMirror
4c14dc7684
#2208 - Use ACE Message Display instead of sideChat
2015-08-19 17:25:45 -05:00
IngoKauffmann
a37608b9b1
Added generic dummy
2015-08-20 00:03:16 +02:00
Cyruz143
994cddebc3
Readding scopes as not natively covered
2015-08-19 20:44:53 +01:00
Cyruz143
4fd663aa29
Removing code thats in CUP natively
2015-08-19 20:37:32 +01:00
nsgundy
3aab62fa7c
Return true / false if event was handled so that CBA keybinding doesn't have a reason to complain.
...
Converted tabs to spaces
2015-08-19 15:32:46 -03:00
IngoKauffmann
bdc5e54f55
Fixed turret locality and driver empty magazine issues
2015-08-19 17:33:32 +02:00
jonpas
d71c43b91c
Fixed unknown char
2015-08-19 17:12:39 +02:00
jonpas
9fd155f3ec
Integrated ASDG JR Optional
2015-08-19 17:11:15 +02:00
jonpas
b627e32a00
Added shared logistics categories
2015-08-19 16:54:44 +02:00
Glowbal
4acdfcbd24
Merge pull request #2193 from jokoho48/ModelFix
...
Model Fixes
2015-08-19 12:02:28 +02:00
Glowbal
885ae7cdc3
Merge pull request #2203 from jonpas/repairCargoLoaded
...
Replaced check for cargo function by check for ace_cargo in Repair
2015-08-19 11:39:10 +02:00
jonpas
683e727cb4
Readded items
2015-08-19 04:22:39 +02:00
jonpas
5a0a3a53e0
Uppercased 2 readme files
2015-08-19 04:19:00 +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
PabstMirror
4e3bbfac16
Clean old updateMapToolMarkers calls
2015-08-18 16:57:56 -05:00
jonpas
4c86db9505
Added AddCargoItem event and function to add an item by classname
2015-08-18 23:51:30 +02:00
IngoKauffmann
f852eb5f4b
Moved compatibility stuff
2015-08-18 23:48:25 +02:00
jonpas
ffb765bf7a
Changed to AddCargoItem event
2015-08-18 23:43:34 +02:00
jonpas
3bcebf9033
Moved spare parts adding to init, Added module option to add spare parts or not, Added module to add specific spare part and amount of it to specific vehicle(s)
2015-08-18 23:41:25 +02:00
IngoKauffmann
cdd0c4c013
Next few things
...
Clean up
Removed MP issues
Added macros for reused code
Added death handling
Added unconscious handling
Added fueling restart
2015-08-18 23:18:32 +02:00
IngoKauffmann
8b9be1923c
Added support for third subturret of main turret
2015-08-18 19:06:41 +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
IngoKauffmann
cf9c49f13c
Attempt to fix turret locality issues
2015-08-18 18:09:37 +02:00
IngoKauffmann
3072bd9d22
Fixed rearm sucess hint and collision with dummy
2015-08-18 17:38:50 +02:00
IngoKauffmann
463309db2d
Small cleanup
2015-08-18 16:20:11 +02:00
