diff --git a/baseq3r/maps/q3r_david5.aas b/baseq3r/maps/q3r_david5.aas index 429f2b00..cce9bc83 100644 Binary files a/baseq3r/maps/q3r_david5.aas and b/baseq3r/maps/q3r_david5.aas differ diff --git a/baseq3r/maps/q3r_david5.bsp b/baseq3r/maps/q3r_david5.bsp index fef7afc9..a66e9c9c 100644 Binary files a/baseq3r/maps/q3r_david5.bsp and b/baseq3r/maps/q3r_david5.bsp differ diff --git a/baseq3r/maps/q3r_david5.map b/baseq3r/maps/q3r_david5.map index 3b1a6456..ee6c00b7 100644 --- a/baseq3r/maps/q3r_david5.map +++ b/baseq3r/maps/q3r_david5.map @@ -9,48 +9,48 @@ { brushDef { -( 566.0239868164 -647.9409790039 -644 ) ( 517.8859863281 -696.0800170898 -644 ) ( 557.8859863281 -736.0800170898 -644 ) ( ( 0.0054270201 -0.0056198402 0.2968726158 ) ( 0.00561985 0.0054270001 0.1484336853 ) ) base_wall/c_met7_2 0 0 0 -( 606.0239868164 -687.9409790039 -384 ) ( 557.8859863281 -736.0800170898 -384 ) ( 517.8859863281 -696.0800170898 -384 ) ( ( 0.0054270201 0.00561985 0.9843733907 ) ( -0.00561983 0.0054270299 0.851565361 ) ) base_wall/c_met7_2 0 0 0 -( 517.8859863281 -696.0800170898 -644 ) ( 566.0239868164 -647.9409790039 -644 ) ( 566.0239868164 -647.9409790039 -384 ) ( ( 0.0156249302 0 0.0378571115 ) ( 0 0.015625 0.9999990463 ) ) base_light/baslt4_1_2k 0 0 0 -( 606.0239868164 -687.9409790039 -644 ) ( 557.8859863281 -736.0800170898 -644 ) ( 557.8859863281 -736.0800170898 -384 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( 557.8859863281 -736.0800170898 -644 ) ( 517.8859863281 -696.0800170898 -644 ) ( 517.8859863281 -696.0800170898 -384 ) ( ( 0.0078000999 0 0.8624949455 ) ( 0 0.0078125298 0.8437385559 ) ) base_wall/c_met7_2 0 0 0 -( 566.0239868164 -647.9409790039 -644 ) ( 606.0239868164 -687.9409790039 -644 ) ( 606.0239868164 -687.9409790039 -384 ) ( ( 0.0078248596 -0 0.9401912689 ) ( 0 0.0078125 0.6562492847 ) ) base_wall/c_met7_2 0 0 0 +( 566.0239868164 -647.9409790039 -644 ) ( 517.8859863281 -696.0800170898 -644 ) ( 557.8859863281 -736.0800170898 -644 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( 606.0239868164 -687.9409790039 -384 ) ( 557.8859863281 -736.0800170898 -384 ) ( 517.8859863281 -696.0800170898 -384 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( 517.8859863281 -696.0800170898 -644 ) ( 566.0239868164 -647.9409790039 -644 ) ( 566.0239868164 -647.9409790039 -384 ) ( ( 0.0146890059 0 0.1490171552 ) ( -0 0.0038461538 0.5230768919 ) ) base_light/baslt4_1_2k 0 0 0 +( 606.0239868164 -687.9409790039 -644 ) ( 557.8859863281 -736.0800170898 -644 ) ( 557.8859863281 -736.0800170898 -384 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( 557.8859863281 -736.0800170898 -644 ) ( 517.8859863281 -696.0800170898 -644 ) ( 517.8859863281 -696.0800170898 -384 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( 566.0239868164 -647.9409790039 -644 ) ( 606.0239868164 -687.9409790039 -644 ) ( 606.0239868164 -687.9409790039 -384 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 } } // brush 1 { brushDef { -( -835.716003418 753.9169921875 -644 ) ( -883.8580322266 705.7750244141 -644 ) ( -843.8580322266 665.7750244141 -644 ) ( ( -0.0054270802 0.0056198998 0.8593761325 ) ( -0.0056198998 -0.00542707 0.781329155 ) ) base_wall/c_met7_2 0 0 0 -( -883.8580322266 705.7750244141 -384 ) ( -835.716003418 753.9169921875 -384 ) ( -795.716003418 713.9169921875 -384 ) ( ( -0.0054270499 -0.00561987 0.5468710065 ) ( 0.0056198798 -0.0054270499 0.21870327 ) ) base_wall/c_met7_2 0 0 0 -( -795.716003418 713.9169921875 -644 ) ( -843.8580322266 665.7750244141 -644 ) ( -843.8580322266 665.7750244141 -384 ) ( ( 0.0156249199 0 0.8978190422 ) ( 0 0.015625 0.00000048 ) ) base_light/baslt4_1_2k 0 0 0 -( -883.8580322266 705.7750244141 -644 ) ( -835.716003418 753.9169921875 -644 ) ( -835.716003418 753.9169921875 -384 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( -835.716003418 753.9169921875 -644 ) ( -795.716003418 713.9169921875 -644 ) ( -795.716003418 713.9169921875 -384 ) ( ( 0.00781246 -0 0.2195825577 ) ( 0 0.0078125196 0.8437459469 ) ) base_wall/c_met7_2 0 0 0 -( -843.8580322266 665.7750244141 -644 ) ( -883.8580322266 705.7750244141 -644 ) ( -883.8580322266 705.7750244141 -384 ) ( ( 0.00781248 0 0.5628910065 ) ( 0 0.0078125196 0.6562414169 ) ) base_wall/c_met7_2 0 0 0 +( -835.716003418 753.9169921875 -644 ) ( -883.8580322266 705.7750244141 -644 ) ( -843.8580322266 665.7750244141 -644 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( -883.8580322266 705.7750244141 -384 ) ( -835.716003418 753.9169921875 -384 ) ( -795.716003418 713.9169921875 -384 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( -795.716003418 713.9169921875 -644 ) ( -843.8580322266 665.7750244141 -644 ) ( -843.8580322266 665.7750244141 -384 ) ( ( 0.0146879395 0 0.8495696783 ) ( -0 0.0038461538 0.5230768919 ) ) base_light/baslt4_1_2k 0 0 0 +( -883.8580322266 705.7750244141 -644 ) ( -835.716003418 753.9169921875 -644 ) ( -835.716003418 753.9169921875 -384 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( -835.716003418 753.9169921875 -644 ) ( -795.716003418 713.9169921875 -644 ) ( -795.716003418 713.9169921875 -384 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( -843.8580322266 665.7750244141 -644 ) ( -883.8580322266 705.7750244141 -644 ) ( -883.8580322266 705.7750244141 -384 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 } } // brush 2 { brushDef { -( 613.9409790039 722.7449951172 -632 ) ( 565.7990112305 770.8869628906 -632 ) ( 525.7990112305 730.8869628906 -632 ) ( ( 0.0056198402 0.0054270201 0.7109405398 ) ( -0.0054270201 0.0056198402 0.3828125 ) ) base_wall/c_met7_2 0 0 0 -( 573.9409790039 682.7449951172 -372 ) ( 525.7990112305 730.8869628906 -372 ) ( 565.7990112305 770.8869628906 -372 ) ( ( 0.0056198402 -0.0054270201 0.3984334469 ) ( 0.0054270201 0.00561983 0.6171855927 ) ) base_wall/c_met7_2 0 0 0 -( 573.9409790039 682.7449951172 -632 ) ( 525.7990112305 730.8869628906 -632 ) ( 525.7990112305 730.8869628906 -372 ) ( ( 0.0156452004 0 0.1992480755 ) ( 0 0.015625 0.1874995232 ) ) base_light/baslt4_1_2k 0 0 0 -( 565.7990112305 770.8869628906 -632 ) ( 613.9409790039 722.7449951172 -632 ) ( 613.9409790039 722.7449951172 -372 ) ( ( 0.00276214 0 0.5471174717 ) ( 0 0.0096153803 1.5312503576 ) ) common/caulk 0 0 0 -( 613.9409790039 722.7449951172 -632 ) ( 573.9409790039 682.7449951172 -632 ) ( 573.9409790039 682.7449951172 -372 ) ( ( 0.0078124502 -0 0.6180000305 ) ( 0 0.0078124902 0.9375035763 ) ) base_wall/c_met7_2 0 0 0 -( 525.7990112305 730.8869628906 -632 ) ( 565.7990112305 770.8869628906 -632 ) ( 565.7990112305 770.8869628906 -372 ) ( ( 0.0078124502 0 0.1636991501 ) ( 0 0.0078124902 0.7500047684 ) ) base_wall/c_met7_2 0 0 0 +( 613.9409790039 722.7449951172 -632 ) ( 565.7990112305 770.8869628906 -632 ) ( 525.7990112305 730.8869628906 -632 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( 573.9409790039 682.7449951172 -372 ) ( 525.7990112305 730.8869628906 -372 ) ( 565.7990112305 770.8869628906 -372 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( 573.9409790039 682.7449951172 -632 ) ( 525.7990112305 730.8869628906 -632 ) ( 525.7990112305 730.8869628906 -372 ) ( ( 0.0146879526 0 0.1300332546 ) ( -0 0.0038461538 0.5692307949 ) ) base_light/baslt4_1_2k 0 0 0 +( 565.7990112305 770.8869628906 -632 ) ( 613.9409790039 722.7449951172 -632 ) ( 613.9409790039 722.7449951172 -372 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( 613.9409790039 722.7449951172 -632 ) ( 573.9409790039 682.7449951172 -632 ) ( 573.9409790039 682.7449951172 -372 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( 525.7990112305 730.8869628906 -632 ) ( 565.7990112305 770.8869628906 -632 ) ( 565.7990112305 770.8869628906 -372 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 } } // brush 3 { brushDef { -( -883.8580322266 -676.1419677734 -632 ) ( -835.716003418 -724.283996582 -632 ) ( -795.716003418 -684.283996582 -632 ) ( ( -0.0055243201 -0.0055243201 0.4609458447 ) ( 0.0055243201 -0.0055243201 0.6172618866 ) ) base_wall/c_met7_2 0 0 0 -( -835.716003418 -724.283996582 -372 ) ( -883.8580322266 -676.1419677734 -372 ) ( -843.8580322266 -636.1419677734 -372 ) ( ( -0.0055242698 0.0055242698 0.1484428644 ) ( -0.0055242698 -0.00552426 0.3828244209 ) ) base_wall/c_met7_2 0 0 0 -( -843.8580322266 -636.1419677734 -632 ) ( -795.716003418 -684.283996582 -632 ) ( -795.716003418 -684.283996582 -372 ) ( ( 0.0156249302 -0 0.7107293606 ) ( 0 0.015625 0.1875009537 ) ) base_light/baslt4_1_2k 0 0 0 -( -835.716003418 -724.283996582 -632 ) ( -883.8580322266 -676.1419677734 -632 ) ( -883.8580322266 -676.1419677734 -372 ) ( ( -0.00138107 0 0.4451908171 ) ( -0 0.0048076902 0.7656248808 ) ) base_wall/c_met7_2 0 0 0 -( -883.8580322266 -676.1419677734 -632 ) ( -843.8580322266 -636.1419677734 -632 ) ( -843.8580322266 -636.1419677734 -372 ) ( ( 0.00781248 0 0.3820142746 ) ( 0 0.0078125196 0.9374938011 ) ) base_wall/c_met7_2 0 0 0 -( -795.716003418 -684.283996582 -632 ) ( -835.716003418 -724.283996582 -632 ) ( -835.716003418 -724.283996582 -372 ) ( ( 0.0078266701 0 0.4120731354 ) ( 0 0.0078125196 0.7499845028 ) ) base_wall/c_met7_2 0 0 0 +( -883.8580322266 -676.1419677734 -632 ) ( -835.716003418 -724.283996582 -632 ) ( -795.716003418 -684.283996582 -632 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( -835.716003418 -724.283996582 -372 ) ( -883.8580322266 -676.1419677734 -372 ) ( -843.8580322266 -636.1419677734 -372 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( -843.8580322266 -636.1419677734 -632 ) ( -795.716003418 -684.283996582 -632 ) ( -795.716003418 -684.283996582 -372 ) ( ( 0.0146879265 0 0.8426744938 ) ( -0 0.0038461538 0.5692307949 ) ) base_light/baslt4_1_2k 0 0 0 +( -835.716003418 -724.283996582 -632 ) ( -883.8580322266 -676.1419677734 -632 ) ( -883.8580322266 -676.1419677734 -372 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( -883.8580322266 -676.1419677734 -632 ) ( -843.8580322266 -636.1419677734 -632 ) ( -843.8580322266 -636.1419677734 -372 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 +( -795.716003418 -684.283996582 -632 ) ( -835.716003418 -724.283996582 -632 ) ( -835.716003418 -724.283996582 -372 ) ( ( 0.0078125 0 -0 ) ( -0 0.0078125 0 ) ) q3r_building/concrete02 0 0 0 } } // brush 4 @@ -1589,24 +1589,24 @@ brushDef { brushDef { -( 874 -254 -208 ) ( 874 -254 -728 ) ( 874 290 -728 ) ( ( 0.00195312 0 0.4882810116 ) ( 0 0.00195312 0.609375 ) ) base_door/shinymetaldoor_outside3a2 0 0 0 -( 886 290 -208 ) ( 886 290 -728 ) ( 886 -254 -728 ) ( ( 0.00195312 0 0.51171875 ) ( 0 0.00195312 0.609375 ) ) base_door/shinymetaldoor_outside3a2 0 0 0 -( 886 -254 -208 ) ( 886 -254 -728 ) ( 874 -254 -728 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( 874 290 -208 ) ( 874 290 -728 ) ( 886 290 -728 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( 874 290 -728 ) ( 874 -254 -728 ) ( 886 -254 -728 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( 874 -254 -208 ) ( 874 290 -208 ) ( 886 290 -208 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 +( 874 -254 -208 ) ( 874 -254 -728 ) ( 874 290 -728 ) ( ( 0.0018382354 0 0.5330882668 ) ( 0 0.001923077 0.6000000238 ) ) base_door/shinymetaldoor_outside3a2 0 0 0 +( 886 290 -208 ) ( 886 290 -728 ) ( 886 -254 -728 ) ( ( 0.0018382352 0 0.4669118226 ) ( 0 0.001923077 0.6000000238 ) ) base_door/shinymetaldoor_outside3a2 0 0 0 +( 886 -254 -208 ) ( 886 -254 -728 ) ( 874 -254 -728 ) ( ( 0.0833333358 0 0.1666641235 ) ( 0 0.0019230769 0.6000000238 ) ) common/caulk 0 0 0 +( 874 290 -208 ) ( 874 290 -728 ) ( 886 290 -728 ) ( ( 0.0833333358 0 0.8333358765 ) ( 0 0.0019230769 0.6000000238 ) ) common/caulk 0 0 0 +( 874 290 -728 ) ( 874 -254 -728 ) ( 886 -254 -728 ) ( ( 0.0018382353 0 0.466911763 ) ( 0 0.0833333358 0.8333358765 ) ) common/caulk 0 0 0 +( 874 -254 -208 ) ( 874 290 -208 ) ( 886 290 -208 ) ( ( 0.0018382353 0 0.466911763 ) ( 0 0.0833333358 0.1666641235 ) ) common/caulk 0 0 0 } } // brush 132 { brushDef { -( -1142 -254 -208 ) ( -1142 -254 -728 ) ( -1142 290 -728 ) ( ( 0.0019531299 -0 0.5820314288 ) ( 0 0.0019531299 0.6093749404 ) ) base_door/shinymetaldoor_outside3a2 0 0 0 -( -1130 290 -208 ) ( -1130 290 -728 ) ( -1130 -254 -728 ) ( ( 0.00195312 0 0.41796875 ) ( 0 0.00195312 0.609375 ) ) base_door/shinymetaldoor_outside3a2 0 0 0 -( -1130 -254 -208 ) ( -1130 -254 -728 ) ( -1142 -254 -728 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( -1142 290 -208 ) ( -1142 290 -728 ) ( -1130 290 -728 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( -1142 290 -728 ) ( -1142 -254 -728 ) ( -1130 -254 -728 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( -1142 -254 -208 ) ( -1142 290 -208 ) ( -1130 290 -208 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 +( -1142 -254 -208 ) ( -1142 -254 -728 ) ( -1142 290 -728 ) ( ( 0.0018382353 0 0.5330882072 ) ( 0 0.0019230767 0.6000000238 ) ) base_door/shinymetaldoor_outside3a2 0 0 0 +( -1130 290 -208 ) ( -1130 290 -728 ) ( -1130 -254 -728 ) ( ( 0.0018382352 0 0.466911763 ) ( 0 0.001923077 0.6000000238 ) ) base_door/shinymetaldoor_outside3a2 0 0 0 +( -1130 -254 -208 ) ( -1130 -254 -728 ) ( -1142 -254 -728 ) ( ( 0.0833333358 0 0.1666717529 ) ( 0 0.0019230769 0.6000000238 ) ) common/caulk 0 0 0 +( -1142 290 -208 ) ( -1142 290 -728 ) ( -1130 290 -728 ) ( ( 0.0833333358 0 0.8333282471 ) ( 0 0.0019230769 0.6000000238 ) ) common/caulk 0 0 0 +( -1142 290 -728 ) ( -1142 -254 -728 ) ( -1130 -254 -728 ) ( ( 0.0018382353 0 0.466911763 ) ( 0 0.0833333358 0.8333282471 ) ) common/caulk 0 0 0 +( -1142 -254 -208 ) ( -1142 290 -208 ) ( -1130 290 -208 ) ( ( 0.0018382353 0 0.466911763 ) ( 0 0.0833333358 0.1666717529 ) ) common/caulk 0 0 0 } } // brush 133 @@ -1709,24 +1709,24 @@ brushDef { brushDef { -( -408 1020 -196 ) ( -408 1020 -716 ) ( -408 1032 -716 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( 136 1032 -196 ) ( 136 1032 -716 ) ( 136 1020 -716 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( 136 1020 -196 ) ( 136 1020 -716 ) ( -408 1020 -716 ) ( ( 0.0019531299 0 0.7187501192 ) ( 0 0.0019531299 0.6328124404 ) ) base_door/shinymetaldoor_outside3a2 0 0 0 -( -408 1032 -196 ) ( -408 1032 -716 ) ( 136 1032 -716 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( -408 1032 -716 ) ( -408 1020 -716 ) ( 136 1020 -716 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( -408 1020 -196 ) ( -408 1032 -196 ) ( 136 1032 -196 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 +( -408 1020 -196 ) ( -408 1020 -716 ) ( -408 1032 -716 ) ( ( 0.0833333358 0 0 ) ( 0 0.0019230769 0.6230769157 ) ) common/caulk 0 0 0 +( 136 1032 -196 ) ( 136 1032 -716 ) ( 136 1020 -716 ) ( ( 0.0833333358 0 -0 ) ( 0 0.0019230769 0.6230769157 ) ) common/caulk 0 0 0 +( 136 1020 -196 ) ( 136 1020 -716 ) ( -408 1020 -716 ) ( ( 0.0018382353 0 0.7499999404 ) ( 0 0.001923077 0.6230768561 ) ) base_door/shinymetaldoor_outside3a2 0 0 0 +( -408 1032 -196 ) ( -408 1032 -716 ) ( 136 1032 -716 ) ( ( 0.0018382353 0 0.25 ) ( 0 0.0019230769 0.6230769157 ) ) common/caulk 0 0 0 +( -408 1032 -716 ) ( -408 1020 -716 ) ( 136 1020 -716 ) ( ( 0.0833333358 0 -0 ) ( 0 0.0018382353 0.25 ) ) common/caulk 0 0 0 +( -408 1020 -196 ) ( -408 1032 -196 ) ( 136 1032 -196 ) ( ( 0.0833333358 0 -0 ) ( 0 0.0018382353 0.75 ) ) common/caulk 0 0 0 } } // brush 142 { brushDef { -( -404 -996 -196 ) ( -404 -996 -716 ) ( -404 -984 -716 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( 140 -984 -196 ) ( 140 -984 -716 ) ( 140 -996 -716 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( 140 -996 -196 ) ( 140 -996 -716 ) ( -404 -996 -716 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( -404 -984 -196 ) ( -404 -984 -716 ) ( 140 -984 -716 ) ( ( 0.00195312 -0 0.1953123808 ) ( 0 0.00195312 0.6328125 ) ) base_door/shinymetaldoor_outside3a2 0 0 0 -( -404 -984 -716 ) ( -404 -996 -716 ) ( 140 -996 -716 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 -( -404 -996 -196 ) ( -404 -984 -196 ) ( 140 -984 -196 ) ( ( 0.0625 0 0 ) ( 0 0.0625 0 ) ) common/caulk 0 0 0 +( -404 -996 -196 ) ( -404 -996 -716 ) ( -404 -984 -716 ) ( ( 0.0833333358 0 -0 ) ( 0 0.0019230769 0.6230769157 ) ) common/caulk 0 0 0 +( 140 -984 -196 ) ( 140 -984 -716 ) ( 140 -996 -716 ) ( ( 0.0833333358 0 0 ) ( 0 0.0019230769 0.6230769157 ) ) common/caulk 0 0 0 +( 140 -996 -196 ) ( 140 -996 -716 ) ( -404 -996 -716 ) ( ( 0.0018382353 0 0.7426470518 ) ( 0 0.0019230769 0.6230769157 ) ) common/caulk 0 0 0 +( -404 -984 -196 ) ( -404 -984 -716 ) ( 140 -984 -716 ) ( ( 0.0018382354 0 0.2573529482 ) ( 0 0.001923077 0.6230768561 ) ) base_door/shinymetaldoor_outside3a2 0 0 0 +( -404 -984 -716 ) ( -404 -996 -716 ) ( 140 -996 -716 ) ( ( 0.0833333358 0 0 ) ( 0 0.0018382353 0.2573529482 ) ) common/caulk 0 0 0 +( -404 -996 -196 ) ( -404 -984 -196 ) ( 140 -984 -196 ) ( ( 0.0833333358 0 0 ) ( 0 0.0018382353 0.7426470518 ) ) common/caulk 0 0 0 } } // brush 143 @@ -2394,28 +2394,28 @@ brushDef // entity 12 { "classname" "light" -"origin" "-708 -8 268" +"origin" "-700 40 284" "light" "300" "_color" "1 1 1" } // entity 13 { "classname" "misc_model" -"origin" "-788 40 296" +"origin" "-788 40 400" "model" "/models/mapobjects/spotlamp/spotlamp.md3" "angle" "360" } // entity 14 { "classname" "misc_model" -"origin" "500.2 41.1 300" +"origin" "500.2 41.1 404" "model" "/models/mapobjects/spotlamp/spotlamp.md3" "angle" "180" } // entity 15 { "classname" "light" -"origin" "432 36 248" +"origin" "432 40 284" "light" "300" "_color" "1 1 1" } @@ -2649,3 +2649,31 @@ brushDef "spawnflags" "5" "angle" "-45" } +// entity 48 +{ +"classname" "misc_model" +"origin" "-144 684 400" +"model" "/models/mapobjects/spotlamp/spotlamp.md3" +"angle" "-90" +} +// entity 49 +{ +"classname" "misc_model" +"origin" "-142.9 -604.2 404" +"model" "/models/mapobjects/spotlamp/spotlamp.md3" +"angle" "90" +} +// entity 50 +{ +"classname" "light" +"origin" "-144 -536 284" +"light" "300" +"_color" "1 1 1" +} +// entity 51 +{ +"classname" "light" +"origin" "-144 596 284" +"light" "300" +"_color" "1 1 1" +} diff --git a/baseq3r/maps/q3r_mk.aas b/baseq3r/maps/q3r_mk.aas index 32aeefd4..535adcd0 100644 Binary files a/baseq3r/maps/q3r_mk.aas and b/baseq3r/maps/q3r_mk.aas differ diff --git a/baseq3r/maps/q3r_mk.bsp b/baseq3r/maps/q3r_mk.bsp index 0c63a645..74093d56 100644 Binary files a/baseq3r/maps/q3r_mk.bsp and b/baseq3r/maps/q3r_mk.bsp differ diff --git a/baseq3r/maps/q3r_sk1.aas b/baseq3r/maps/q3r_sk1.aas index 788be1a7..20c79f2f 100644 Binary files a/baseq3r/maps/q3r_sk1.aas and b/baseq3r/maps/q3r_sk1.aas differ diff --git a/baseq3r/maps/q3r_sk1.bsp b/baseq3r/maps/q3r_sk1.bsp index 4f99080d..99da6c43 100644 Binary files a/baseq3r/maps/q3r_sk1.bsp and b/baseq3r/maps/q3r_sk1.bsp differ diff --git a/baseq3r/maps/q3r_sk1.map b/baseq3r/maps/q3r_sk1.map index af4cb6c1..6401ec7c 100644 --- a/baseq3r/maps/q3r_sk1.map +++ b/baseq3r/maps/q3r_sk1.map @@ -155,30 +155,30 @@ } // brush 16 { -( -3524 1624 -100 ) ( -3524 1624 -104 ) ( -3524 3788 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( 1396 3788 -100 ) ( 1396 3788 -104 ) ( 1396 1624 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( 1396 1624 -100 ) ( 1396 1624 -104 ) ( -3524 1624 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -3524 3788 -100 ) ( -3524 3788 -104 ) ( 1396 3788 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -3524 3788 -104 ) ( -3524 1624 -104 ) ( 1396 1624 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -3524 1624 -100 ) ( -3524 3788 -100 ) ( 1396 3788 -100 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -3524 1624 0 ) ( -3524 1624 -4 ) ( -3524 3788 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 1396 3788 0 ) ( 1396 3788 -4 ) ( 1396 1624 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 1396 1624 0 ) ( 1396 1624 -4 ) ( -3524 1624 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -3524 3788 0 ) ( -3524 3788 -4 ) ( 1396 3788 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -3524 3788 -4 ) ( -3524 1624 -4 ) ( 1396 1624 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -3524 1624 0 ) ( -3524 3788 0 ) ( 1396 3788 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0 } // brush 17 { -( 1392 -500 -100 ) ( 1392 -500 -104 ) ( 1392 3788 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( 3520 3788 -100 ) ( 3520 3788 -104 ) ( 3520 -500 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( 3520 -500 -100 ) ( 3520 -500 -104 ) ( 1392 -500 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( 1392 3788 -100 ) ( 1392 3788 -104 ) ( 3520 3788 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( 1392 3788 -104 ) ( 1392 -500 -104 ) ( 3520 -500 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( 1392 -500 -100 ) ( 1392 3788 -100 ) ( 3520 3788 -100 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 1392 -500 0 ) ( 1392 -500 -4 ) ( 1392 3788 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 3520 3788 0 ) ( 3520 3788 -4 ) ( 3520 -500 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 3520 -500 0 ) ( 3520 -500 -4 ) ( 1392 -500 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 1392 3788 0 ) ( 1392 3788 -4 ) ( 3520 3788 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 1392 3788 -4 ) ( 1392 -500 -4 ) ( 3520 -500 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 1392 -500 0 ) ( 1392 3788 0 ) ( 3520 3788 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0 } // brush 18 { -( -3516 -1284 -100 ) ( -3516 -1284 -104 ) ( -3516 -500 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( 2180 -500 -100 ) ( 2180 -500 -104 ) ( 2180 -1284 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( 2180 -1284 -100 ) ( 2180 -1284 -104 ) ( -3516 -1284 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -3516 -500 -100 ) ( -3516 -500 -104 ) ( 2180 -500 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -3516 -500 -104 ) ( -3516 -1284 -104 ) ( 2180 -1284 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -3516 -1284 -100 ) ( -3516 -500 -100 ) ( 2180 -500 -100 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -3516 -1284 0 ) ( -3516 -1284 -4 ) ( -3516 -500 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 2180 -500 0 ) ( 2180 -500 -4 ) ( 2180 -1284 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( 2180 -1284 0 ) ( 2180 -1284 -4 ) ( -3516 -1284 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -3516 -500 0 ) ( -3516 -500 -4 ) ( 2180 -500 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -3516 -500 -4 ) ( -3516 -1284 -4 ) ( 2180 -1284 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -3516 -1284 0 ) ( -3516 -500 0 ) ( 2180 -500 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0 } // brush 19 { @@ -4065,12 +4065,12 @@ } // brush 393 { -( -5056 -1284 -100 ) ( -5056 -1284 -104 ) ( -5056 3788 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -3516 3788 -100 ) ( -3516 3788 -104 ) ( -3516 -1284 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -3516 -1284 -100 ) ( -3516 -1284 -104 ) ( -5056 -1284 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -5056 3788 -100 ) ( -5056 3788 -104 ) ( -3516 3788 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -5056 3788 -104 ) ( -5056 -1284 -104 ) ( -3516 -1284 -104 ) common/caulk 0 0 0 0.5 0.5 0 0 0 -( -5056 -1284 -100 ) ( -5056 3788 -100 ) ( -3516 3788 -100 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -5056 -1284 0 ) ( -5056 -1284 -4 ) ( -5056 3788 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -3516 3788 0 ) ( -3516 3788 -4 ) ( -3516 -1284 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -3516 -1284 0 ) ( -3516 -1284 -4 ) ( -5056 -1284 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -5056 3788 0 ) ( -5056 3788 -4 ) ( -3516 3788 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -5056 3788 -4 ) ( -5056 -1284 -4 ) ( -3516 -1284 -4 ) common/caulk 0 0 0 0.5 0.5 0 0 0 +( -5056 -1284 0 ) ( -5056 3788 0 ) ( -3516 3788 0 ) common/caulk 0 0 0 0.5 0.5 0 0 0 } // brush 394 { @@ -5675,226 +5675,226 @@ q3r_signage/dirsign02_blu } // entity 31 { -"classname" "info_player_deathmatch" -"number" "6" -"origin" "-3112 3264 28" -} -// entity 32 -{ -"classname" "info_player_deathmatch" -"number" "5" -"origin" "-3048 3392 28" -} -// entity 33 -{ -"classname" "info_player_deathmatch" -"number" "11" -"origin" "-3520 3392 28" -} -// entity 34 -{ -"classname" "info_player_deathmatch" -"number" "2" -"origin" "-2788 3264 28" -} -// entity 35 -{ -"classname" "info_player_deathmatch" -"number" "3" -"origin" "-2880 3392 28" -} -// entity 36 -{ -"classname" "info_player_deathmatch" -"number" "7" -"origin" "-3200 3392 28" -} -// entity 37 -{ -"classname" "info_player_deathmatch" -"number" "8" -"origin" "-3268 3264 28" -} -// entity 38 -{ -"classname" "info_player_deathmatch" -"number" "10" -"origin" "-3428 3264 28" -} -// entity 39 -{ -"classname" "info_player_deathmatch" -"number" "12" -"origin" "-3588 3264 28" -} -// entity 40 -{ -"classname" "info_player_deathmatch" -"number" "4" -"origin" "-2944 3264 28" -} -// entity 41 -{ -"classname" "info_player_deathmatch" -"number" "9" -"origin" "-3360 3392 28" -} -// entity 42 -{ "classname" "light" "origin" "592 2416 208" "light" "10" } -// entity 43 +// entity 32 { "classname" "target_speaker" "origin" "-2288 2176 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 44 +// entity 33 { "classname" "target_speaker" "origin" "-2448 3296 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 45 +// entity 34 { "classname" "target_speaker" "origin" "-3120 3296 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 46 +// entity 35 { "classname" "target_speaker" "origin" "-3888 3296 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 47 +// entity 36 { "classname" "target_speaker" "origin" "-3888 1728 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 48 +// entity 37 { "classname" "target_speaker" "origin" "-3888 -16 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 49 +// entity 38 { "classname" "target_speaker" "origin" "-3888 -944 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 50 +// entity 39 { "classname" "target_speaker" "origin" "-2304 -944 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 51 +// entity 40 { "classname" "target_speaker" "origin" "-224 -944 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 52 +// entity 41 { "classname" "target_speaker" "origin" "1776 -944 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 53 +// entity 42 { "classname" "target_speaker" "origin" "1776 384 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 54 +// entity 43 { "classname" "target_speaker" "origin" "2768 384 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 55 +// entity 44 { "classname" "target_speaker" "origin" "2768 1552 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 56 +// entity 45 { "classname" "target_speaker" "origin" "3136 2912 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 57 +// entity 46 { "classname" "target_speaker" "origin" "2608 2912 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 58 +// entity 47 { "classname" "target_speaker" "origin" "2608 2272 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 59 +// entity 48 { "classname" "target_speaker" "origin" "1680 2272 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 60 +// entity 49 { "classname" "target_speaker" "origin" "1680 3296 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 61 +// entity 50 { "classname" "target_speaker" "origin" "96 3296 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 62 +// entity 51 { "classname" "target_speaker" "origin" "96 2176 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 63 +// entity 52 { "classname" "target_speaker" "origin" "-1056 2176 208" "noise" "sound/world/rain" "spawnflags" "1" } -// entity 64 +// entity 53 { "classname" "info_notnull" "targetname" "end1" "origin" "-2856 -808 136" } +// entity 54 +{ +"classname" "info_player_start" +"number" "7" +"origin" "-3200 3392 28" +} +// entity 55 +{ +"classname" "info_player_start" +"number" "5" +"origin" "-3048 3392 28" +} +// entity 56 +{ +"classname" "info_player_start" +"number" "6" +"origin" "-3112 3264 28" +} +// entity 57 +{ +"classname" "info_player_start" +"number" "2" +"origin" "-2788 3264 28" +} +// entity 58 +{ +"classname" "info_player_start" +"number" "3" +"origin" "-2880 3392 28" +} +// entity 59 +{ +"classname" "info_player_start" +"number" "11" +"origin" "-3520 3392 28" +} +// entity 60 +{ +"classname" "info_player_start" +"number" "12" +"origin" "-3588 3264 28" +} +// entity 61 +{ +"classname" "info_player_start" +"number" "8" +"origin" "-3268 3264 28" +} +// entity 62 +{ +"classname" "info_player_start" +"number" "4" +"origin" "-2944 3264 28" +} +// entity 63 +{ +"classname" "info_player_start" +"number" "10" +"origin" "-3428 3264 28" +} +// entity 64 +{ +"classname" "info_player_start" +"number" "9" +"origin" "-3360 3392 28" +} diff --git a/baseq3r/models/players/gremlin/animation.cfg b/baseq3r/models/players/gremlin/animation.cfg new file mode 100644 index 00000000..a1776bb0 --- /dev/null +++ b/baseq3r/models/players/gremlin/animation.cfg @@ -0,0 +1 @@ +plate usa diff --git a/baseq3r/models/players/gremlin/black.skin b/baseq3r/models/players/gremlin/black.skin new file mode 100644 index 00000000..cc29f23a --- /dev/null +++ b/baseq3r/models/players/gremlin/black.skin @@ -0,0 +1,15 @@ +b_main,models/players/gremlin/black.tga +tag_weapon, +tag_wheelfr, +tag_wheelfl, +tag_wheelrr, +tag_wheelrl, +tag_turbo, +tag_smoke, +tag_plate, +tag_hlite1, +tag_hlite2, +tag_blite1, +tag_blite2, +tag_rlite1, +tag_rlite2, diff --git a/baseq3r/models/players/gremlin/black.tga b/baseq3r/models/players/gremlin/black.tga new file mode 100644 index 00000000..285af3b9 Binary files /dev/null and b/baseq3r/models/players/gremlin/black.tga differ diff --git a/baseq3r/models/players/gremlin/blue.skin b/baseq3r/models/players/gremlin/blue.skin new file mode 100644 index 00000000..4f10063f --- /dev/null +++ b/baseq3r/models/players/gremlin/blue.skin @@ -0,0 +1,15 @@ +b_main,models/players/gremlin/blue.tga +tag_weapon, +tag_wheelfr, +tag_wheelfl, +tag_wheelrr, +tag_wheelrl, +tag_turbo, +tag_smoke, +tag_plate, +tag_hlite1, +tag_hlite2, +tag_blite1, +tag_blite2, +tag_rlite1, +tag_rlite2, diff --git a/baseq3r/models/players/gremlin/blue.tga b/baseq3r/models/players/gremlin/blue.tga new file mode 100644 index 00000000..0ebaecc9 Binary files /dev/null and b/baseq3r/models/players/gremlin/blue.tga differ diff --git a/baseq3r/models/players/gremlin/body.MD3 b/baseq3r/models/players/gremlin/body.MD3 new file mode 100644 index 00000000..29a31dfa Binary files /dev/null and b/baseq3r/models/players/gremlin/body.MD3 differ diff --git a/baseq3r/models/players/gremlin/green.skin b/baseq3r/models/players/gremlin/green.skin new file mode 100644 index 00000000..a2777f9f --- /dev/null +++ b/baseq3r/models/players/gremlin/green.skin @@ -0,0 +1,15 @@ +b_main,models/players/gremlin/green.tga +tag_weapon, +tag_wheelfr, +tag_wheelfl, +tag_wheelrr, +tag_wheelrl, +tag_turbo, +tag_smoke, +tag_plate, +tag_hlite1, +tag_hlite2, +tag_blite1, +tag_blite2, +tag_rlite1, +tag_rlite2, diff --git a/baseq3r/models/players/gremlin/green.tga b/baseq3r/models/players/gremlin/green.tga new file mode 100644 index 00000000..cefe77c9 Binary files /dev/null and b/baseq3r/models/players/gremlin/green.tga differ diff --git a/baseq3r/models/players/gremlin/icon_black.tga b/baseq3r/models/players/gremlin/icon_black.tga new file mode 100644 index 00000000..71c56111 Binary files /dev/null and b/baseq3r/models/players/gremlin/icon_black.tga differ diff --git a/baseq3r/models/players/gremlin/icon_blue.tga b/baseq3r/models/players/gremlin/icon_blue.tga new file mode 100644 index 00000000..4892d491 Binary files /dev/null and b/baseq3r/models/players/gremlin/icon_blue.tga differ diff --git a/baseq3r/models/players/gremlin/icon_green.tga b/baseq3r/models/players/gremlin/icon_green.tga new file mode 100644 index 00000000..51caba52 Binary files /dev/null and b/baseq3r/models/players/gremlin/icon_green.tga differ diff --git a/baseq3r/models/players/gremlin/icon_orange.tga b/baseq3r/models/players/gremlin/icon_orange.tga new file mode 100644 index 00000000..6e705078 Binary files /dev/null and b/baseq3r/models/players/gremlin/icon_orange.tga differ diff --git a/baseq3r/models/players/gremlin/icon_red.tga b/baseq3r/models/players/gremlin/icon_red.tga new file mode 100644 index 00000000..69b928d0 Binary files /dev/null and b/baseq3r/models/players/gremlin/icon_red.tga differ diff --git a/baseq3r/models/players/gremlin/icon_white.tga b/baseq3r/models/players/gremlin/icon_white.tga new file mode 100644 index 00000000..1aea2539 Binary files /dev/null and b/baseq3r/models/players/gremlin/icon_white.tga differ diff --git a/baseq3r/models/players/gremlin/icon_yellow.tga b/baseq3r/models/players/gremlin/icon_yellow.tga new file mode 100644 index 00000000..d5282895 Binary files /dev/null and b/baseq3r/models/players/gremlin/icon_yellow.tga differ diff --git a/baseq3r/models/players/gremlin/orange.skin b/baseq3r/models/players/gremlin/orange.skin new file mode 100644 index 00000000..655ee217 --- /dev/null +++ b/baseq3r/models/players/gremlin/orange.skin @@ -0,0 +1,15 @@ +b_main,models/players/gremlin/orange.tga +tag_weapon, +tag_wheelfr, +tag_wheelfl, +tag_wheelrr, +tag_wheelrl, +tag_turbo, +tag_smoke, +tag_plate, +tag_hlite1, +tag_hlite2, +tag_blite1, +tag_blite2, +tag_rlite1, +tag_rlite2, diff --git a/baseq3r/models/players/gremlin/orange.tga b/baseq3r/models/players/gremlin/orange.tga new file mode 100644 index 00000000..f9a420b5 Binary files /dev/null and b/baseq3r/models/players/gremlin/orange.tga differ diff --git a/baseq3r/models/players/gremlin/red.skin b/baseq3r/models/players/gremlin/red.skin new file mode 100644 index 00000000..34f45a52 --- /dev/null +++ b/baseq3r/models/players/gremlin/red.skin @@ -0,0 +1,15 @@ +b_main,models/players/gremlin/red.tga +tag_weapon, +tag_wheelfr, +tag_wheelfl, +tag_wheelrr, +tag_wheelrl, +tag_turbo, +tag_smoke, +tag_plate, +tag_hlite1, +tag_hlite2, +tag_blite1, +tag_blite2, +tag_rlite1, +tag_rlite2, diff --git a/baseq3r/models/players/gremlin/red.tga b/baseq3r/models/players/gremlin/red.tga new file mode 100644 index 00000000..c6df2348 Binary files /dev/null and b/baseq3r/models/players/gremlin/red.tga differ diff --git a/baseq3r/models/players/gremlin/under.tga b/baseq3r/models/players/gremlin/under.tga new file mode 100644 index 00000000..82803721 Binary files /dev/null and b/baseq3r/models/players/gremlin/under.tga differ diff --git a/baseq3r/models/players/gremlin/wheel.md3 b/baseq3r/models/players/gremlin/wheel.md3 new file mode 100644 index 00000000..58ca75e4 Binary files /dev/null and b/baseq3r/models/players/gremlin/wheel.md3 differ diff --git a/baseq3r/models/players/gremlin/white.skin b/baseq3r/models/players/gremlin/white.skin new file mode 100644 index 00000000..aa7fd840 --- /dev/null +++ b/baseq3r/models/players/gremlin/white.skin @@ -0,0 +1,15 @@ +b_main,models/players/gremlin/white.tga +tag_weapon, +tag_wheelfr, +tag_wheelfl, +tag_wheelrr, +tag_wheelrl, +tag_turbo, +tag_smoke, +tag_plate, +tag_hlite1, +tag_hlite2, +tag_blite1, +tag_blite2, +tag_rlite1, +tag_rlite2, diff --git a/baseq3r/models/players/gremlin/white.tga b/baseq3r/models/players/gremlin/white.tga new file mode 100644 index 00000000..5820a1c9 Binary files /dev/null and b/baseq3r/models/players/gremlin/white.tga differ diff --git a/baseq3r/models/players/gremlin/yellow.skin b/baseq3r/models/players/gremlin/yellow.skin new file mode 100644 index 00000000..27570c3d --- /dev/null +++ b/baseq3r/models/players/gremlin/yellow.skin @@ -0,0 +1,15 @@ +b_main,models/players/gremlin/yellow.tga +tag_weapon, +tag_wheelfr, +tag_wheelfl, +tag_wheelrr, +tag_wheelrl, +tag_turbo, +tag_smoke, +tag_plate, +tag_hlite1, +tag_hlite2, +tag_blite1, +tag_blite2, +tag_rlite1, +tag_rlite2, diff --git a/baseq3r/models/players/gremlin/yellow.tga b/baseq3r/models/players/gremlin/yellow.tga new file mode 100644 index 00000000..d3af921e Binary files /dev/null and b/baseq3r/models/players/gremlin/yellow.tga differ diff --git a/baseq3r/scripts/cars.shader b/baseq3r/scripts/cars.shader index d9779b4b..91c86f1f 100644 --- a/baseq3r/scripts/cars.shader +++ b/baseq3r/scripts/cars.shader @@ -31,7 +31,6 @@ models/players/alpine/tlites models/players/alpine/yellowglass { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -41,7 +40,6 @@ models/players/alpine/yellowglass { map models/players/alpine/yellow.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// alphaFunc GT0 depthWrite rgbGen lightingdiffuse } @@ -52,7 +50,6 @@ models/players/alpine/yellowglass models/players/alpine/yellow { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -79,7 +76,6 @@ models/players/alpine/yellowhglass rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -116,7 +112,6 @@ models/players/alpine/yellowhlite models/players/alpine/blueglass { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -126,7 +121,6 @@ models/players/alpine/blueglass { map models/players/alpine/blue.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// alphaFunc GT0 depthWrite rgbGen lightingdiffuse } @@ -137,14 +131,13 @@ models/players/alpine/blueglass models/players/alpine/blue { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg - tcGen environment - rgbGen lightingdiffuse + tcGen environment + rgbGen lightingdiffuse } { - map models/players/alpine/blue.tga - blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + map models/players/alpine/blue.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA depthWrite rgbGen lightingdiffuse } @@ -156,19 +149,18 @@ models/players/alpine/blue models/players/alpine/bluehglass { - { - map models/players/alpine/bluehglass_t.tga - blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + { + map models/players/alpine/bluehglass_t.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA alphaFunc GT0 depthWrite rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add - tcGen environment - rgbGen lightingdiffuse + tcGen environment + rgbGen lightingdiffuse } { map models/players/alpine/bluehglass.tga @@ -202,7 +194,6 @@ models/players/alpine/bluehlite models/players/alpine/redglass { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -212,7 +203,6 @@ models/players/alpine/redglass { map models/players/alpine/red.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// alphaFunc GT0 depthWrite rgbGen lightingdiffuse } @@ -223,7 +213,6 @@ models/players/alpine/redglass models/players/alpine/red { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -250,7 +239,6 @@ models/players/alpine/redhglass rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -287,7 +275,6 @@ models/players/alpine/redhlite models/players/alpine/greenglass { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -297,7 +284,6 @@ models/players/alpine/greenglass { map models/players/alpine/green.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// alphaFunc GT0 depthWrite rgbGen lightingdiffuse } @@ -308,7 +294,6 @@ models/players/alpine/greenglass models/players/alpine/green { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -335,7 +320,6 @@ models/players/alpine/greenhglass rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -373,7 +357,6 @@ models/players/alpine/greenhlite models/players/alpine/fffglass { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -383,7 +366,6 @@ models/players/alpine/fffglass { map models/players/alpine/fff.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// alphaFunc GT0 depthWrite rgbGen lightingdiffuse } @@ -394,7 +376,6 @@ models/players/alpine/fffglass models/players/alpine/fff { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -421,7 +402,6 @@ models/players/alpine/fffhglass rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -466,7 +446,6 @@ models/players/alpine/fffflite models/players/alpine/stompedglass { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -476,7 +455,6 @@ models/players/alpine/stompedglass { map models/players/alpine/stomped.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// alphaFunc GT0 depthWrite rgbGen lightingdiffuse } @@ -487,7 +465,6 @@ models/players/alpine/stompedglass models/players/alpine/stomped { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -514,7 +491,6 @@ models/players/alpine/stompedhglass rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -566,7 +542,6 @@ models/players/alpine/stompedflite models/players/camaro/body_yellow { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -583,7 +558,6 @@ models/players/camaro/body_yellow models/players/camaro/lines1_yellow { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -600,7 +574,6 @@ models/players/camaro/lines1_yellow models/players/camaro/lines2_yellow { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -617,7 +590,6 @@ models/players/camaro/lines2_yellow models/players/camaro/mirror_yellow { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -637,7 +609,6 @@ models/players/camaro/mirror_yellow models/players/camaro/body_blue { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -654,7 +625,6 @@ models/players/camaro/body_blue models/players/camaro/lines1_blue { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -671,7 +641,6 @@ models/players/camaro/lines1_blue models/players/camaro/lines2_blue { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -688,7 +657,6 @@ models/players/camaro/lines2_blue models/players/camaro/mirror_blue { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -707,7 +675,6 @@ models/players/camaro/mirror_blue models/players/camaro/body_green { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -724,7 +691,6 @@ models/players/camaro/body_green models/players/camaro/lines1_green { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -741,7 +707,6 @@ models/players/camaro/lines1_green models/players/camaro/lines2_green { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -758,7 +723,6 @@ models/players/camaro/lines2_green models/players/camaro/mirror_green { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -778,7 +742,6 @@ models/players/camaro/mirror_green models/players/camaro/body_red { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -795,7 +758,6 @@ models/players/camaro/body_red models/players/camaro/lines1_red { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -812,7 +774,6 @@ models/players/camaro/lines1_red models/players/camaro/lines2_red { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -829,7 +790,6 @@ models/players/camaro/lines2_red models/players/camaro/mirror_red { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -848,7 +808,6 @@ models/players/camaro/mirror_red models/players/camaro/body_white { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -865,7 +824,6 @@ models/players/camaro/body_white models/players/camaro/lines1_white { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -882,7 +840,6 @@ models/players/camaro/lines1_white models/players/camaro/lines2_white { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -899,7 +856,6 @@ models/players/camaro/lines2_white models/players/camaro/mirror_white { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -919,7 +875,6 @@ models/players/camaro/mirror_white models/players/camaro/body_black { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -936,7 +891,6 @@ models/players/camaro/body_black models/players/camaro/lines1_black { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -953,7 +907,6 @@ models/players/camaro/lines1_black models/players/camaro/lines2_black { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -970,7 +923,6 @@ models/players/camaro/lines2_black models/players/camaro/mirror_black { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1013,7 +965,6 @@ models/players/macdaddy/tlites { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1039,7 +990,6 @@ models/players/macdaddy/red_main { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1057,7 +1007,6 @@ models/players/macdaddy/red_hlites { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1082,7 +1031,6 @@ models/players/macdaddy/black_main { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1100,7 +1048,6 @@ models/players/macdaddy/red_hlites { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1125,7 +1072,6 @@ models/players/macdaddy/blue_main { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1143,7 +1089,6 @@ models/players/macdaddy/blue_hlites { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1169,7 +1114,6 @@ models/players/macdaddy/checker_main { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1187,7 +1131,6 @@ models/players/macdaddy/checker_hlites { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1227,7 +1170,6 @@ models/players/macdaddy/classic_main { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1245,7 +1187,6 @@ models/players/macdaddy/classic_hlites { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1284,7 +1225,6 @@ models/players/macdaddy/green_main { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1302,7 +1242,6 @@ models/players/macdaddy/green_hlites { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1341,7 +1280,6 @@ models/players/macdaddy/pink_main { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1359,7 +1297,6 @@ models/players/macdaddy/pink_hlites { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1385,7 +1322,6 @@ models/players/macdaddy/purple_main { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1403,7 +1339,6 @@ models/players/macdaddy/purple_hlites { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1441,7 +1376,6 @@ models/players/macdaddy/white_main { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1459,7 +1393,6 @@ models/players/macdaddy/white_hlites { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1485,7 +1418,6 @@ models/players/macdaddy/yellow_main { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1503,7 +1435,6 @@ models/players/macdaddy/yellow_hlites { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1541,7 +1472,6 @@ models/players/macdaddy/hitormiss_main { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1559,7 +1489,6 @@ models/players/macdaddy/hitormiss_hlites { { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment rgbGen lightingdiffuse @@ -1592,7 +1521,6 @@ models/players/mini/main rgbGen lightingdiffuse } { - // map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -1601,7 +1529,6 @@ models/players/mini/main { map models/players/mini/main.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// blendFunc GL_SRC_ALPHA GL_ONE depthWrite rgbGen lightingdiffuse } @@ -1616,7 +1543,6 @@ models/players/mini/hlites rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -1657,7 +1583,6 @@ models/players/mini/roof rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -1689,7 +1614,6 @@ models/players/mini/glass rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -1756,7 +1680,6 @@ models/players/mini/main_uj rgbGen lightingdiffuse } { - // map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -1765,7 +1688,6 @@ models/players/mini/main_uj { map models/players/mini/main_uj.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// blendFunc GL_SRC_ALPHA GL_ONE depthWrite rgbGen lightingdiffuse } @@ -1781,7 +1703,6 @@ models/players/mini/hlites_uj rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -1808,7 +1729,6 @@ models/players/mini/roof_uj rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -1829,7 +1749,6 @@ models/players/mini/glass_uj rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -1851,7 +1770,6 @@ models/players/mini/main_yellow rgbGen lightingdiffuse } { - // map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -1860,7 +1778,6 @@ models/players/mini/main_yellow { map models/players/mini/main_yellow.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// blendFunc GL_SRC_ALPHA GL_ONE depthWrite rgbGen lightingdiffuse } @@ -1876,7 +1793,6 @@ models/players/mini/hlites_yellow rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -1903,7 +1819,6 @@ models/players/mini/roof_yellow rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -1924,7 +1839,6 @@ models/players/mini/glass_yellow rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -1947,7 +1861,6 @@ models/players/mini/main_green rgbGen lightingdiffuse } { - // map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -1956,7 +1869,6 @@ models/players/mini/main_green { map models/players/mini/main_green.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// blendFunc GL_SRC_ALPHA GL_ONE depthWrite rgbGen lightingdiffuse } @@ -1972,7 +1884,6 @@ models/players/mini/hlites_green rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -2000,7 +1911,6 @@ models/players/mini/glass_green rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -2023,7 +1933,6 @@ models/players/mini/gamespy_main rgbGen lightingdiffuse } { - // map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -2032,7 +1941,6 @@ models/players/mini/gamespy_main { map models/players/mini/gamespy_main.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// blendFunc GL_SRC_ALPHA GL_ONE depthWrite rgbGen lightingdiffuse } @@ -2048,7 +1956,6 @@ models/players/mini/gamespy_hlites rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -2076,7 +1983,6 @@ models/players/mini/gamespy_glass rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -2097,7 +2003,6 @@ models/players/mini/gamespy_roof rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -2123,7 +2028,6 @@ models/players/mini/telefragged_main rgbGen lightingdiffuse } { - // map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -2132,7 +2036,6 @@ models/players/mini/telefragged_main { map models/players/mini/telefragged_main.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// blendFunc GL_SRC_ALPHA GL_ONE depthWrite rgbGen lightingdiffuse } @@ -2148,7 +2051,6 @@ models/players/mini/telefragged_hlites rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -2176,7 +2078,6 @@ models/players/mini/telefragged_glass rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -2196,7 +2097,6 @@ models/players/mini/telefragged_roof rgbGen lightingdiffuse } { -// map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg tcGen environment blendFunc add @@ -2220,7 +2120,6 @@ models/players/mini/main_vaporwave rgbGen lightingdiffuse } { - // map textures/effects/tinfx2b.tga map textures/reflect/reflect.jpg blendFunc add tcGen environment @@ -2229,7 +2128,6 @@ models/players/mini/main_vaporwave { map models/players/mini/main_vaporwave.tga blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA -// blendFunc GL_SRC_ALPHA GL_ONE depthWrite rgbGen lightingdiffuse } @@ -5151,7 +5049,6 @@ models/players/gravelord/no_coffin models/players/gravelord/gb_windows { { -// map textures/effects/tinfx2.tga map textures/reflect/reflect.tga blendfunc add rgbGen identity @@ -5162,4 +5059,139 @@ models/players/gravelord/gb_windows blendfunc gl_one gl_src_alpha rgbGen lightingDiffuse } +} + +//GRAVELORD +//ORANGE + +models/players/gremlin/orange +{ + { +// map textures/effects/tinfx2b.tga + map textures/reflect/reflect.jpg + tcGen environment + rgbGen identity + } + { + map models/players/gremlin/orange.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + depthWrite + rgbGen lightingdiffuse + } + +} + + +//RED + +models/players/gremlin/red +{ + { +// map textures/effects/tinfx2b.tga + map textures/reflect/reflect.jpg + tcGen environment + rgbGen lightingdiffuse + } + { + map models/players/gremlin/red.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + depthWrite + rgbGen lightingdiffuse + } + +} + + + +//BLUE + +models/players/gremlin/blue +{ + { +// map textures/effects/tinfx2b.tga + map textures/reflect/reflect.jpg + tcGen environment + rgbGen lightingdiffuse + } + { + map models/players/gremlin/blue.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingdiffuse + } + +} + + +//GREEN + +models/players/gremlin/green +{ + { +// map textures/effects/tinfx2b.tga + map textures/reflect/reflect.jpg + tcGen environment + rgbGen lightingdiffuse + } + { + map models/players/gremlin/green.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingdiffuse + } + +} + + +//YELLOW + +models/players/gremlin/yellow +{ + { +// map textures/effects/tinfx2b.tga + map textures/reflect/reflect.jpg + tcGen environment + rgbGen lightingdiffuse + } + { + map models/players/gremlin/yellow.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingdiffuse + } + +} + +//WHITE + +models/players/gremlin/white +{ + { +// map textures/effects/tinfx2b.tga + map textures/reflect/reflect.jpg + tcGen environment + rgbGen lightingdiffuse + } + { + map models/players/gremlin/white.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingdiffuse + } + +} + +//BLACK + +models/players/gremlin/black +{ + { +// map textures/effects/tinfx2b.tga + map textures/reflect/reflect.jpg + tcGen environment + rgbGen identity + } + { + map models/players/gremlin/black.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + depthWrite + rgbGen lightingdiffuse + } + } \ No newline at end of file diff --git a/baseq3r/textures/base_door/shinymetaldoor_outside3a2.tga b/baseq3r/textures/base_door/shinymetaldoor_outside3a2.tga index 13173005..ee8791ec 100644 Binary files a/baseq3r/textures/base_door/shinymetaldoor_outside3a2.tga and b/baseq3r/textures/base_door/shinymetaldoor_outside3a2.tga differ diff --git a/baseq3r/textures/base_door/shinymetaldoor_outside3glow.tga b/baseq3r/textures/base_door/shinymetaldoor_outside3glow.tga index 4c2b4121..3a8d15f5 100644 Binary files a/baseq3r/textures/base_door/shinymetaldoor_outside3glow.tga and b/baseq3r/textures/base_door/shinymetaldoor_outside3glow.tga differ diff --git a/baseq3r/textures/base_floor/achtung_clang.jpg b/baseq3r/textures/base_floor/achtung_clang.jpg index 5ed7a8a7..7f92f94a 100644 Binary files a/baseq3r/textures/base_floor/achtung_clang.jpg and b/baseq3r/textures/base_floor/achtung_clang.jpg differ diff --git a/baseq3r/textures/base_floor/clang_floor.jpg b/baseq3r/textures/base_floor/clang_floor.jpg index 13d5e3a6..2513db47 100644 Binary files a/baseq3r/textures/base_floor/clang_floor.jpg and b/baseq3r/textures/base_floor/clang_floor.jpg differ diff --git a/baseq3r/textures/q3r_skies/env/ame_nebula/readme b/baseq3r/textures/q3r_skies/env/ame_nebula/readme new file mode 100644 index 00000000..a8618a0c --- /dev/null +++ b/baseq3r/textures/q3r_skies/env/ame_nebula/readme @@ -0,0 +1,5 @@ +Created by 'amethyst7' aka Chris Matz. +WEB site: http://amethyst7.gotdoofed.com + +You may use and distribute this sky box under the terms of the +GNU General Public License version 2. diff --git a/baseq3r/textures/sfx/beam.jpg b/baseq3r/textures/sfx/beam.jpg index 7cfbe799..f8dfb437 100644 Binary files a/baseq3r/textures/sfx/beam.jpg and b/baseq3r/textures/sfx/beam.jpg differ diff --git a/baseq3r/textures/sfx/beam_1.jpg b/baseq3r/textures/sfx/beam_1.jpg index 1a4f5a82..bf6209f3 100644 Binary files a/baseq3r/textures/sfx/beam_1.jpg and b/baseq3r/textures/sfx/beam_1.jpg differ diff --git a/baseq3r/textures/skies/dimclouds.jpg b/baseq3r/textures/skies/dimclouds.jpg index d68cb6d2..dfac2b88 100644 Binary files a/baseq3r/textures/skies/dimclouds.jpg and b/baseq3r/textures/skies/dimclouds.jpg differ diff --git a/baseq3r/textures/skies/hellsky.jpg b/baseq3r/textures/skies/hellsky.jpg index f0c842b8..3362ffc4 100644 Binary files a/baseq3r/textures/skies/hellsky.jpg and b/baseq3r/textures/skies/hellsky.jpg differ diff --git a/baseq3r/textures/skies/killsky_1.jpg b/baseq3r/textures/skies/killsky_1.jpg index b3f8795b..de933aa7 100644 Binary files a/baseq3r/textures/skies/killsky_1.jpg and b/baseq3r/textures/skies/killsky_1.jpg differ diff --git a/baseq3r/textures/skies/killsky_2.jpg b/baseq3r/textures/skies/killsky_2.jpg index 965dd0a2..d13c4239 100644 Binary files a/baseq3r/textures/skies/killsky_2.jpg and b/baseq3r/textures/skies/killsky_2.jpg differ diff --git a/baseq3r/textures/stone/pjrock1.jpg b/baseq3r/textures/stone/pjrock1.jpg index b5d62cdd..ab38d5c5 100644 Binary files a/baseq3r/textures/stone/pjrock1.jpg and b/baseq3r/textures/stone/pjrock1.jpg differ diff --git a/baseq3r/textures/stone/rockwall.jpg b/baseq3r/textures/stone/rockwall.jpg index 8efc3adc..7c913632 100644 Binary files a/baseq3r/textures/stone/rockwall.jpg and b/baseq3r/textures/stone/rockwall.jpg differ