From: terencehill Date: Tue, 25 Aug 2015 22:25:49 +0000 (+0200) Subject: Merge branch 'master' into terencehill/menu_weaponarena_selection_fix X-Git-Tag: xonotic-v0.8.2~1944^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=919c48e2ad5873bf1efb041be2e23e2e60903baf;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/menu_weaponarena_selection_fix Conflicts: qcsrc/menu/xonotic/radiobutton.qc --- 919c48e2ad5873bf1efb041be2e23e2e60903baf diff --cc qcsrc/menu/xonotic/radiobutton.qc index 51f4cc6a2,1d2676f1f..65f2486f2 --- a/qcsrc/menu/xonotic/radiobutton.qc +++ b/qcsrc/menu/xonotic/radiobutton.qc @@@ -15,9 -15,9 +15,9 @@@ CLASS(XonoticRadioButton, RadioButton ATTRIB(XonoticRadioButton, cvarName, string, string_null) ATTRIB(XonoticRadioButton, cvarValue, string, string_null) ATTRIB(XonoticRadioButton, cvarOffValue, string, string_null) - ATTRIB(XonoticRadioButton, getCvarValueFromCvar, float, 0) + ATTRIB(XonoticRadioButton, cvarValueIsAnotherCvar, float, 0) - METHOD(XonoticRadioButton, loadCvars, void(entity)) - METHOD(XonoticRadioButton, saveCvars, void(entity)) + METHOD(XonoticRadioButton, loadCvars, void(entity)); + METHOD(XonoticRadioButton, saveCvars, void(entity)); ATTRIB(XonoticRadioButton, alpha, float, SKINALPHA_TEXT) ATTRIB(XonoticRadioButton, disabledAlpha, float, SKINALPHA_DISABLED)