Added baseq2 files

abalfoort · Jun 9, 2023 · 314b076 · 314b076
1 parent 7d53662
commit 314b076
Show file tree

Hide file tree

Showing 34 changed files with 2,772 additions and 7 deletions.
diff --git a/baseq2/cameras.txt b/baseq2/cameras.txt
@@ -0,0 +1,36 @@
+base3
+(-347.3, -278.2, -90.1) (-0.489, -0.685, -0.540)
+(1171.9, -1010.7, -369.2) (-0.764, 0.588, -0.266)
+(1004.4, 1200.4, -694.4) (-0.713, -0.619, -0.329)
+
+jail1
+(-1049.7, -121.4, 115.1) (0.590, -0.539, -0.601)
+(-2167.2, -573.2, 305.4) (-0.224, 0.900, -0.374)
+(-1550.7, -875.6, 8.4) (-0.835, -0.441, -0.329)
+
+jail2
+(-1095.1, -793.7, -102.4) (0.738, 0.557, -0.380)
+(-424.1, 296.2, 355.7) (0.898, 0.115, -0.424)
+(-1342.3, 321.9, 280.1) (-0.700, -0.004, -0.714)
+(1102.8, 173.4, 226.9) (0.626, 0.642, -0.442)
+
+jail3
+(-603.2, -514.6, 951.3) (0.288, 0.930, -0.228)
+(691.6, -887.2, 895.8) (-0.694, 0.484, -0.533)
+(1404.9, -1161.3, 513.6) (0.538, 0.843, 0.005)
+(-618.4, 911.7, 352.7) (0.600, 0.656, -0.458)
+
+jail5
+(94.6, 128.2, 325.2) (-0.002, -0.733, -0.681)
+(207.4, 1169.9, 308.3) (-0.615, -0.392, -0.684)
+
+lab
+# the only monitor in this map has two connected faces - can only have one camera here
+(-2008.9, 678.2, 206.1) (0.001, -0.810, -0.586)
+
+fact2
+(1302.4, -2342.9, -70.1) (-0.672, 0.635, -0.381)
+(139.6, -1240.8, 262.9) (-0.532, -0.722, -0.442)
+(-529.9, -1038.6, 201.4) (-0.565, 0.653, -0.504)
+(-913.2, 215.9, 230.7) (-0.814, -0.457, -0.358)
+(618.1, -2516.6, -11.7) (-0.692, -0.575, -0.436)
diff --git a/baseq2/materials.csv b/baseq2/materials.csv
diff --git a/baseq2/materials/baseq2.mat b/baseq2/materials/baseq2.mat
@@ -183,12 +183,22 @@ models/items/band/skin:
 	emissive_factor 0.1
 	base_factor 2.5
 
+models/items/band/skin_rgh:
+	texture_base models/items/band/skin_rgh.tga
+	emissive_factor 0.1
+	base_factor 2.5
+
 models/items/breather/skin:
 	texture_base models/items/breather/skin.tga
 	texture_normals models/items/breather/skin_n.tga
 	emissive_factor 0.1
 	base_factor 2.5
 
+models/items/breather/skin_rgh:
+	texture_base models/items/breather/skin_rgh.tga
+	emissive_factor 0.1
+	base_factor 2.5
+
 models/items/c_head/skin:
 	texture_base models/items/c_head/skin.tga
 	texture_normals models/items/c_head/skin_n.tga
@@ -347,6 +357,16 @@ models/items/silencer/skin:
 	emissive_factor 0.1
 	base_factor 2.5
 
+models/menu/idlogo:
+	texture_base models/menu/idlogo.pcx
+	emissive_factor 0.1
+	base_factor 2.5
+
+models/menu/idlogo_rgh:
+	texture_base models/menu/idlogo_rgh.pcx
+	emissive_factor 0.1
+	base_factor 2.5
+
 models/misc/skin:
 	texture_base models/misc/skin.pcx
 	emissive_factor 0.1
@@ -4232,31 +4252,28 @@ textures/e1u2/hint:
 textures/e1u2/hvy_dr1_2:
 	texture_base overrides/hvy_dr1_2.tga
 	texture_normals overrides/hvy_dr1_2_n.tga
-	roughness_override 0.3
 	base_factor 2.5
 
 textures/e1u2/hvy_dr2_1:
 	texture_base overrides/hvy_dr2_1.tga
 	texture_normals overrides/hvy_dr2_1_n.tga
-	roughness_override 0.3
 	base_factor 2.5
 
 textures/e1u2/hvy_dr3_1:
 	texture_base overrides/hvy_dr3_1.tga
 	texture_normals overrides/hvy_dr3_1_n.tga
