diff --git a/reaction/code/ui/ui_main.c b/reaction/code/ui/ui_main.c index afecbfcc..b76b7e6d 100644 --- a/reaction/code/ui/ui_main.c +++ b/reaction/code/ui/ui_main.c @@ -5668,10 +5668,8 @@ static void UI_Update(const char *name) trap_Cvar_SetValue("cg_gibs", 1); trap_Cvar_SetValue("cg_simpleItems", 0); trap_Cvar_SetValue("cg_marks", 1); - trap_Cvar_SetValue("cg_brassTime", 30000); + trap_Cvar_SetValue("cg_brassTime", 15000); trap_Cvar_SetValue("cg_RQ3_glasstime", 30000); - trap_Cvar_SetValue("cg_RQ3_flash", 1); - trap_Cvar_SetValue("cg_RQ3_impactEffects", 1); trap_Cvar_SetValue("cg_shadows", 1); trap_Cvar_SetValue("r_inGameVideo", 1); trap_Cvar_SetValue("r_picmip", 0); @@ -5690,21 +5688,16 @@ static void UI_Update(const char *name) trap_Cvar_SetValue("r_drawSun", 1); trap_Cvar_SetValue("r_fastsky", 0); trap_Cvar_SetValue("r_flares", 1); - trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR"); trap_Cvar_SetValue("r_ext_multitexture", 1); trap_Cvar_SetValue("r_ext_compressed_textures", 0); - trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 1); - trap_Cvar_SetValue("r_ext_max_anisotropy", 16); break; case 1: // normal trap_Cvar_SetValue("com_blood", 1); trap_Cvar_SetValue("cg_gibs", 1); trap_Cvar_SetValue("cg_simpleItems", 0); trap_Cvar_SetValue("cg_marks", 1); - trap_Cvar_SetValue("cg_brassTime", 10000); + trap_Cvar_SetValue("cg_brassTime", 7500); trap_Cvar_SetValue("cg_RQ3_glasstime", 10000); - trap_Cvar_SetValue("cg_RQ3_flash", 1); - trap_Cvar_SetValue("cg_RQ3_impactEffects", 1); trap_Cvar_SetValue("cg_shadows", 1); trap_Cvar_SetValue("r_inGameVideo", 1); trap_Cvar_SetValue("r_picmip", 0); @@ -5723,21 +5716,16 @@ static void UI_Update(const char *name) trap_Cvar_SetValue("r_drawSun", 0); trap_Cvar_SetValue("r_fastsky", 0); trap_Cvar_SetValue("r_flares", 1); - trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR"); trap_Cvar_SetValue("r_ext_multitexture", 1); trap_Cvar_SetValue("r_ext_compressed_textures", 0); - trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 1); - trap_Cvar_SetValue("r_ext_max_anisotropy", 4); break; case 2: // fast trap_Cvar_SetValue("com_blood", 1); trap_Cvar_SetValue("cg_gibs", 1); trap_Cvar_SetValue("cg_simpleItems", 0); trap_Cvar_SetValue("cg_marks", 1); - trap_Cvar_SetValue("cg_brassTime", 2000); + trap_Cvar_SetValue("cg_brassTime", 7500); trap_Cvar_SetValue("cg_RQ3_glasstime", 2000); - trap_Cvar_SetValue("cg_RQ3_flash", 1); - trap_Cvar_SetValue("cg_RQ3_impactEffects", 0); trap_Cvar_SetValue("cg_shadows", 0); trap_Cvar_SetValue("r_inGameVideo", 1); trap_Cvar_SetValue("r_picmip", 1); @@ -5756,11 +5744,8 @@ static void UI_Update(const char *name) trap_Cvar_SetValue("r_drawSun", 0); trap_Cvar_SetValue("r_fastsky", 0); trap_Cvar_SetValue("r_flares", 0); - trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR"); trap_Cvar_SetValue("r_ext_multitexture", 1); trap_Cvar_SetValue("r_ext_compressed_textures", 1); - trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 0); - trap_Cvar_SetValue("r_ext_max_anisotropy", 2); break; case 3: // fastest trap_Cvar_SetValue("com_blood", 0); @@ -5769,8 +5754,6 @@ static void UI_Update(const char *name) trap_Cvar_SetValue("cg_marks", 0); trap_Cvar_SetValue("cg_brassTime", 0); trap_Cvar_SetValue("cg_RQ3_glasstime", 0); - trap_Cvar_SetValue("cg_RQ3_flash", 0); - trap_Cvar_SetValue("cg_RQ3_impactEffects", 0); trap_Cvar_SetValue("cg_shadows", 0); trap_Cvar_SetValue("r_inGameVideo", 1); trap_Cvar_SetValue("r_picmip", 2); @@ -5789,12 +5772,43 @@ static void UI_Update(const char *name) trap_Cvar_SetValue("r_drawSun", 0); trap_Cvar_SetValue("r_fastsky", 1); trap_Cvar_SetValue("r_flares", 0); - trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_NEAREST"); trap_Cvar_SetValue("r_ext_multitexture", 0); trap_Cvar_SetValue("r_ext_compressed_textures", 1); + break; + } + } else if (Q_stricmp(name, "ui_filteringMode") == 0) { + switch (val) { + //TTI: filtering mode + case 0: // bilinear + trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_NEAREST"); trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 0); trap_Cvar_SetValue("r_ext_max_anisotropy", 2); break; + case 1: // trilinear + trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR"); + trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 0); + trap_Cvar_SetValue("r_ext_max_anisotropy", 2); + break; + case 2: // 2x anisotropic + trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR"); + trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 1); + trap_Cvar_SetValue("r_ext_max_anisotropy", 2); + break; + case 3: // 4x anisotropic + trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR"); + trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 1); + trap_Cvar_SetValue("r_ext_max_anisotropy", 4); + break; + case 4: // 8x anisotropic + trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR"); + trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 1); + trap_Cvar_SetValue("r_ext_max_anisotropy", 8); + break; + case 5: // 16x anisotropic + trap_Cvar_Set("r_texturemode", "GL_LINEAR_MIPMAP_LINEAR"); + trap_Cvar_SetValue("r_ext_texture_filter_anisotropic", 1); + trap_Cvar_SetValue("r_ext_max_anisotropy", 16); + break; } } else if (Q_stricmp(name, "ui_mousePitch") == 0) { if (val == 0) { diff --git a/reaction/code/ui/ui_shared.c b/reaction/code/ui/ui_shared.c index 14963ae7..577a7988 100644 --- a/reaction/code/ui/ui_shared.c +++ b/reaction/code/ui/ui_shared.c @@ -4989,13 +4989,13 @@ static bind_t g_bindings[] = { {"+scores", K_TAB, -1, -1, -1}, //Makro - button2 was enter {"+button2", -1, -1, -1, -1}, - {"+speed", K_CTRL, -1, -1, -1}, + {"+speed", K_SHIFT, -1, -1, -1}, {"+forward", 'w', K_UPARROW, -1, -1}, {"+back", 's', K_DOWNARROW, -1, -1}, {"+moveleft", 'a', K_LEFTARROW, -1, -1}, {"+moveright", 'd', K_RIGHTARROW, -1, -1}, {"+moveup", K_MOUSE2, K_SPACE, -1, -1}, - {"+movedown", K_SHIFT, K_MOUSE4, -1, -1}, + {"+movedown", K_CTRL, K_MOUSE4, -1, -1}, {"+left", -1, -1, -1, -1}, {"+right", -1, -1, -1, -1}, {"+strafe", -1, -1, -1, -1}, @@ -5029,36 +5029,37 @@ static bind_t g_bindings[] = { {"use Slashing Combat Knife", -1, -1, -1, -1}, {"use Throwing Combat Knife", -1, -1, -1, -1}, {"+attack", K_MOUSE1, -1, -1, -1}, - {"weapprev", K_MWHEELUP, K_PGUP, -1, -1}, - {"weapnext", K_MWHEELDOWN, K_PGDN, -1, -1}, + {"weapprev", K_PGDN, K_MWHEELDOWN, -1, -1}, + {"weapnext", K_PGUP, K_MWHEELUP, -1, -1}, //Makro - button3 was mouse3 {"+button3", 'g', -1, -1, -1}, {"messagemode", 't', -1, -1, -1}, {"messagemode2", 'y', -1, -1, -1}, {"messagemode3", -1, -1, -1, -1}, {"messagemode4", -1, -1, -1, -1}, - {"bandage", 'f', -1, -1, -1}, + {"bandage", 'f', K_KP_END, -1, -1}, //reload - {"+button5", 'r', -1, -1, -1}, - {"weapon", 'z', K_MOUSE3, -1, -1}, - {"unzoom", 'q', -1, -1, -1}, - {"opendoor", K_ENTER, -1, -1, -1}, + {"+button5", 'r', K_KP_INS, -1, -1}, + {"weapon", 'v', K_END, -1, -1}, + {"unzoom", 'b', K_HOME, -1, -1}, + {"opendoor", 'e', K_ENTER, -1, -1}, //TTI: replacing "dropweapon" with the newer "drop weapon", the same goes for "dropitem" - {"drop weapon", 'c', -1, -1, -1}, - {"drop item", 'v', -1, -1, -1}, - {"drop case", 'x', -1, -1, -1}, + {"drop weapon", 'c', K_BACKSPACE, -1, -1}, + {"drop item", 'x', -1, -1, -1}, + {"drop case", 'z', -1, -1, -1}, {"irvision", 'i', -1, -1, -1}, //Makro - this one was missing {"use special", '4', -1, -1, -1}, //Makro - for the weapon/item, join, presets and tkok menus - {"ui_RQ3_loadout", K_F1, -1, -1, -1}, - {"ui_RQ3_joinTeam", K_F2, -1, -1, -1}, + {"vote yes", K_F1, -1, -1, -1}, + {"vote no", K_F2, -1, -1, -1}, + {"ui_RQ3_tkok", K_F3, -1, -1, -1}, {"ui_RQ3_presets", K_F4, -1, -1, -1}, - {"ui_RQ3_tkok", -1, -1, -1, -1}, - {"screenshot", K_F11, -1, -1, -1}, - {"screenshotJPEG", -1, -1, -1, -1}, -//TTI: more binds - {"+wstats", K_F3, -1, -1, -1}, + {"ui_RQ3_loadout", K_F5, -1, -1, -1}, + {"ui_RQ3_joinTeam", K_F6, -1, -1, -1}, + {"+wstats", K_F8, -1, -1, -1}, + {"screenshotJPEG", K_F11, -1, -1, -1}, + {"screenshot", K_F12, -1, -1, -1}, {"+voiprecord", -1, -1, -1, -1} }; diff --git a/reaction/uifiles/options.menu b/reaction/uifiles/options.menu index 7b2fcce7..e62f31c5 100644 --- a/reaction/uifiles/options.menu +++ b/reaction/uifiles/options.menu @@ -180,8 +180,8 @@ Group # 1 - Gameplay BEGIN_OPTION("Ejecting Brass", "cg_brassTime", ITEM_TYPE_MULTI, 3, 1) cvarFloatList { - "High" 2500 - "Med" 1250 + "High" 15000 + "Med" 7500 "Off" 0 } OPTION_BELOW("gr1_ctrl2") diff --git a/reaction/uifiles/system.menu b/reaction/uifiles/system.menu index 470f60df..a02eae58 100644 --- a/reaction/uifiles/system.menu +++ b/reaction/uifiles/system.menu @@ -232,26 +232,61 @@ Group # 1 - Graphics ADD_HINT("hint_fullscreen", "Render in full screen or a window", "group1") + // Anti-Aliasing Mode // + + BEGIN_OPTION("Anti-Aliasing", "r_ext_multisample", ITEM_TYPE_MULTI, 7, 1) + cvarFloatList { + "Off" 0 + "2x MSAA" 2 + "4x MSAA" 4 + } + OPTION_BELOW("gr1_ctrl6") + action { uiScript glCustom ; } + ASSIGN_HINT("hint_aa") + END_OPTION + ADD_HINT("hint_aa", "Use anti-aliasing to improve image quality", "group1") + + + // Texture filtering mode // + + BEGIN_OPTION("Filtering Mode", "ui_filteringMode", ITEM_TYPE_MULTI, 8, 1) + cvarFloatList { + "Bilinear" 0 + "Trilinear" 1 + "2x Anisotropic" 2 + "4x Anisotropic" 3 + "8x Anisotropic" 4 + "16x Anisotropic" 5 + } + OPTION_BELOW("gr1_ctrl7") + action { uiScript update "ui_filteringMode" ; } + ASSIGN_HINT("hint_texfilter") + END_OPTION + ADD_HINT("hint_texfilter", "Choose texture filtering mode", "group1") + + // Lightmap/vertex // - BEGIN_OPTION("Lighting", "r_vertexlight", ITEM_TYPE_MULTI, 7, 1) + /* + BEGIN_OPTION("Lighting", "r_vertexlight", ITEM_TYPE_MULTI, 9, 1) cvarFloatList { "Light Map (high)" 0 "Vertex (low)" 1 } - OPTION_BELOW("gr1_ctrl6") + OPTION_BELOW("gr1_ctrl8") action { uiScript glCustom ; } ASSIGN_HINT("hint_lightmap") END_OPTION ADD_HINT("hint_lightmap", "Choose map light rendering mode", "group1") + */ // Geometric detail // - BEGIN_OPTION("Geometric Detail", "r_lodbias", ITEM_TYPE_MULTI, 8, 1) + BEGIN_OPTION("Geometric Detail", "r_lodbias", ITEM_TYPE_MULTI, 9, 1) cvarFloatList { "High" 0 "Medium" 1 "Low" 2 } - OPTION_BELOW("gr1_ctrl7") + OPTION_BELOW("gr1_ctrl8") action { uiScript glCustom ; uiScript update "r_lodbias" } ASSIGN_HINT("hint_geodetail") END_OPTION @@ -260,14 +295,14 @@ Group # 1 - Graphics // Texture detail // - BEGIN_OPTION("Texture Detail", "r_picmip", ITEM_TYPE_MULTI, 9, 1) + BEGIN_OPTION("Texture Detail", "r_picmip", ITEM_TYPE_MULTI, 10, 1) cvarFloatList { "Very Low" 3 "Low" 2 "Normal" 1 "High" 0 } - OPTION_BELOW("gr1_ctrl8") + OPTION_BELOW("gr1_ctrl9") action { uiScript glCustom ; } ASSIGN_HINT("hint_texdetail") END_OPTION @@ -276,33 +311,19 @@ Group # 1 - Graphics // Texture quality // - BEGIN_OPTION("Texture Quality", "r_texturebits", ITEM_TYPE_MULTI, 10, 1) + BEGIN_OPTION("Texture Quality", "r_texturebits", ITEM_TYPE_MULTI, 11, 1) cvarFloatList { "Default" 0 "16 bit" 16 "32 bit" 32 } - OPTION_BELOW("gr1_ctrl9") + OPTION_BELOW("gr1_ctrl10") action { uiScript glCustom ; } ASSIGN_HINT("hint_texquality") END_OPTION ADD_HINT("hint_texquality", "Choose texture quality", "group1") - // Texture filtering mode // - - BEGIN_OPTION("Texture Filter", "r_textureMode", ITEM_TYPE_MULTI, 11, 1) - cvarStrList { - "Bilinear", "GL_LINEAR_MIPMAP_NEAREST", - "Trilinear", "GL_LINEAR_MIPMAP_LINEAR" - } - OPTION_BELOW("gr1_ctrl10") - action { uiScript glCustom ; } - ASSIGN_HINT("hint_texfilter") - END_OPTION - ADD_HINT("hint_texfilter", "Choose texture filtering mode", "group1") - - // Compressed textures // BEGIN_OPTION("Compress Textures", "r_ext_compressed_textures", ITEM_TYPE_YESNO, 12, 1) @@ -427,17 +448,19 @@ Group # 3 - Misc // Screen size // + /* BEGIN_SLIDER("Screen Size", "cg_viewsize", 100, 30, 100, 2, 3) OPTION_BELOW("gr3_ctrl1") ASSIGN_HINT("hint_screensize") END_OPTION ADD_HINT("hint_screensize", "Change rendering window size", "group3") + */ // Overbrightbits // - BEGIN_OPTION("Overbright Bits", "r_overbrightbits", ITEM_TYPE_YESNO, 3, 3) - OPTION_BELOW("gr3_ctrl2") + BEGIN_OPTION("Overbright Bits", "r_overbrightbits", ITEM_TYPE_YESNO, 2, 3) + OPTION_BELOW("gr3_ctrl1") ASSIGN_HINT("hint_overbits") END_OPTION ADD_HINT("hint_overbits", "Enable overbright bits (greater color range at the expense of precision)", "group3") @@ -445,38 +468,14 @@ Group # 3 - Misc // V-SYNC // - BEGIN_OPTION("Sync Every Frame", "r_finish", ITEM_TYPE_YESNO, 4, 3) + BEGIN_OPTION("Sync Every Frame", "r_finish", ITEM_TYPE_YESNO, 3, 3) //kind YESNO_ICON_RIGHT - OPTION_BELOW("gr3_ctrl3") + OPTION_BELOW("gr3_ctrl2") ASSIGN_HINT("hint_vsync") END_OPTION - ADD_HINT("hint_vsync", "Enable V-SYNC (recommended off)", "group3") + ADD_HINT("hint_vsync", "Wait for vertical sync (recommended off)", "group3") -/* - // Anisotropic filtering // - - BEGIN_OPTION("Anisotropic Filtering", "r_ext_texture_filter_anisotropic", ITEM_TYPE_YESNO, 3, 3) - OPTION_BELOW("gr3_ctrl2") - ASSIGN_HINT("hint_af") - END_OPTION - ADD_HINT("hint_af", "Enable anisotropic filtering (enhances texture quality at oblique viewing angles)", "group3") - - - // AF quality // - - BEGIN_OPTION("Anisotropy Level", "r_ext_max_anisotropy", ITEM_TYPE_MULTI, 4, 3) - OPTION_BELOW("gr3_ctrl3") - cvarFloatList { - //unfinished, doesn't make sense - "2:1" 0 - "4:1" 1 - } - ASSIGN_HINT("hint_aflvl") - END_OPTION - ADD_HINT("hint_aflvl", "AF quality", "group3") -*/ - // Sound // //Icon