Commit Graph

6868 Commits

Author SHA1 Message Date
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
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
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
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
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
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
fe9e4fee07 Fixed viewdistance limit not applied when Video Settings option is selected, Removed unnecessary EHs 2015-08-17 18:12:00 +02:00
Steven Koeberich
b333fe0cd1 Changed german strings for aid kit
Missed some.
2015-08-17 17:42:03 +02:00
Steven Koeberich
f543cf2897 Changed german strings for aid kit
The translation for Fielddressing and Aid kit are the same in the german translation which is missleading.

Changed to "Erste-Hilfe-Set" (first aid kit) which is less missleading.
2015-08-17 17:31:40 +02:00
jokoho48
e14c640c6f Fix Some LandContactPoints
Fix Positions of some Model
2015-08-17 16:11:23 +02:00
SilentSpike
42bd8751aa Fix spectator documentation formatting 2015-08-17 13:50:41 +01:00
SilentSpike
c834d411eb Merge pull request #2189 from acemod/spect-doc-updates
Update spectator doc with new information
2015-08-17 13:30:33 +01:00
SilentSpike
360230984b Fix spectator documentation typo 2015-08-17 13:27:41 +01:00
Glowbal
4d10f2a72d Merge pull request #2182 from jonpas/repairClean
Repair Cleanup
2015-08-17 11:31:57 +02:00
Glowbal
f59927a9a7 Merge pull request #2186 from jonpas/cargoClean
Cargo Cleanup
2015-08-17 09:50:49 +02:00
Joko
89264f1141 Merge pull request #7 from jokoho48/codeCleanupABOnEchtFrameTest
Merge PFH Performance Improvement
2015-08-17 04:34:49 +02:00
jokoho48
d5f9998ad0 Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupABOnEchtFrameTest 2015-08-17 01:50:48 +02:00
SilentSpike
e56ba38cee Update spectator doc with new information 2015-08-17 00:27:22 +01:00
jonpas
dcf074ed5a Changed Optional parameter comment to default value 2015-08-16 23:05:26 +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
PabstMirror
359ee1d23b #2180 - Fix QGVAR(fullRepairLocation) switch statement 2015-08-16 15:31:20 -05:00
jonpas
98dd60c6ca Alphabetized PREPs, removed newlines and repair references 2015-08-16 22:21:39 +02:00
jonpas
fb73d3a436 Fixed dependencies 2015-08-16 22:17:04 +02:00
bux578
905628bc1c Merge pull request #2165 from acemod/enhanceRespawn
after respawn select last weapon, muzzle and mode
2015-08-16 22:05:41 +02:00
jonpas
b2824c82bb Removed redundant function 2015-08-16 21:54:04 +02:00
jonpas
fda0850ad7 Condensed duplicated function, alphabetized PREPs 2015-08-16 21:39:42 +02:00
PabstMirror
dd58eef415 Fix double weapon switch for standing treatment 2015-08-16 14:12:26 -05:00
PabstMirror
21f46f4401 #2178 - Fix treatment when weapon deployed 2015-08-16 13:58:58 -05:00
jonpas
161a75adc7 Added missing arguments in header, replaced QOUTE(DFUNC()) with QFUNC() 2015-08-16 20:34:02 +02:00
jonpas
701c98e0da Cleaned up repair function headers and some code 2015-08-16 20:14:54 +02:00