A bunch of UI updates.

code/ui/ui_main.c

@@ -5665,20 +5665,21 @@ static void UI_Update(const char *name)
 	} else if (Q_stricmp(name, "ui_glCustom") == 0) {
 		switch (val) {
 		//TTI: new presets
-		case 1:	// normal
+		case 1:	// normal quality
 			trap_Cvar_SetValue("cg_brassTime", 7500);
 			trap_Cvar_SetValue("cg_RQ3_glasstime", 7500);
 			
 			trap_Cvar_SetValue("r_picmip", 0);
 			trap_Cvar_SetValue("r_hdr", 1);
-			trap_Cvar_SetValue("r_postProcess", 1);
 			trap_Cvar_SetValue("r_toneMap", 1);
 			trap_Cvar_SetValue("r_autoExposure", 1);
+			trap_Cvar_SetValue("r_ssao", 1);
 			trap_Cvar_SetValue("r_pbr", 1);
 			trap_Cvar_SetValue("r_deluxeMapping", 1);
 			trap_Cvar_SetValue("r_normalMapping", 1);
 			trap_Cvar_SetValue("r_specularMapping", 1);
 			trap_Cvar_SetValue("r_cubeMapping", 1);
+			trap_Cvar_SetValue("r_imageUpsample", 0);
 			
 			trap_Cvar_SetValue("r_lodBias", 0);
 			trap_Cvar_SetValue("r_subdivisions", 1);
@@ -5694,20 +5695,21 @@ static void UI_Update(const char *name)
 			trap_Cvar_SetValue("ui_shaderLevel", 1);
 			trap_Cvar_SetValue("ui_shadowMaps", 2);
 			break;
-		case 2:	// crappiest
+		case 2:	// very low quality
 			trap_Cvar_SetValue("cg_brassTime", 0);
 			trap_Cvar_SetValue("cg_RQ3_glasstime", 0);
 			
 			trap_Cvar_SetValue("r_picmip", 2);
 			trap_Cvar_SetValue("r_hdr", 0);
-			trap_Cvar_SetValue("r_postProcess", 0);
 			trap_Cvar_SetValue("r_toneMap", 0);
 			trap_Cvar_SetValue("r_autoExposure", 0);
+			trap_Cvar_SetValue("r_ssao", 0);
 			trap_Cvar_SetValue("r_pbr", 0);
 			trap_Cvar_SetValue("r_deluxeMapping", 0);
 			trap_Cvar_SetValue("r_normalMapping", 0);
 			trap_Cvar_SetValue("r_specularMapping", 0);
 			trap_Cvar_SetValue("r_cubeMapping", 0);
+			trap_Cvar_SetValue("r_imageUpsample", 0);
 			
 			trap_Cvar_SetValue("r_lodBias", 2);
 			trap_Cvar_SetValue("r_subdivisions", 8);
@@ -5723,20 +5725,21 @@ static void UI_Update(const char *name)
 			trap_Cvar_SetValue("ui_shaderLevel", 0);
 			trap_Cvar_SetValue("ui_shadowMaps", 0);
 			break;
-		case 3:	// crap
+		case 3:	// low quality
 			trap_Cvar_SetValue("cg_brassTime", 7500);
 			trap_Cvar_SetValue("cg_RQ3_glasstime", 7500);
 			
 			trap_Cvar_SetValue("r_picmip", 1);
 			trap_Cvar_SetValue("r_hdr", 1);
-			trap_Cvar_SetValue("r_postProcess", 0);
 			trap_Cvar_SetValue("r_toneMap", 0);
 			trap_Cvar_SetValue("r_autoExposure", 0);
+			trap_Cvar_SetValue("r_ssao", 0);
 			trap_Cvar_SetValue("r_pbr", 0);
 			trap_Cvar_SetValue("r_deluxeMapping", 0);
 			trap_Cvar_SetValue("r_normalMapping", 0);
 			trap_Cvar_SetValue("r_specularMapping", 0);
 			trap_Cvar_SetValue("r_cubeMapping", 0);
+			trap_Cvar_SetValue("r_imageUpsample", 0);
 			
 			trap_Cvar_SetValue("r_lodBias", 1);
 			trap_Cvar_SetValue("r_subdivisions", 4);
@@ -5758,14 +5761,15 @@ static void UI_Update(const char *name)
 			
 			trap_Cvar_SetValue("r_picmip", 0);
 			trap_Cvar_SetValue("r_hdr", 1);
-			trap_Cvar_SetValue("r_postProcess", 1);
 			trap_Cvar_SetValue("r_toneMap", 1);
 			trap_Cvar_SetValue("r_autoExposure", 1);
+			trap_Cvar_SetValue("r_ssao", 1);
 			trap_Cvar_SetValue("r_pbr", 1);
 			trap_Cvar_SetValue("r_deluxeMapping", 1);
 			trap_Cvar_SetValue("r_normalMapping", 1);
 			trap_Cvar_SetValue("r_specularMapping", 1);
 			trap_Cvar_SetValue("r_cubeMapping", 1);
+			trap_Cvar_SetValue("r_imageUpsample", 0);
 			
 			trap_Cvar_SetValue("r_lodBias", 0);
 			trap_Cvar_SetValue("r_subdivisions", 1);
@@ -5781,20 +5785,21 @@ static void UI_Update(const char *name)
 			trap_Cvar_SetValue("ui_shaderLevel", 1);
 			trap_Cvar_SetValue("ui_shadowMaps", 2);
 			break;
-		case 5: // highest quality
+		case 5: // very high quality
 			trap_Cvar_SetValue("cg_brassTime", 20000);
 			trap_Cvar_SetValue("cg_RQ3_glasstime", 20000);
 			
 			trap_Cvar_SetValue("r_picmip", 0);
 			trap_Cvar_SetValue("r_hdr", 1);
-			trap_Cvar_SetValue("r_postProcess", 1);
 			trap_Cvar_SetValue("r_toneMap", 1);
 			trap_Cvar_SetValue("r_autoExposure", 1);
+			trap_Cvar_SetValue("r_ssao", 1);
 			trap_Cvar_SetValue("r_pbr", 1);
 			trap_Cvar_SetValue("r_deluxeMapping", 1);
 			trap_Cvar_SetValue("r_normalMapping", 1);
 			trap_Cvar_SetValue("r_specularMapping", 1);
 			trap_Cvar_SetValue("r_cubeMapping", 1);
+			trap_Cvar_SetValue("r_imageUpsample", 0);
 			
 			trap_Cvar_SetValue("r_lodBias", 0);
 			trap_Cvar_SetValue("r_subdivisions", 1);
@@ -5847,15 +5852,15 @@ static void UI_Update(const char *name)
 		}
 	} else if (Q_stricmp(name, "ui_shaderLevel") == 0) {
 		switch (val) {
-		// per-pixel lighting
+		// physically-based rendering
-		case 0:	// flat (disabled)
+		case 0:	// disabled
 			trap_Cvar_SetValue("r_pbr", 0);
 			trap_Cvar_SetValue("r_deluxeMapping", 0);
 			trap_Cvar_SetValue("r_normalMapping", 0);
 			trap_Cvar_SetValue("r_specularMapping", 0);
 			trap_Cvar_SetValue("r_cubeMapping", 0);
 			break;
-		case 1: // bumpy (enabled)
+		case 1: // enabled
 			trap_Cvar_SetValue("r_pbr", 1);
 			trap_Cvar_SetValue("r_deluxeMapping", 1);
 			trap_Cvar_SetValue("r_normalMapping", 1);

uifiles/credit.menu

@@ -115,8 +115,8 @@
 	textalignx 112
 	textaligny 24
 	forecolor 0 0 0.1 1
-	text "Tomi Isoaho\n"
+	text "Richard Allen\n"
-	     "Richard Allen\n"
+	     "Tomi Isoaho\n"
 	     "Andrei Drexler\n"
 	     "James Canete\n"
 	     "Scott Brooks\n"
@@ -138,8 +138,8 @@
 	textalignx 96
 	textaligny 24
 	forecolor 0 0 0.1 1
-	text "T.T.I.\n"
+	text "JBravo\n"
-	     "JBravo\n"
+	     "T.T.I.\n"
 	     "Makro\n"
 	     "SmileTheory\n"
 	     "Blaze\n"
@@ -1213,7 +1213,7 @@
 	name "timer16"
 	group timer	
 	subgroup "t16_title"
-	text "Reaction 1.0\n"
+	text "Reaction\n"
 	     "contributions"
 	forecolor 0 0 .1 1
 	style WINDOW_STYLE_EMPTY
@@ -1320,7 +1320,7 @@
 	name "timer18"
 	group timer	
 	subgroup "t18_title"
-	text "REACTION 1.0\n"
+	text "REACTION\n"
 	     "TITLE SCORE\n"
 	     "\n"
 		 "\n"
@@ -1974,7 +1974,7 @@
 	textalignx 220
 	textaligny 80
 	text "THIS HAS BEEN A BOOMSTICK STUDIOS\nPRODUCTION\n\n"
-	     "Copyright 2000 - 2012"
+	     "Copyright 2000 - 2016"
 	autowrapped
 	visible 1
 	decoration

uifiles/shared.h

@@ -13,7 +13,7 @@
 	itemdef {	\
 	group main	\
 	subgroup "main_title"	\
-	text "REACTION v1.0"	\
+	text "REACTION v1.1"	\
 	forecolor 0 0 .05 1	\
 	style WINDOW_STYLE_EMPTY	\
 	textalign ITEM_ALIGN_CENTER	\
@@ -40,7 +40,7 @@
 	textalignx 120	\
 	textaligny 24	\
 	forecolor 0 0 0.05 1	\
-	text "(c) 2000-2012 Boomstick Studios\n\n\n\n\n"	\
+	text "(c) 2000-2016 Boomstick Studios\n\n\n\n\n"	\
 	     "http://www.rq3.com"	\
 	autowrapped	\
 	visible 1	\
@@ -50,8 +50,8 @@
     itemDef {
 	name "copyright,_common_"
 	autowrapped
-	text "Reaction v1.0\n"
+	text "Reaction v1.1\n"
-	     "Copyright (c) 2000 - 2012 Boomstick Studios\n"
+	     "Copyright (c) 2000 - 2016 Boomstick Studios\n"
 	     "Quake III Arena (c) 1999 - 2000 id Software Inc."
 	//style 0
 	textstyle 3

uifiles/system.menu

@@ -171,14 +171,20 @@ Group # 1 - Graphics
 	BEGIN_OPTION("Quality", "ui_glCustom", ITEM_TYPE_MULTI, 1, 1)
 		alignrect "line" ITEM_ALIGN_CENTER 56 32 112 VSIZE
 		cvarFloatList {
-			"Crappiest"		2
+			"Very Low"		2
-			"Crappy"		3
+			"Low"			3
 			"Normal"		1
 			"High"			4
-			"Highest"		5
+			"Very High"		5
 			"Custom"		0
 		}
-		action { uiScript update "ui_glCustom" }
+		action {
+			uiScript update "ui_glCustom" ;
+			uiScript update "ui_filteringMode" ;
+			uiScript update "ui_shaderLevel" ;
+			uiScript update "ui_shadowMaps" ;
+			uiScript update "r_lodbias"
+		}
 		ASSIGN_HINT("hint_predef")
 	END_OPTION
 	ADD_HINT("hint_predef", "Choose pre-defined graphics settings", "group1")
@@ -205,6 +211,7 @@ Group # 1 - Graphics
 	ADD_HINT("hint_glext", "Enable OpenGL extensions", "group1")
 	*/
 
+
 	// Resolution //
 
 	BEGIN_SIMPLE_OPTION(2, 1)
@@ -227,6 +234,7 @@ Group # 1 - Graphics
 	ADD_HINT("hint_depth", "Choose rendering color depth", "group1")
 	*/
 
+
 	// Fullscreen //
 
 	BEGIN_OPTION("Fullscreen", "ui_RQ3_fullscreen", ITEM_TYPE_YESNO, 3, 1)
@@ -245,7 +253,7 @@ Group # 1 - Graphics
 			"4x MSAA"	4
 		}
 		OPTION_BELOW("gr1_ctrl3")
-		action { uiScript glCustom ; }
+		action { uiScript glCustom }
 		ASSIGN_HINT("hint_aa")
 	END_OPTION
     ADD_HINT("hint_aa", "Use anti-aliasing to reduce jaggedness", "group1")
@@ -269,34 +277,43 @@ Group # 1 - Graphics
     ADD_HINT("hint_texfilter", "Choose texture filtering mode", "group1")
 
 
-    // Per-pixel lighting //
+    // Screen-space ambient occlusion //
 
-	BEGIN_OPTION("Per-pixel Lighting", "ui_shaderLevel", ITEM_TYPE_YESNO, 6, 1)
+	BEGIN_OPTION("SSAO", "r_ssao", ITEM_TYPE_YESNO, 6, 1)
 		OPTION_BELOW("gr1_ctrl5")
-		action { uiScript glCustom ; uiScript update "ui_shaderLevel" }
+		action { uiScript glCustom }
-		ASSIGN_HINT("hint_shader")
+		ASSIGN_HINT("hint_ssao")
     END_OPTION
-    ADD_HINT("hint_shader", "Enable normal mapping and specular reflectivity", "group1")
+    ADD_HINT("hint_ssao", "Enable screen-space ambient occlusion", "group1")
+
+
+    // Physically-based rendering //
+
+	BEGIN_OPTION("PBR", "ui_shaderLevel", ITEM_TYPE_YESNO, 7, 1)
+		OPTION_BELOW("gr1_ctrl6")
+		action { uiScript glCustom ; uiScript update "ui_shaderLevel" }
+		ASSIGN_HINT("hint_pbr")
+    END_OPTION
+    ADD_HINT("hint_pbr", "Enable physically-based rendering", "group1")
 
 
     // Cascaded Shadow Maps //
 
-	BEGIN_OPTION("Cascaded Shadow Maps", "ui_shadowMaps", ITEM_TYPE_MULTI, 7, 1)
+	BEGIN_OPTION("CSM", "ui_shadowMaps", ITEM_TYPE_MULTI, 8, 1)
 		cvarFloatList {
 			"Off"					0
 			"Low"					1
 			"Medium"				2
 			"High"					3
 		}
-		OPTION_BELOW("gr1_ctrl6")
+		OPTION_BELOW("gr1_ctrl7")
 		action { uiScript glCustom ; uiScript update "ui_shadowMaps" }
 		ASSIGN_HINT("hint_csm")
     END_OPTION
-    ADD_HINT("hint_csm", "Enable sunlight and cascaded shadow maps", "group1")
+    ADD_HINT("hint_csm", "Enable cascaded shadow maps", "group1")
 
 
 	// Lightmap/vertex //
-
 	/*
 	BEGIN_OPTION("Lighting", "r_vertexlight", ITEM_TYPE_MULTI, 9, 1)
 		cvarFloatList { "Light Map (high)" 0 "Vertex (low)" 1  }
@@ -310,13 +327,13 @@ Group # 1 - Graphics
 
 	// 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 {
 			"Low"		2
 			"Medium"	1
 			"High"		0
 		}
-		OPTION_BELOW("gr1_ctrl7")
+		OPTION_BELOW("gr1_ctrl8")
 		action { uiScript glCustom ; uiScript update "r_lodbias" }
 		ASSIGN_HINT("hint_geodetail")
 	END_OPTION
@@ -325,15 +342,15 @@ 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
 			"Medium"	1
 			"High"		0
 		}
-		OPTION_BELOW("gr1_ctrl8")
+		OPTION_BELOW("gr1_ctrl9")
-		action { uiScript glCustom ; }
+		action { uiScript glCustom }
 		ASSIGN_HINT("hint_texdetail")
 	END_OPTION
 	ADD_HINT("hint_texdetail", "Choose texture detail level", "group1")
@@ -348,20 +365,38 @@ Group # 1 - Graphics
 			"32 bit"	32
 		}
 		OPTION_BELOW("gr1_ctrl7")
-		action { uiScript glCustom ; }
+		action { uiScript glCustom }
 		ASSIGN_HINT("hint_texquality")
 	END_OPTION
 	ADD_HINT("hint_texquality", "Choose texture quality", "group1")
 	*/
 
-	// Compressed textures //
 
-	BEGIN_OPTION("Compress Textures", "r_ext_compressed_textures", ITEM_TYPE_YESNO, 10, 1)
+	// Compressed textures //
-		OPTION_BELOW("gr1_ctrl9")
+	/*
-		action { uiScript glCustom ; }
+	BEGIN_OPTION("Compress Textures", "r_ext_compressed_textures", ITEM_TYPE_YESNO, 11, 1)
+		OPTION_BELOW("gr1_ctrl10")
+		action { uiScript glCustom }
 		ASSIGN_HINT("hint_compress")
 	END_OPTION
 	ADD_HINT("hint_compress", "Enable texture compression", "group1")
+	*/
+
+
+	// Texture upsampling //
+
+	BEGIN_OPTION("Texture Upsampling", "r_imageUpsample", ITEM_TYPE_MULTI, 11, 1)
+		cvarFloatList {
+			"No (default)"	0
+			"2x Size"		1
+			"4x Size"		2
+			"8x Size"		3
+		}
+		OPTION_BELOW("gr1_ctrl10")
+		action { uiScript glCustom }
+		ASSIGN_HINT("hint_upsample")
+	END_OPTION
+	ADD_HINT("hint_upsample", "Use interpolation to artificially increase the resolution of all textures (experimental)", "group1")
 
 
 	// APPLY //
@@ -369,7 +404,7 @@ Group # 1 - Graphics
 	itemdef {
 	name "btn_apply,fade_alpha,allgroups,group1"
 	style WINDOW_STYLE_EMPTY
-	alignrect "gr1_ctrl10" ITEM_ALIGN_RIGHT 0 24 80 VSIZE
+	alignrect "gr1_ctrl11" ITEM_ALIGN_RIGHT 0 24 80 VSIZE
 	type ITEM_TYPE_BUTTON
 	text "^_A^_pply >"
 	shortcutKey "A"
@@ -529,6 +564,7 @@ Group # 3 - Misc
 	END_OPTION
 	ADD_HINT("hint_openal", "Enable OpenAL sound rendering", "group3")
 
+
 	// Sound volume //
 
 	BEGIN_SLIDER("Sound Volume", "s_volume", 0.7, 0, 1, 6, 3)