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
|
5b0168efdb
|
Fixed Atropine autoinjector display name
|
2015-08-16 14:14:49 +02:00 |
|
PabstMirror
|
763f793d0e
|
Localize Catagoires in loadSettingsLocalizedText
Minor, but allows us to use CSTRINGS in configs for consistancy
|
2015-08-13 13:20:37 -05:00 |
|
Glowbal
|
9c8a03b0b3
|
fixes #2070 - medication is not translated on activity log
|
2015-08-09 20:12:31 +02:00 |
|
Glowbal
|
298f64a7bf
|
fixes #2078
1. Fixed incorrect activity string for tourniquet
2. Fixed incorrect macro usage, should have grabbed variables from medical module.
|
2015-08-09 20:07:06 +02:00 |
|
Glowbal
|
58fc69c2a6
|
Updated litter configuration. Closes #2002
|
2015-08-09 08:59:04 +02:00 |
|
PabstMirror
|
95d88b920e
|
#2079 - RemoveTourniquet doesn't require any items
|
2015-08-08 21:25:36 -05:00 |
|
Glowbal
|
493254619c
|
Merge pull request #2039 from acemod/medical-menu
Medical menu
|
2015-08-08 23:11:11 +02:00 |
|
Glowbal
|
696546de5c
|
Finalized ACE medical menu settings
|
2015-08-08 20:22:19 +02:00 |
|
PabstMirror
|
c6be0bbb8c
|
Merge branch 'master' into add-category-optionsmenu
Conflicts:
addons/optionsmenu/functions/fnc_serverSettingsMenuUpdateList.sqf
addons/optionsmenu/functions/fnc_settingsMenuUpdateList.sqf
|
2015-08-08 12:39:14 -05:00 |
|
Glowbal
|
bb79feeaf1
|
Clean up duplicate files
|
2015-08-08 18:16:11 +02:00 |
|
jonpas
|
8e3a961ee3
|
Fixed missing string
|
2015-08-08 18:11:28 +02:00 |
|
jonpas
|
1aecd54fc3
|
Removed duplicated Enabled/Disabled/Yes/No/DoNotForce strings as they were moved to common
|
2015-08-08 18:02:20 +02:00 |
|
Glowbal
|
364e0455ee
|
Merge branch 'master' into medical-menu
|
2015-08-08 17:55:43 +02:00 |
|
Glowbal
|
65c06551a5
|
Merge pull request #1652 from gienkov/patch-22
Fix checking vitals anim
|
2015-08-08 14:32:36 +02:00 |
|
Glowbal
|
be00f7ffe4
|
Merge pull request #2000 from acemod/treatmentResetWeaponMode
Treatment reset weapon mode
|
2015-08-08 14:20:10 +02:00 |
|
Glowbal
|
872c257901
|
Used the wrong string macro.
|
2015-08-08 13:21:13 +02:00 |
|
Glowbal
|
e9151d921c
|
Localized category names for medical settings
|
2015-08-08 11:52:37 +02:00 |
|
Glowbal
|
d125b9ad9c
|
Add category to options menu. Initial work.
|
2015-08-07 21:14:45 +02:00 |
|
Glowbal
|
f21023b4ee
|
Added logs for quick view and activity view separate from the activity log for medical menu
|
2015-08-07 19:11:57 +02:00 |
|
Glowbal
|
f21da3ead6
|
Merge pull request #2026 from acemod/cleanBandages
Clean bandages if no damage on hitpoint
|
2015-08-07 15:46:44 +02:00 |
|
Glowbal
|
abaf43be11
|
Selection restrictions
|
2015-08-07 00:09:40 +02:00 |
|
Glowbal
|
5ac2972573
|
Added local event upon successful treatment.
|
2015-08-06 23:50:44 +02:00 |
|
Glowbal
|
4b5632a8f6
|
Added categories and missing displayName entries
|
2015-08-06 23:50:23 +02:00 |
|
PabstMirror
|
e45bd43e5e
|
CreateLitter / syncEvents performance fixes
|
2015-08-06 00:28:43 -05:00 |
|
PabstMirror
|
6ab72e905c
|
#1807 - Clean bandages if no damage on hitpoint
|
2015-08-05 17:32:00 -05:00 |
|
Glowbal
|
275b0c4300
|
Merge branch 'release'
Conflicts:
README.md
addons/finger/stringtable.xml
|
2015-08-04 22:29:05 +02:00 |
|
Glowbal
|
43f8c87387
|
Merge pull request #1972 from jokoho48/MedicalModelUpdate
Medical Litter model update
|
2015-08-04 20:06:51 +02:00 |
|
PabstMirror
|
b3741f4036
|
Capitalization for macro CBA_fnc_addPerFrameHandler
|
2015-08-04 02:34:38 -05:00 |
|
PabstMirror
|
710135ae3f
|
Opps
|
2015-08-03 21:49:16 -05:00 |
|
PabstMirror
|
fa49842c53
|
#1866 - Restore weapon mode after treatment
|
2015-08-03 19:57:49 -05:00 |
|
KoffeinFlummi
|
261cd42202
|
Merge branch 'pl-translation-4' of https://github.com/gienkov/ACE3 into polish-merge
|
2015-08-02 17:14:41 +02:00 |
|
KoffeinFlummi
|
8f848947ac
|
Merge https://github.com/Clon1998/ACE3 into german-merge
|
2015-08-02 17:11:06 +02:00 |
|
jokoho48
|
ee11622cd5
|
Fix Position
|
2015-08-01 16:10:08 +02:00 |
|
jokoho48
|
9d8daf84a4
|
add New Medical Models
|
2015-08-01 15:46:25 +02:00 |
|
Glowbal
|
ca2a16af02
|
fix #1946
|
2015-07-30 18:21:24 +02:00 |
|
Glowbal
|
a4d5d9cb27
|
Possible improvement for handling minor levels of pain in advanced medical
|
2015-07-30 17:43:52 +02:00 |
|
SilentSpike
|
16597515f0
|
Adding remaining missing English straings
|
2015-07-28 20:55:22 +01:00 |
|
gienkov
|
5bb1dded4b
|
Merge remote-tracking branch 'origin' into pl-translation-4
|
2015-07-27 00:47:54 +02:00 |
|
Glowbal
|
d1809e597c
|
Removed requirement for the medical dll
Medical extension is now an optional requirement that improves performance for advanced medical when used.
|
2015-07-26 20:54:49 +02:00 |
|
Glowbal
|
dfec850aa8
|
Merge pull request #1910 from SzwedzikPL/backpack_macro_in_cfgs
addX macro in configs
|
2015-07-26 08:37:47 +02:00 |
|
SzwedzikPL
|
6258e73290
|
addX macro in confgis
|
2015-07-25 21:59:52 +02:00 |
|
Glowbal
|
ea8dc0a5ec
|
Merge pull request #1809 from SzwedzikPL/medical_fix_treat_at_attendant
Fix for 'Treat at...' option
|
2015-07-25 21:22:44 +02:00 |
|
Glowbal
|
3a53991ed0
|
fixed rvmat and texture paths
|
2015-07-25 21:21:31 +02:00 |
|
PabstMirror
|
40ed985d34
|
Config Fixes
|
2015-07-25 12:56:57 -05:00 |
|
gienkov
|
2f24b240b4
|
Fix end line marker
|
2015-07-23 13:59:50 +02:00 |
|
gienkov
|
61fa466a53
|
Medical and slideshow pl translation
|
2015-07-23 13:56:54 +02:00 |
|
PabstMirror
|
cbd74d768b
|
Medical - Don't play *_medic anims at end
|
2015-07-23 02:43:19 -05:00 |
|
Joko
|
9bdb192c8a
|
Add New LitterGloves
Add New Litter/packingbandage
Change all Litter Model and Texture to a nomenclature (littergeneric_name)
|
2015-07-19 15:31:15 +02:00 |
|