-	roughness_override 0.3
 	base_factor 2.5
 
 textures/e1u2/hvy_dr3_2:
 	texture_base overrides/hvy_dr3_2.tga
 	texture_normals overrides/hvy_dr3_2_n.tga
-	roughness_override 0.3
+	roughness_override 0.299
 	base_factor 2.5
+	specular_factor 0.2
 
 textures/e1u2/hvy_dr4_1:
 	texture_base overrides/hvy_dr4_1.tga
 	texture_normals overrides/hvy_dr4_1_n.tga
-	roughness_override 0.3
 	base_factor 2.5
 
 textures/e1u2/keydran1_1:

diff --git a/baseq2/pics/conback.png b/baseq2/pics/conback.png
diff --git a/baseq2/pics/conchars.png b/baseq2/pics/conchars.png
diff --git a/baseq2/pics/m_banner_addressbook.tga b/baseq2/pics/m_banner_addressbook.tga
diff --git a/baseq2/pics/m_banner_customize.tga b/baseq2/pics/m_banner_customize.tga
diff --git a/baseq2/pics/m_banner_game.tga b/baseq2/pics/m_banner_game.tga
diff --git a/baseq2/pics/m_banner_join_server.tga b/baseq2/pics/m_banner_join_server.tga
diff --git a/baseq2/pics/m_banner_load_game.tga b/baseq2/pics/m_banner_load_game.tga
diff --git a/baseq2/pics/m_banner_multiplayer.tga b/baseq2/pics/m_banner_multiplayer.tga
diff --git a/baseq2/pics/m_banner_options.tga b/baseq2/pics/m_banner_options.tga
diff --git a/baseq2/pics/m_banner_plauer_setup.tga b/baseq2/pics/m_banner_plauer_setup.tga
diff --git a/baseq2/pics/m_banner_save_game.tga b/baseq2/pics/m_banner_save_game.tga
diff --git a/baseq2/pics/m_banner_start_server.tga b/baseq2/pics/m_banner_start_server.tga
diff --git a/baseq2/pics/m_banner_video.tga b/baseq2/pics/m_banner_video.tga
diff --git a/baseq2/pics/m_main_footer.png b/baseq2/pics/m_main_footer.png
diff --git a/baseq2/pics/m_main_game.tga b/baseq2/pics/m_main_game.tga
diff --git a/baseq2/pics/m_main_game_sel.tga b/baseq2/pics/m_main_game_sel.tga
diff --git a/baseq2/pics/m_main_logo.tga b/baseq2/pics/m_main_logo.tga
diff --git a/baseq2/pics/m_main_multiplayer.tga b/baseq2/pics/m_main_multiplayer.tga
diff --git a/baseq2/pics/m_main_multiplayer_sel.tga b/baseq2/pics/m_main_multiplayer_sel.tga
diff --git a/baseq2/pics/m_main_options.tga b/baseq2/pics/m_main_options.tga
diff --git a/baseq2/pics/m_main_options_sel.tga b/baseq2/pics/m_main_options_sel.tga
diff --git a/baseq2/pics/m_main_plaque.tga b/baseq2/pics/m_main_plaque.tga
diff --git a/baseq2/pics/m_main_quit.tga b/baseq2/pics/m_main_quit.tga
diff --git a/baseq2/pics/m_main_quit_sel.tga b/baseq2/pics/m_main_quit_sel.tga
diff --git a/baseq2/pics/m_main_video.tga b/baseq2/pics/m_main_video.tga
diff --git a/baseq2/pics/m_main_video_sel.tga b/baseq2/pics/m_main_video_sel.tga
diff --git a/baseq2/pics/pause.tga b/baseq2/pics/pause.tga
diff --git a/baseq2/pics/rtx_on.png b/baseq2/pics/rtx_on.png
diff --git a/baseq2/pics/yn.tga b/baseq2/pics/yn.tga
diff --git a/baseq2/pt_toggles.cfg b/baseq2/pt_toggles.cfg
@@ -1,7 +1,7 @@
 bind f2 "toggle pt_reflect_refract"
 bind f3 "toggle pt_direct_sun_light"
-bind f4 "toggle pt_direct_polygon_lights; toggle pt_direct_dyn_lights"
+bind f4 "toggle pt_direct_polygon_lights; toggle pt_direct_sphere_lights"
 bind f5 "toggle pt_num_bounce_rays 0 1"
 bind f6 "toggle sun_bounce 0 1.0"
-bind f7 "toggle pt_indirect_polygon_lights; toggle pt_indirect_dyn_lights"
+bind f7 "toggle pt_indirect_polygon_lights; toggle pt_indirect_sphere_lights"
 bind f8 "toggle flt_enable"