Commit Graph

5601 Commits

Author SHA1 Message Date
jonpas
144af2ed17 Added support for when one of the grouped hitpoints is damaged but not main 2015-08-24 05:14:04 +02:00
jonpas
f2bda7c434 Added hitpoint groups framework 2015-08-24 04:17:24 +02:00
jonpas
94c4c411e2 Added custom hitpoint selection framework with a starting example, removed blacklist 2015-08-24 03:23:37 +02:00
jonpas
1253d1267c Inlined selection check 2015-08-24 01:54:12 +02:00
jonpas
5c33f7736c Added support in repair for hitpoints with non-center selections 2015-08-24 01:51:34 +02:00
PabstMirror
27d974687e Merge pull request #2235 from acemod/mdagrFixes
Mdagr fixes
2015-08-23 17:00:37 -05:00
PabstMirror
05925ad7c2 Merge pull request #1902 from acemod/virtualExplosivesPlace
Virtual explosives place
2015-08-23 16:57:24 -05:00
Michael Braun
fc45d1216a Simplyfied bounding value detection 2015-08-23 22:26:31 +02:00
PabstMirror
58f4ef5b62 Merge pull request #2226 from acemod/codeCleanupMarker
Code Cleanup Marker Module
2015-08-23 14:27:07 -05:00
PabstMirror
a82e5b5436 Fix Colors + Debug Trace 2015-08-23 14:25:41 -05:00
jonpas
2808ae6fc9 Removed debug 2015-08-23 19:55:52 +02:00
jonpas
ca1b47beb5 Use correct module group 2015-08-23 19:54:55 +02:00
jonpas
6d15e63f85 Fixed #2222 - Allow spaces in slideshow module by just trimming the splitted input string rather than removing all whitespace 2015-08-23 19:48:57 +02:00
Steven Koeberich
d5a1a99f90 Update stringtable.xml
corrected spelling
2015-08-23 18:58:13 +02:00
Michael Braun
9352a8dbcb Hotfix for missreplaced variable in projectile direction adjustment 2015-08-23 18:38:19 +02:00
Michael Braun
021c835b02 Removed debug messages 2015-08-23 17:54:10 +02:00
Michael Braun
20b45e10a4 Fixed issue with selecting the wrong value, when perfect barrel length match occured. 2015-08-23 17:53:33 +02:00
Michael Braun
1c14897194 Fixed velocity limit detection and small comment fix 2015-08-23 17:39:48 +02:00
J3aLeiNe
490602facd rangecard stringtable : french translation
rangecard stringtable : french translation
2015-08-23 17:01:41 +02:00
PabstMirror
9aed148e8a Default Action parameters is [] for self (ref #2228)
Makes it match fnc_compileMenu.sqf
2015-08-23 00:16:01 -05:00
PabstMirror
248b4449bf #2204 - Tweak road draw for performance 2015-08-22 22:07:29 -05:00
PabstMirror
3df5b82402 #2225 - Fix mdagr list box colors 2015-08-22 20:53:29 -05:00
Grzegorz
33889fa46b Increase "load in bodybag" action time
Around 15 seconds seems optimal (for dead bodies that are left in **one** piece).
2015-08-23 00:13:09 +02:00
Joko
3eae83439b Merge pull request #2231 from gienkov/patch-26
Fix stitching action progress bar
2015-08-22 22:59:46 +02:00
jokoho48
29cc4c2697 stringtable Cleanup 2015-08-22 22:50:36 +02:00
jokoho48
9d0f3c7f5b stringtable Cleanup 2015-08-22 22:45:14 +02:00
jokoho48
4d81e4a99e Code Cleanup Medical Menu Module. 2015-08-22 22:33:15 +02:00
Grzegorz
07019ed928 Fix stitching action progress bar 2015-08-22 22:20:20 +02:00
jonpas
18f5a2ca94 Renamed cargo events 2015-08-22 16:45:50 +02:00
Glowbal
7d2ca74402 Merge pull request #2220 from acemod/fixHitEffectRepair
Fix Hit Effect on Track and Wheel
2015-08-22 14:32:03 +02:00
jokoho48
f35b82ddb9 Code Cleanup Marker Module. 2015-08-22 14:08:35 +02:00
bux578
bfc3a4048e Merge pull request #2221 from gienkov/pl-translation-6
PL translation and fixes
2015-08-22 12:38:52 +02:00
gienkov
cf585790db fixes done 2015-08-22 11:41:15 +02:00
SilentSpike
b8b71e1c76 Merge pull request #2195 from jonpas/fixVDlimit
Fixed View Distance limit not applied on Video Settings
2015-08-21 23:47:02 +01:00
jonpas
295acddc7a Added view distance set on module load, so it is guaranteed to be set 2015-08-22 00:33:16 +02:00
gienkov
96c3b62cb9 zeus translation 2015-08-22 00:19:51 +02:00
gienkov
75c31c10fd optionsmenu and repair first version of translation 2015-08-22 00:17:01 +02:00
jokoho48
11f753f873 Fix Hit Effect on Track and Wheel 2015-08-22 00:13:29 +02:00
gienkov
cc430fc8c2 medical translation 2015-08-21 23:54:01 +02:00
gienkov
1bbf721ef6 main translation 2015-08-21 23:51:48 +02:00
gienkov
f22531cc59 cargo translation 2015-08-21 23:50:54 +02:00
gienkov
8f483ba8df fix medical_menu stringtable error 2015-08-21 23:46:05 +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
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
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
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
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
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
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
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
jokoho48
d5f9998ad0 Merge branch 'master' of https://github.com/acemod/ACE3 into codeCleanupABOnEchtFrameTest 2015-08-17 01:50:48 +02: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
jokoho48
8a5e572baf Fix Model Warning Unsupported UVSet 2015-08-16 19:52:28 +02:00
jokoho48
e41ce78dbb Code Test PFH 2015-08-16 19:49:47 +02:00
jonpas
85cc662fa4 ACE_Repair capitalization 2/2 2015-08-16 16:46:32 +02:00
jonpas
68359974f1 ACE_Repair capitalization 1/2 2015-08-16 16:46:17 +02:00
jonpas
b7282e476c Used macros, getVariable capitalization, removed start of file newlines, separated CfgActions 2015-08-16 16:45:46 +02:00
Glowbal
9f3af45a8f Fixed repair items not registered as loadable 2015-08-16 16:16:04 +02:00
SilentSpike
1d51bd7c40 Merge pull request #2162 from acemod/assign-medic-curator-modules
Add medical curator modules
2015-08-16 14:13:31 +01:00
jonpas
5b0168efdb Fixed Atropine autoinjector display name 2015-08-16 14:14:49 +02:00
bux578
5ffdf4628f remove asdg message
new cba will include asdg jr
2015-08-16 13:15:01 +02:00
Glowbal
0c1b828946 Merge pull request #2171 from acemod/fix-error-invalid-hitpoints
Fixed error pop-up invalid configured hitpoints
2015-08-16 10:24:24 +02:00
PabstMirror
61bc40a650 Opps 2015-08-16 02:05:34 -05:00