diff --git a/baseq3r/icons/iconw_gauntlet.tga b/baseq3r/icons/iconw_gauntlet.tga index 017fa3b5..3eb9bc09 100644 Binary files a/baseq3r/icons/iconw_gauntlet.tga and b/baseq3r/icons/iconw_gauntlet.tga differ diff --git a/baseq3r/maps/q3r_david4.aas b/baseq3r/maps/q3r_david4.aas index be83a663..f786c3b7 100644 Binary files a/baseq3r/maps/q3r_david4.aas and b/baseq3r/maps/q3r_david4.aas differ diff --git a/baseq3r/maps/q3r_david4.bsp b/baseq3r/maps/q3r_david4.bsp index 08c3b298..88c9d230 100644 Binary files a/baseq3r/maps/q3r_david4.bsp and b/baseq3r/maps/q3r_david4.bsp differ diff --git a/baseq3r/maps/q3r_david4.map b/baseq3r/maps/q3r_david4.map index bbf6dfca..39bb0fe4 100644 --- a/baseq3r/maps/q3r_david4.map +++ b/baseq3r/maps/q3r_david4.map @@ -68,30 +68,30 @@ } // brush 7 { -( -2427.9869995117 -1000 -32 ) ( -2427.9869995117 -1000 -120 ) ( -2427.9869995117 2632 -120 ) common/WTF 0 0 0 0.25 0.25 0 0 0 +( -2427.9870605469 -1000 -32 ) ( -2427.9870605469 -1000 -120 ) ( -2427.9870605469 2632 -120 ) common/WTF 0 0 0 0.25 0.25 0 0 0 ( 6176 2584 -32 ) ( 6176 2584 -120 ) ( 6176 -1048 -120 ) common/WTF 0 0 0 0.25 0.25 0 0 0 -( 3096 -1012 -32 ) ( 3096 -1012 -120 ) ( -2422.9869995117 -1012 -120 ) common/WTF 0 0 0 0.25 0.25 0 0 0 -( -2414.9869995117 2624 -32 ) ( -2414.9869995117 2624 -120 ) ( 3104 2624 -120 ) common/WTF 0 0 0 0.25 0.25 0 0 0 -( -2422.9869995117 2632 -120 ) ( -2422.9869995117 -1000 -120 ) ( 3096 -1000 -120 ) common/WTF 0 0 0 0.25 0.25 0 0 0 -( -2422.9869995117 -1000 -32 ) ( -2422.9869995117 2632 -32 ) ( 3096 2632 -32 ) q3r_dirt_grass/grass01 126 22 -0 1.2533601522 1.6181800365 0 0 0 +( 3096 -1012 -32 ) ( 3096 -1012 -120 ) ( -2422.9870605469 -1012 -120 ) common/WTF 0 0 0 0.25 0.25 0 0 0 +( -2414.9870605469 2624 -32 ) ( -2414.9870605469 2624 -120 ) ( 3104 2624 -120 ) common/WTF 0 0 0 0.25 0.25 0 0 0 +( -2422.9870605469 2632 -120 ) ( -2422.9870605469 -1000 -120 ) ( 3096 -1000 -120 ) common/WTF 0 0 0 0.25 0.25 0 0 0 +( -2422.9870605469 -1000 -32 ) ( -2422.9870605469 2632 -32 ) ( 3096 2632 -32 ) q3r_dirt_grass/grass01 126 22 -0 1.2533601522 1.6181800365 0 0 0 } // brush 8 { -( 5769.9869995117 2248 64 ) ( 5769.9869995117 2248 -8 ) ( 5769.9869995117 2240 -8 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 2248 64 ) ( 5769.9868164063 2248 -8 ) ( 5769.9868164063 2240 -8 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 ( 3199 2240 64 ) ( 3199 2240 -8 ) ( 3199 2248 -8 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 -( 3163 2248 64 ) ( 3163 2248 -8 ) ( 5769.9869995117 2248 -8 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 -( 5769.9869995117 2240 64 ) ( 5769.9869995117 2240 -8 ) ( 3163 2240 -8 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 -( 5769.9869995117 2240 -8 ) ( 5769.9869995117 2248 -8 ) ( 3163 2248 -8 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 -( 5769.9869995117 2248 0 ) ( 5769.9869995117 2240 0 ) ( 3163 2240 0 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 +( 3163 2248 64 ) ( 3163 2248 -8 ) ( 5769.9868164063 2248 -8 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 2240 64 ) ( 5769.9868164063 2240 -8 ) ( 3163 2240 -8 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 2240 -8 ) ( 5769.9868164063 2248 -8 ) ( 3163 2248 -8 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 2248 0 ) ( 5769.9868164063 2240 0 ) ( 3163 2240 0 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 } // brush 9 { -( 5769.9869995117 -604 64 ) ( 5769.9869995117 -604 -8 ) ( 5769.9869995117 -612 -8 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 -604 64 ) ( 5769.9868164063 -604 -8 ) ( 5769.9868164063 -612 -8 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 ( 3199 -612 64 ) ( 3199 -612 -8 ) ( 3199 -604 -8 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 -( 3163 -604 64 ) ( 3163 -604 -8 ) ( 5769.9869995117 -604 -8 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 -( 5769.9869995117 -612 64 ) ( 5769.9869995117 -612 -8 ) ( 3163 -612 -8 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 -( 5769.9869995117 -612 -8 ) ( 5769.9869995117 -604 -8 ) ( 3163 -604 -8 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 -( 5769.9869995117 -604 0 ) ( 5769.9869995117 -612 0 ) ( 3163 -612 0 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 +( 3163 -604 64 ) ( 3163 -604 -8 ) ( 5769.9868164063 -604 -8 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 -612 64 ) ( 5769.9868164063 -612 -8 ) ( 3163 -612 -8 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 -612 -8 ) ( 5769.9868164063 -604 -8 ) ( 3163 -604 -8 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 -604 0 ) ( 5769.9868164063 -612 0 ) ( 3163 -612 0 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 } // brush 10 { @@ -104,21 +104,21 @@ } // brush 11 { -( 5769.9869995117 -604 40 ) ( 5769.9869995117 -604 -32 ) ( 5769.9869995117 -612 -32 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 -604 40 ) ( 5769.9868164063 -604 -32 ) ( 5769.9868164063 -612 -32 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 ( 3199 -612 40 ) ( 3199 -612 -32 ) ( 3199 -604 -32 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 -( 3163 -604 40 ) ( 3163 -604 -32 ) ( 5769.9869995117 -604 -32 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 -( 5769.9869995117 -612 40 ) ( 5769.9869995117 -612 -32 ) ( 3163 -612 -32 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 -( 5769.9869995117 -612 -32 ) ( 5769.9869995117 -604 -32 ) ( 3163 -604 -32 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 -( 5769.9869995117 -604 -24 ) ( 5769.9869995117 -612 -24 ) ( 3163 -612 -24 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 +( 3163 -604 40 ) ( 3163 -604 -32 ) ( 5769.9868164063 -604 -32 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 -612 40 ) ( 5769.9868164063 -612 -32 ) ( 3163 -612 -32 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 -612 -32 ) ( 5769.9868164063 -604 -32 ) ( 3163 -604 -32 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 -604 -24 ) ( 5769.9868164063 -612 -24 ) ( 3163 -612 -24 ) ctf/test2_trans 128 0 0 0.25 0.25 0 0 0 } // brush 12 { -( 5769.9869995117 2248 40 ) ( 5769.9869995117 2248 -32 ) ( 5769.9869995117 2240 -32 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 2248 40 ) ( 5769.9868164063 2248 -32 ) ( 5769.9868164063 2240 -32 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 ( 3199 2240 40 ) ( 3199 2240 -32 ) ( 3199 2248 -32 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 -( 3163 2248 40 ) ( 3163 2248 -32 ) ( 5769.9869995117 2248 -32 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 -( 5769.9869995117 2240 40 ) ( 5769.9869995117 2240 -32 ) ( 3163 2240 -32 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 -( 5769.9869995117 2240 -32 ) ( 5769.9869995117 2248 -32 ) ( 3163 2248 -32 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 -( 5769.9869995117 2248 -24 ) ( 5769.9869995117 2240 -24 ) ( 3163 2240 -24 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 +( 3163 2248 40 ) ( 3163 2248 -32 ) ( 5769.9868164063 2248 -32 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 2240 40 ) ( 5769.9868164063 2240 -32 ) ( 3163 2240 -32 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 2240 -32 ) ( 5769.9868164063 2248 -32 ) ( 3163 2248 -32 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 +( 5769.9868164063 2248 -24 ) ( 5769.9868164063 2240 -24 ) ( 3163 2240 -24 ) ctf/test2_trans 0 0 0 0.25 0.25 0 0 0 } // brush 13 { @@ -199,21 +199,21 @@ } // brush 22 { -( -2066 2183.9869995117 64 ) ( -2066 2183.9869995117 -8 ) ( -2058 2183.9869995117 -8 ) ctf/test2_r 0 0 0 0.25 0.25 0 0 0 +( -2066 2183.9870605469 64 ) ( -2066 2183.9870605469 -8 ) ( -2058 2183.9870605469 -8 ) ctf/test2_r 0 0 0 0.25 0.25 0 0 0 ( -2058 -676 64 ) ( -2058 -676 -8 ) ( -2066 -676 -8 ) ctf/test2_r 228 0 0 0.1044400036 0.1044400036 0 0 0 -( -2066 -423 64 ) ( -2066 -423 -8 ) ( -2066 2183.9869995117 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2058 2183.9869995117 64 ) ( -2058 2183.9869995117 -8 ) ( -2058 -423 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2058 2183.9869995117 -8 ) ( -2066 2183.9869995117 -8 ) ( -2066 -423 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2066 2183.9869995117 0 ) ( -2058 2183.9869995117 0 ) ( -2058 -423 0 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2066 -423 64 ) ( -2066 -423 -8 ) ( -2066 2183.9870605469 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2058 2183.9870605469 64 ) ( -2058 2183.9870605469 -8 ) ( -2058 -423 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2058 2183.9870605469 -8 ) ( -2066 2183.9870605469 -8 ) ( -2066 -423 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2066 2183.9870605469 0 ) ( -2058 2183.9870605469 0 ) ( -2058 -423 0 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 } // brush 23 { -( -2057.9869995117 2176 64 ) ( -2057.9869995117 2176 -8 ) ( -2057.9869995117 2184 -8 ) common/WTF 0 0 0 0.25 0.25 0 0 0 +( -2057.9870605469 2176 64 ) ( -2057.9870605469 2176 -8 ) ( -2057.9870605469 2184 -8 ) common/WTF 0 0 0 0.25 0.25 0 0 0 ( 513 2184 64 ) ( 513 2184 -8 ) ( 513 2176 -8 ) ctf/test2_r 228 0 0 0.1044400036 0.1044400036 0 0 0 -( 549 2176 64 ) ( 549 2176 -8 ) ( -2057.9869995117 2176 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2057.9869995117 2184 64 ) ( -2057.9869995117 2184 -8 ) ( 549 2184 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2057.9869995117 2184 -8 ) ( -2057.9869995117 2176 -8 ) ( 549 2176 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2057.9869995117 2176 0 ) ( -2057.9869995117 2184 0 ) ( 549 2184 0 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( 549 2176 64 ) ( 549 2176 -8 ) ( -2057.9870605469 2176 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2057.9870605469 2184 64 ) ( -2057.9870605469 2184 -8 ) ( 549 2184 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2057.9870605469 2184 -8 ) ( -2057.9870605469 2176 -8 ) ( 549 2176 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2057.9870605469 2176 0 ) ( -2057.9870605469 2184 0 ) ( 549 2184 0 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 } // brush 24 { @@ -226,21 +226,21 @@ } // brush 25 { -( -2057.9869995117 2176 40 ) ( -2057.9869995117 2176 -32 ) ( -2057.9869995117 2184 -32 ) common/WTF 0 0 0 0.25 0.25 0 0 0 +( -2057.9870605469 2176 40 ) ( -2057.9870605469 2176 -32 ) ( -2057.9870605469 2184 -32 ) common/WTF 0 0 0 0.25 0.25 0 0 0 ( 513 2184 40 ) ( 513 2184 -32 ) ( 513 2176 -32 ) ctf/test2_r 228 0 0 0.1044400036 0.1044400036 0 0 0 -( 549 2176 40 ) ( 549 2176 -32 ) ( -2057.9869995117 2176 -32 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2057.9869995117 2184 40 ) ( -2057.9869995117 2184 -32 ) ( 549 2184 -32 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2057.9869995117 2184 -32 ) ( -2057.9869995117 2176 -32 ) ( 549 2176 -32 ) common/WTF 0 0 0 0.25 0.25 0 0 0 -( -2057.9869995117 2176 -24 ) ( -2057.9869995117 2184 -24 ) ( 549 2184 -24 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( 549 2176 40 ) ( 549 2176 -32 ) ( -2057.9870605469 2176 -32 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2057.9870605469 2184 40 ) ( -2057.9870605469 2184 -32 ) ( 549 2184 -32 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2057.9870605469 2184 -32 ) ( -2057.9870605469 2176 -32 ) ( 549 2176 -32 ) common/WTF 0 0 0 0.25 0.25 0 0 0 +( -2057.9870605469 2176 -24 ) ( -2057.9870605469 2184 -24 ) ( 549 2184 -24 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 } // brush 26 { -( -2066 2183.9869995117 40 ) ( -2066 2183.9869995117 -32 ) ( -2058 2183.9869995117 -32 ) ctf/test2_r 0 0 0 0.25 0.25 0 0 0 +( -2066 2183.9870605469 40 ) ( -2066 2183.9870605469 -32 ) ( -2058 2183.9870605469 -32 ) ctf/test2_r 0 0 0 0.25 0.25 0 0 0 ( -2058 -676 40 ) ( -2058 -676 -32 ) ( -2066 -676 -32 ) ctf/test2_r 228 0 0 0.1044400036 0.1044400036 0 0 0 -( -2066 -423 40 ) ( -2066 -423 -32 ) ( -2066 2183.9869995117 -32 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2058 2183.9869995117 40 ) ( -2058 2183.9869995117 -32 ) ( -2058 -423 -32 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2058 2183.9869995117 -32 ) ( -2066 2183.9869995117 -32 ) ( -2066 -423 -32 ) common/WTF 0 0 0 0.25 0.25 0 0 0 -( -2066 2183.9869995117 -24 ) ( -2058 2183.9869995117 -24 ) ( -2058 -423 -24 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2066 -423 40 ) ( -2066 -423 -32 ) ( -2066 2183.9870605469 -32 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2058 2183.9870605469 40 ) ( -2058 2183.9870605469 -32 ) ( -2058 -423 -32 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2058 2183.9870605469 -32 ) ( -2066 2183.9870605469 -32 ) ( -2066 -423 -32 ) common/WTF 0 0 0 0.25 0.25 0 0 0 +( -2066 2183.9870605469 -24 ) ( -2058 2183.9870605469 -24 ) ( -2058 -423 -24 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 } // brush 27 { @@ -253,21 +253,21 @@ } // brush 28 { -( -2057.9869995117 -676 64 ) ( -2057.9869995117 -676 -8 ) ( -2057.9869995117 -668 -8 ) common/WTF 0 0 0 0.25 0.25 0 0 0 +( -2057.9870605469 -676 64 ) ( -2057.9870605469 -676 -8 ) ( -2057.9870605469 -668 -8 ) common/WTF 0 0 0 0.25 0.25 0 0 0 ( 513 -668 64 ) ( 513 -668 -8 ) ( 513 -676 -8 ) ctf/test2_r 228 0 0 0.1044400036 0.1044400036 0 0 0 -( 549 -676 64 ) ( 549 -676 -8 ) ( -2057.9869995117 -676 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2057.9869995117 -668 64 ) ( -2057.9869995117 -668 -8 ) ( 549 -668 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2057.9869995117 -668 -8 ) ( -2057.9869995117 -676 -8 ) ( 549 -676 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2057.9869995117 -676 0 ) ( -2057.9869995117 -668 0 ) ( 549 -668 0 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( 549 -676 64 ) ( 549 -676 -8 ) ( -2057.9870605469 -676 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2057.9870605469 -668 64 ) ( -2057.9870605469 -668 -8 ) ( 549 -668 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2057.9870605469 -668 -8 ) ( -2057.9870605469 -676 -8 ) ( 549 -676 -8 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2057.9870605469 -676 0 ) ( -2057.9870605469 -668 0 ) ( 549 -668 0 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 } // brush 29 { -( -2057.9869995117 -676 40 ) ( -2057.9869995117 -676 -32 ) ( -2057.9869995117 -668 -32 ) common/WTF 0 0 0 0.25 0.25 0 0 0 +( -2057.9870605469 -676 40 ) ( -2057.9870605469 -676 -32 ) ( -2057.9870605469 -668 -32 ) common/WTF 0 0 0 0.25 0.25 0 0 0 ( 513 -668 40 ) ( 513 -668 -32 ) ( 513 -676 -32 ) ctf/test2_r 228 0 0 0.1044400036 0.1044400036 0 0 0 -( 549 -676 40 ) ( 549 -676 -32 ) ( -2057.9869995117 -676 -32 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2057.9869995117 -668 40 ) ( -2057.9869995117 -668 -32 ) ( 549 -668 -32 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 -( -2057.9869995117 -668 -32 ) ( -2057.9869995117 -676 -32 ) ( 549 -676 -32 ) common/WTF 0 0 0 0.25 0.25 0 0 0 -( -2057.9869995117 -676 -24 ) ( -2057.9869995117 -668 -24 ) ( 549 -668 -24 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( 549 -676 40 ) ( 549 -676 -32 ) ( -2057.9870605469 -676 -32 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2057.9870605469 -668 40 ) ( -2057.9870605469 -668 -32 ) ( 549 -668 -32 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 +( -2057.9870605469 -668 -32 ) ( -2057.9870605469 -676 -32 ) ( 549 -676 -32 ) common/WTF 0 0 0 0.25 0.25 0 0 0 +( -2057.9870605469 -676 -24 ) ( -2057.9870605469 -668 -24 ) ( 549 -668 -24 ) ctf/test2_r 0 0 0 0.1044400036 0.1044400036 0 0 0 } // brush 30 { @@ -712,73 +712,73 @@ base_trim/rusty_pewter_big // brush 72 { ( -2442.416015625 -61.6661987305 564.922668457 ) ( -2661.013671875 209.1087646484 564.922668457 ) ( -2352.99609375 10.5229187012 236.4462127686 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 -( -2441.0532226563 -406.1116333008 260.2435455322 ) ( -2276.2924804688 -99.5860900879 260.2435455322 ) ( -2608.1945800781 -316.2713775635 -31.4694824219 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 -( -2457.7392578125 -327.640914917 694.5848693848 ) ( -2373.8984375 10.1085205078 694.5848693848 ) ( -2220.3587646484 -386.5668640137 447.0323638916 ) q3r_stone/Stein2 592 272 0 0.5 0.5 0 0 0 -( -2452.3203125 -137.7613372803 659.2448120117 ) ( -2615.3142089844 169.7072753906 659.2448120117 ) ( -2267.4461669922 -39.7566223145 381.1789703369 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 -( -2481.6440429688 -9.0321044922 535.0275726318 ) ( -2748.7060546875 214.0863037109 535.0275726318 ) ( -2427.12890625 56.2197265625 197.5748901367 ) q3r_stone/Stein2 592 776 0 0.5 0.5 0 0 0 -( -2466.0676269531 -492.8591003418 320.5791625977 ) ( -2223.8338623047 -243.0055084229 320.5791625977 ) ( -2558.9877929688 -402.7726135254 -2.4598999023 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 +( -2441.0532226563 -406.1116333008 260.2435302734 ) ( -2276.2924804688 -99.5860900879 260.2435302734 ) ( -2608.1945800781 -316.2713623047 -31.4694824219 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 +( -2457.7392578125 -327.6409301758 694.5848388672 ) ( -2373.8984375 10.1085205078 694.5848388672 ) ( -2220.3588867188 -386.5668640137 447.0323486328 ) q3r_stone/Stein2 592 272 0 0.5 0.5 0 0 0 +( -2452.3203125 -137.7613372803 659.2448120117 ) ( -2615.3142089844 169.7072753906 659.2448120117 ) ( -2267.4462890625 -39.7566223145 381.1789550781 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 +( -2481.6440429688 -9.0321044922 535.0275878906 ) ( -2748.7060546875 214.0863037109 535.0275878906 ) ( -2427.12890625 56.2197265625 197.5748901367 ) q3r_stone/Stein2 592 776 0 0.5 0.5 0 0 0 +( -2466.0676269531 -492.8591003418 320.5791625977 ) ( -2223.833984375 -243.0055084229 320.5791625977 ) ( -2558.9877929688 -402.7726135254 -2.4598999023 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 ( -2491.2465820313 -338.0788574219 178.9908905029 ) ( -2379.5349121094 -8.4965209961 178.9908905029 ) ( -2747.9125976563 -251.0821685791 -39.3163757324 ) q3r_stone/Stein2 592 272 0 0.5 0.5 0 0 0 -( -2533.3845214844 -502.6901550293 647.2974853516 ) ( -2248.4815673828 -302.8546142578 647.2974853516 ) ( -2420.0883789063 -664.2150268555 360.6309509277 ) q3r_stone/Stein2 592 776 0 0.5 0.5 0 0 0 +( -2533.3845214844 -502.6901550293 647.2974853516 ) ( -2248.4814453125 -302.8546142578 647.2974853516 ) ( -2420.0883789063 -664.2150268555 360.6309509277 ) q3r_stone/Stein2 592 776 0 0.5 0.5 0 0 0 ( -2380.9689941406 -251.5523986816 307.4346313477 ) ( -2398.9990234375 95.9802246094 307.4346313477 ) ( -2523.3430175781 -258.9387817383 -10.022644043 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 ( -2447.1005859375 -221.201385498 213.4341888428 ) ( -2510.91015625 120.8984985352 213.4341888428 ) ( -2679.6555175781 -264.578338623 -41.7924194336 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 ( -2402.2229003906 -134.2210540771 324.6081542969 ) ( -2545.6352539063 182.8545532227 324.6081542969 ) ( -2516.4721679688 -185.8955383301 -0.0160827637 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 -( -2425.7360839844 -474.6232299805 515.4465332031 ) ( -2215.3591308594 -197.4130554199 515.4465332031 ) ( -2373.6027832031 -514.1877593994 173.656036377 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 +( -2425.7360839844 -474.6232299805 515.4465332031 ) ( -2215.3591308594 -197.4130554199 515.4465332031 ) ( -2373.6027832031 -514.1877441406 173.656036377 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 ( -2514.1000976563 26.9774169922 466.5266418457 ) ( -2809.4106445313 211.085144043 466.5266418457 ) ( -2505.3566894531 41.0018005371 118.9192810059 ) q3r_stone/Stein2 592 776 0 0.5 0.5 0 0 0 -( -2406.9279785156 -320.1560974121 633.4687042236 ) ( -2345.5485839844 22.3881835938 633.4687042236 ) ( -2226.3354492188 -352.5157623291 337.7606811523 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 +( -2406.9279785156 -320.1560974121 633.4686889648 ) ( -2345.5485839844 22.3881835938 633.4686889648 ) ( -2226.3354492188 -352.5157470703 337.7606811523 ) q3r_stone/Stein2 752 776 0 0.5 0.5 0 0 0 ( -2493.8830566406 -13.0926208496 329.740020752 ) ( -2765.5258789063 204.4254150391 329.740020752 ) ( -2569.0517578125 -106.9655456543 3.1798400879 ) q3r_stone/Stein2 592 776 0 0.5 0.5 0 0 0 -( -2484.0070800781 -513.6332550049 327.626159668 ) ( -2221.6154785156 -285.0406036377 327.626159668 ) ( -2564.3916015625 -421.3634796143 1.8522338867 ) q3r_stone/Stein2 592 776 0 0.5 0.5 0 0 0 +( -2484.0070800781 -513.6332397461 327.626159668 ) ( -2221.6154785156 -285.0405883789 327.626159668 ) ( -2564.3916015625 -421.3634643555 1.8522338867 ) q3r_stone/Stein2 592 776 0 0.5 0.5 0 0 0 ( -2432 516 864 ) ( -2432 572 -528 ) ( -2432 572 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0 } // brush 73 { -( -2510.2443847656 -453.5907440186 277.3124084473 ) ( -2703.1518554688 -163.9518127441 277.3124084473 ) ( -2261.1280517578 -287.6723632813 99.7846984863 ) q3r_stone/Stein2 512 728 0 0.5 0.5 0 0 0 +( -2510.2443847656 -453.5907592773 277.3124084473 ) ( -2703.1518554688 -163.9518127441 277.3124084473 ) ( -2261.1279296875 -287.6723632813 99.7846984863 ) q3r_stone/Stein2 512 728 0 0.5 0.5 0 0 0 ( -2402.416015625 -345.6661987305 92.922668457 ) ( -2621.013671875 -74.8912353516 92.922668457 ) ( -2312.99609375 -273.4770812988 -235.5537872314 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 -( -2401.0532226563 -690.1116333008 -211.7564544678 ) ( -2236.2924804688 -383.5860900879 -211.7564544678 ) ( -2568.1945800781 -600.2713775635 -503.4694824219 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 -( -2417.7392578125 -611.640914917 222.5848693848 ) ( -2333.8984375 -273.8914794922 222.5848693848 ) ( -2180.3587646484 -670.5668640137 -24.9676361084 ) q3r_stone/Stein2 512 728 0 0.5 0.5 0 0 0 -( -2412.3203125 -421.7613372803 187.2448120117 ) ( -2575.3142089844 -114.2927246094 187.2448120117 ) ( -2227.4461669922 -323.7566223145 -90.8210296631 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 +( -2401.0532226563 -690.1116333008 -211.7564544678 ) ( -2236.2924804688 -383.5860900879 -211.7564544678 ) ( -2568.1945800781 -600.2713623047 -503.4694824219 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 +( -2417.7392578125 -611.6409301758 222.5848693848 ) ( -2333.8984375 -273.8914794922 222.5848693848 ) ( -2180.3588867188 -670.5668945313 -24.9676361084 ) q3r_stone/Stein2 512 728 0 0.5 0.5 0 0 0 +( -2412.3203125 -421.7613525391 187.2448120117 ) ( -2575.3142089844 -114.2927246094 187.2448120117 ) ( -2227.4462890625 -323.7566223145 -90.8210296631 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 ( -2456.7717285156 -300.2164916992 109.2108459473 ) ( -2728.6186523438 -82.9534301758 109.2108459473 ) ( -2374.8542480469 -197.7185974121 -213.1053009033 ) q3r_stone/Stein2 512 856 0 0.5 0.5 0 0 0 ( -2441.6440429688 -293.0321044922 63.0275726318 ) ( -2708.7060546875 -69.9136962891 63.0275726318 ) ( -2387.12890625 -227.7802734375 -274.4251098633 ) q3r_stone/Stein2 512 856 0 0.5 0.5 0 0 0 -( -2426.0676269531 -776.8591003418 -151.4208374023 ) ( -2183.8338623047 -527.0055084229 -151.4208374023 ) ( -2518.9877929688 -686.7726135254 -474.4598999023 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 -( -2451.2465820313 -622.0788574219 -293.0091094971 ) ( -2339.5349121094 -292.4965209961 -293.0091094971 ) ( -2707.9125976563 -535.0821685791 -511.3163757324 ) q3r_stone/Stein2 512 728 0 0.5 0.5 0 0 0 -( -2489.09765625 -855.3087615967 2.0780944824 ) ( -2185.0601806641 -686.000579834 2.0780944824 ) ( -2477.3830566406 -876.3450775146 -345.0879516602 ) q3r_stone/Stein2 512 856 0 0.5 0.5 0 0 0 -( -2493.3845214844 -786.6901550293 175.2974853516 ) ( -2208.4815673828 -586.8546142578 175.2974853516 ) ( -2380.0883789063 -948.2150268555 -111.3690490723 ) q3r_stone/Stein2 512 856 0 0.5 0.5 0 0 0 -( -2340.9689941406 -535.5523986816 -164.5653686523 ) ( -2358.9990234375 -188.0197753906 -164.5653686523 ) ( -2483.3430175781 -542.9387817383 -482.022644043 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 -( -2407.1005859375 -505.201385498 -258.5658111572 ) ( -2470.91015625 -163.1015014648 -258.5658111572 ) ( -2639.6555175781 -548.578338623 -513.7924194336 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 -( -2362.2229003906 -418.2210540771 -147.3918457031 ) ( -2505.6352539063 -101.1454467773 -147.3918457031 ) ( -2476.4721679688 -469.8955383301 -472.0160827637 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 -( -2385.7360839844 -758.6232299805 43.4465332031 ) ( -2175.3591308594 -481.4130554199 43.4465332031 ) ( -2333.6027832031 -798.1877593994 -298.343963623 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 +( -2426.0676269531 -776.8591308594 -151.4208374023 ) ( -2183.833984375 -527.0054931641 -151.4208374023 ) ( -2518.9877929688 -686.7725830078 -474.4598999023 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 +( -2451.2465820313 -622.0788574219 -293.0090942383 ) ( -2339.5349121094 -292.4965209961 -293.0090942383 ) ( -2707.9125976563 -535.0821533203 -511.3163757324 ) q3r_stone/Stein2 512 728 0 0.5 0.5 0 0 0 +( -2489.09765625 -855.3087768555 2.0780944824 ) ( -2185.0600585938 -686.0006103516 2.0780944824 ) ( -2477.3830566406 -876.3450927734 -345.0879516602 ) q3r_stone/Stein2 512 856 0 0.5 0.5 0 0 0 +( -2493.3845214844 -786.6901855469 175.2974853516 ) ( -2208.4814453125 -586.8546142578 175.2974853516 ) ( -2380.0883789063 -948.2150268555 -111.3690490723 ) q3r_stone/Stein2 512 856 0 0.5 0.5 0 0 0 +( -2340.9689941406 -535.5523681641 -164.5653686523 ) ( -2358.9990234375 -188.0197753906 -164.5653686523 ) ( -2483.3430175781 -542.9387817383 -482.022644043 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 +( -2407.1005859375 -505.201385498 -258.5657958984 ) ( -2470.91015625 -163.1015014648 -258.5657958984 ) ( -2639.6555175781 -548.5783691406 -513.7924194336 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 +( -2362.2229003906 -418.2210693359 -147.3918457031 ) ( -2505.6352539063 -101.1454467773 -147.3918457031 ) ( -2476.4721679688 -469.8955383301 -472.0160827637 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 +( -2385.7360839844 -758.6232299805 43.4465332031 ) ( -2175.3591308594 -481.4130554199 43.4465332031 ) ( -2333.6027832031 -798.1877441406 -298.343963623 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 ( -2474.1000976563 -257.0225830078 -5.4733581543 ) ( -2769.4106445313 -72.914855957 -5.4733581543 ) ( -2465.3566894531 -242.9981994629 -353.0807189941 ) q3r_stone/Stein2 512 856 0 0.5 0.5 0 0 0 -( -2366.9279785156 -604.1560974121 161.4687042236 ) ( -2305.5485839844 -261.6118164063 161.4687042236 ) ( -2186.3354492188 -636.5157623291 -134.2393188477 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 +( -2366.9279785156 -604.1561279297 161.4687042236 ) ( -2305.5485839844 -261.6118164063 161.4687042236 ) ( -2186.3354492188 -636.5157470703 -134.2393188477 ) q3r_stone/Stein2 296 856 0 0.5 0.5 0 0 0 ( -2453.8830566406 -297.0926208496 -142.259979248 ) ( -2725.5258789063 -79.5745849609 -142.259979248 ) ( -2529.0517578125 -390.9655456543 -468.8201599121 ) q3r_stone/Stein2 512 856 0 0.5 0.5 0 0 0 -( -2444.0070800781 -797.6332550049 -144.373840332 ) ( -2181.6154785156 -569.0406036377 -144.373840332 ) ( -2524.3916015625 -705.3634796143 -470.1477661133 ) q3r_stone/Stein2 512 856 0 0.5 0.5 0 0 0 +( -2444.0070800781 -797.6332397461 -144.373840332 ) ( -2181.6154785156 -569.0405883789 -144.373840332 ) ( -2524.3916015625 -705.3634643555 -470.1477661133 ) q3r_stone/Stein2 512 856 0 0.5 0.5 0 0 0 ( -2432 516 864 ) ( -2432 572 -528 ) ( -2432 572 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0 } // brush 74 { ( -2482.416015625 274.3338012695 432.922668457 ) ( -2701.013671875 545.1087646484 432.922668457 ) ( -2392.99609375 346.5229187012 104.4462127686 ) q3r_stone/Stein2 80 512 0 0.5 0.5 0 0 0 ( -2481.0532226563 -70.1116333008 128.2435455322 ) ( -2316.2924804688 236.4139099121 128.2435455322 ) ( -2648.1945800781 19.7286224365 -163.4694824219 ) q3r_stone/Stein2 80 512 0 0.5 0.5 0 0 0 -( -2492.3203125 198.2386627197 527.2448120117 ) ( -2655.3142089844 505.7072753906 527.2448120117 ) ( -2307.4461669922 296.2433776855 249.1789703369 ) q3r_stone/Stein2 80 512 0 0.5 0.5 0 0 0 -( -2506.0676269531 -156.8591003418 188.5791625977 ) ( -2263.8338623047 92.9944915771 188.5791625977 ) ( -2598.9877929688 -66.7726135254 -134.4598999023 ) q3r_stone/Stein2 80 512 0 0.5 0.5 0 0 0 +( -2492.3203125 198.2386627197 527.2448120117 ) ( -2655.3142089844 505.7072753906 527.2448120117 ) ( -2307.4462890625 296.2433776855 249.1789703369 ) q3r_stone/Stein2 80 512 0 0.5 0.5 0 0 0 +( -2506.0676269531 -156.8591003418 188.5791625977 ) ( -2263.833984375 92.9944915771 188.5791625977 ) ( -2598.9877929688 -66.7726135254 -134.4598999023 ) q3r_stone/Stein2 80 512 0 0.5 0.5 0 0 0 ( -2420.9689941406 84.4476013184 175.4346313477 ) ( -2438.9990234375 431.9802246094 175.4346313477 ) ( -2563.3430175781 77.0612182617 -142.022644043 ) q3r_stone/Stein2 80 512 0 0.5 0.5 0 0 0 ( -2442.2229003906 201.7789459229 192.6081542969 ) ( -2585.6352539063 518.8545532227 192.6081542969 ) ( -2556.4721679688 150.1044616699 -132.0160827637 ) q3r_stone/Stein2 80 512 0 0.5 0.5 0 0 0 ( -2465.7360839844 -138.6232299805 383.4465332031 ) ( -2255.3591308594 138.5869445801 383.4465332031 ) ( -2413.6027832031 -178.1877593994 41.656036377 ) q3r_stone/Stein2 80 512 0 0.5 0.5 0 0 0 -( -2446.9279785156 15.8439025879 501.4687042236 ) ( -2385.5485839844 358.3881835938 501.4687042236 ) ( -2266.3354492188 -16.5157623291 205.7606811523 ) q3r_stone/Stein2 80 512 0 0.5 0.5 0 0 0 +( -2446.9279785156 15.8439025879 501.4686889648 ) ( -2385.5485839844 358.3881835938 501.4686889648 ) ( -2266.3354492188 -16.5157623291 205.7606811523 ) q3r_stone/Stein2 80 512 0 0.5 0.5 0 0 0 ( -2432 516 864 ) ( -2432 572 -528 ) ( -2432 572 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0 } // brush 75 { -( -2510.2443847656 206.4092559814 253.3124084473 ) ( -2703.1518554688 496.0481872559 253.3124084473 ) ( -2261.1280517578 372.3276367188 75.7846984863 ) q3r_stone/Stein2 512 0 0 0.5 0.5 0 0 0 -( -2402.416015625 314.3338012695 68.922668457 ) ( -2621.013671875 585.1087646484 68.922668457 ) ( -2312.99609375 386.5229187012 -259.5537872314 ) q3r_stone/Stein2 0 808 0 0.5 0.5 0 0 0 +( -2510.2443847656 206.4092559814 253.3124084473 ) ( -2703.1518554688 496.0481872559 253.3124084473 ) ( -2261.1279296875 372.3276367188 75.7846984863 ) q3r_stone/Stein2 512 0 0 0.5 0.5 0 0 0 +( -2402.416015625 314.3338012695 68.922668457 ) ( -2621.013671875 585.1087646484 68.922668457 ) ( -2312.99609375 386.5229187012 -259.5537719727 ) q3r_stone/Stein2 0 808 0 0.5 0.5 0 0 0 ( -2401.0532226563 -30.1116333008 -235.7564544678 ) ( -2236.2924804688 276.4139099121 -235.7564544678 ) ( -2568.1945800781 59.7286224365 -527.4694824219 ) q3r_stone/Stein2 0 808 0 0.5 0.5 0 0 0 -( -2417.7392578125 48.359085083 198.5848693848 ) ( -2333.8984375 386.1085205078 198.5848693848 ) ( -2180.3587646484 -10.5668640137 -48.9676361084 ) q3r_stone/Stein2 512 0 0 0.5 0.5 0 0 0 -( -2412.3203125 238.2386627197 163.2448120117 ) ( -2575.3142089844 545.7072753906 163.2448120117 ) ( -2227.4461669922 336.2433776855 -114.8210296631 ) q3r_stone/Stein2 0 808 0 0.5 0.5 0 0 0 +( -2417.7392578125 48.359085083 198.5848693848 ) ( -2333.8984375 386.1085205078 198.5848693848 ) ( -2180.3588867188 -10.5668640137 -48.9676361084 ) q3r_stone/Stein2 512 0 0 0.5 0.5 0 0 0 +( -2412.3203125 238.2386627197 163.2448120117 ) ( -2575.3142089844 545.7072753906 163.2448120117 ) ( -2227.4462890625 336.2433776855 -114.8210296631 ) q3r_stone/Stein2 0 808 0 0.5 0.5 0 0 0 ( -2456.7717285156 359.7835083008 85.2108459473 ) ( -2728.6186523438 577.0465698242 85.2108459473 ) ( -2374.8542480469 462.2814025879 -237.1053009033 ) q3r_stone/Stein2 512 808 0 0.5 0.5 0 0 0 ( -2441.6440429688 366.9678955078 39.0275726318 ) ( -2708.7060546875 590.0863037109 39.0275726318 ) ( -2387.12890625 432.2197265625 -298.4251098633 ) q3r_stone/Stein2 512 808 0 0.5 0.5 0 0 0 -( -2426.0676269531 -116.8591003418 -175.4208374023 ) ( -2183.8338623047 132.9944915771 -175.4208374023 ) ( -2518.9877929688 -26.7726135254 -498.4598999023 ) q3r_stone/Stein2 0 808 0 0.5 0.5 0 0 0 -( -2451.2465820313 37.9211425781 -317.0091094971 ) ( -2339.5349121094 367.5034790039 -317.0091094971 ) ( -2707.9125976563 124.9178314209 -535.3163757324 ) q3r_stone/Stein2 512 0 0 0.5 0.5 0 0 0 -( -2489.09765625 -195.3087615967 -21.9219055176 ) ( -2185.0601806641 -26.000579834 -21.9219055176 ) ( -2477.3830566406 -216.3450775146 -369.0879516602 ) q3r_stone/Stein2 512 808 0 0.5 0.5 0 0 0 -( -2493.3845214844 -126.6901550293 151.2974853516 ) ( -2208.4815673828 73.1453857422 151.2974853516 ) ( -2380.0883789063 -288.2150268555 -135.3690490723 ) q3r_stone/Stein2 512 808 0 0.5 0.5 0 0 0 +( -2426.0676269531 -116.8591003418 -175.4208374023 ) ( -2183.833984375 132.9944915771 -175.4208374023 ) ( -2518.9877929688 -26.7726135254 -498.4598999023 ) q3r_stone/Stein2 0 808 0 0.5 0.5 0 0 0 +( -2451.2465820313 37.9211425781 -317.0090942383 ) ( -2339.5349121094 367.5034790039 -317.0090942383 ) ( -2707.9125976563 124.9178314209 -535.31640625 ) q3r_stone/Stein2 512 0 0 0.5 0.5 0 0 0 +( -2489.09765625 -195.3087615967 -21.9219055176 ) ( -2185.0600585938 -26.000579834 -21.9219055176 ) ( -2477.3830566406 -216.3450775146 -369.0879516602 ) q3r_stone/Stein2 512 808 0 0.5 0.5 0 0 0 +( -2493.3845214844 -126.6901550293 151.2974853516 ) ( -2208.4814453125 73.1453857422 151.2974853516 ) ( -2380.0883789063 -288.2150268555 -135.3690490723 ) q3r_stone/Stein2 512 808 0 0.5 0.5 0 0 0 ( -2340.9689941406 124.4476013184 -188.5653686523 ) ( -2358.9990234375 471.9802246094 -188.5653686523 ) ( -2483.3430175781 117.0612182617 -506.022644043 ) q3r_stone/Stein2 0 808 0 0.5 0.5 0 0 0 -( -2407.1005859375 154.798614502 -282.5658111572 ) ( -2470.91015625 496.8984985352 -282.5658111572 ) ( -2639.6555175781 111.421661377 -537.7924194336 ) q3r_stone/Stein2 0 808 0 0.5 0.5 0 0 0 +( -2407.1005859375 154.798614502 -282.5657958984 ) ( -2470.91015625 496.8984985352 -282.5657958984 ) ( -2639.6555175781 111.421661377 -537.7924194336 ) q3r_stone/Stein2 0 808 0 0.5 0.5 0 0 0 ( -2362.2229003906 241.7789459229 -171.3918457031 ) ( -2505.6352539063 558.8545532227 -171.3918457031 ) ( -2476.4721679688 190.1044616699 -496.0160827637 ) q3r_stone/Stein2 0 808 0 0.5 0.5 0 0 0 ( -2385.7360839844 -98.6232299805 19.4465332031 ) ( -2175.3591308594 178.5869445801 19.4465332031 ) ( -2333.6027832031 -138.1877593994 -322.343963623 ) q3r_stone/Stein2 0 808 0 0.5 0.5 0 0 0 ( -2474.1000976563 402.9774169922 -29.4733581543 ) ( -2769.4106445313 587.085144043 -29.4733581543 ) ( -2465.3566894531 417.0018005371 -377.0807189941 ) q3r_stone/Stein2 512 808 0 0.5 0.5 0 0 0 @@ -790,104 +790,104 @@ base_trim/rusty_pewter_big // brush 76 { ( -2418.416015625 -25.6661987305 244.922668457 ) ( -2637.013671875 245.1087646484 244.922668457 ) ( -2328.99609375 46.5229187012 -83.5537872314 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 -( -2417.0532226563 -370.1116333008 -59.7564544678 ) ( -2252.2924804688 -63.5860900879 -59.7564544678 ) ( -2584.1945800781 -280.2713775635 -351.4694824219 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 -( -2433.7392578125 -291.640914917 374.5848693848 ) ( -2349.8984375 46.1085205078 374.5848693848 ) ( -2196.3587646484 -350.5668640137 127.0323638916 ) q3r_stone/Stein2 544 344 0 0.5 0.5 0 0 0 -( -2428.3203125 -101.7613372803 339.2448120117 ) ( -2591.3142089844 205.7072753906 339.2448120117 ) ( -2243.4461669922 -3.7566223145 61.1789703369 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 +( -2417.0532226563 -370.1116333008 -59.7564544678 ) ( -2252.2924804688 -63.5860900879 -59.7564544678 ) ( -2584.1945800781 -280.2713623047 -351.4694824219 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 +( -2433.7392578125 -291.6409301758 374.5848693848 ) ( -2349.8984375 46.1085205078 374.5848693848 ) ( -2196.3588867188 -350.5668640137 127.0323638916 ) q3r_stone/Stein2 544 344 0 0.5 0.5 0 0 0 +( -2428.3203125 -101.7613372803 339.2448120117 ) ( -2591.3142089844 205.7072753906 339.2448120117 ) ( -2243.4462890625 -3.7566223145 61.1789703369 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 ( -2457.6440429688 26.9678955078 215.0275726318 ) ( -2724.7060546875 250.0863037109 215.0275726318 ) ( -2403.12890625 92.2197265625 -122.4251098633 ) q3r_stone/Stein2 544 136 0 0.5 0.5 0 0 0 -( -2442.0676269531 -456.8591003418 0.5791625977 ) ( -2199.8338623047 -207.0055084229 0.5791625977 ) ( -2534.9877929688 -366.7726135254 -322.4598999023 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 +( -2442.0676269531 -456.8591003418 0.5791625977 ) ( -2199.833984375 -207.0055084229 0.5791625977 ) ( -2534.9877929688 -366.7726135254 -322.4598999023 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 ( -2467.2465820313 -302.0788574219 -141.0091094971 ) ( -2355.5349121094 27.5034790039 -141.0091094971 ) ( -2723.9125976563 -215.0821685791 -359.3163757324 ) q3r_stone/Stein2 544 344 0 0.5 0.5 0 0 0 -( -2505.09765625 -535.3087615967 154.0780944824 ) ( -2201.0601806641 -366.000579834 154.0780944824 ) ( -2493.3830566406 -556.3450775146 -193.0879516602 ) q3r_stone/Stein2 544 136 0 0.5 0.5 0 0 0 -( -2509.3845214844 -466.6901550293 327.2974853516 ) ( -2224.4815673828 -266.8546142578 327.2974853516 ) ( -2396.0883789063 -628.2150268555 40.6309509277 ) q3r_stone/Stein2 544 136 0 0.5 0.5 0 0 0 +( -2505.09765625 -535.3087768555 154.0780944824 ) ( -2201.0600585938 -366.000579834 154.0780944824 ) ( -2493.3830566406 -556.3450927734 -193.0879516602 ) q3r_stone/Stein2 544 136 0 0.5 0.5 0 0 0 +( -2509.3845214844 -466.6901550293 327.2974853516 ) ( -2224.4814453125 -266.8546142578 327.2974853516 ) ( -2396.0883789063 -628.2150268555 40.6309509277 ) q3r_stone/Stein2 544 136 0 0.5 0.5 0 0 0 ( -2356.9689941406 -215.5523986816 -12.5653686523 ) ( -2374.9990234375 131.9802246094 -12.5653686523 ) ( -2499.3430175781 -222.9387817383 -330.022644043 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 ( -2423.1005859375 -185.201385498 -106.5658111572 ) ( -2486.91015625 156.8984985352 -106.5658111572 ) ( -2655.6555175781 -228.578338623 -361.7924194336 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 ( -2378.2229003906 -98.2210540771 4.6081542969 ) ( -2521.6352539063 218.8545532227 4.6081542969 ) ( -2492.4721679688 -149.8955383301 -320.0160827637 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 -( -2401.7360839844 -438.6232299805 195.4465332031 ) ( -2191.3591308594 -161.4130554199 195.4465332031 ) ( -2349.6027832031 -478.1877593994 -146.343963623 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 +( -2401.7360839844 -438.6232299805 195.4465332031 ) ( -2191.3591308594 -161.4130554199 195.4465332031 ) ( -2349.6027832031 -478.1877441406 -146.343963623 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 ( -2490.1000976563 62.9774169922 146.5266418457 ) ( -2785.4106445313 247.085144043 146.5266418457 ) ( -2481.3566894531 77.0018005371 -201.0807189941 ) q3r_stone/Stein2 544 136 0 0.5 0.5 0 0 0 -( -2382.9279785156 -284.1560974121 313.4687042236 ) ( -2321.5485839844 58.3881835938 313.4687042236 ) ( -2202.3354492188 -316.5157623291 17.7606811523 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 +( -2382.9279785156 -284.1560974121 313.4686889648 ) ( -2321.5485839844 58.3881835938 313.4686889648 ) ( -2202.3354492188 -316.5157470703 17.7606811523 ) q3r_stone/Stein2 680 136 0 0.5 0.5 0 0 0 ( -2469.8830566406 22.9073791504 9.740020752 ) ( -2741.5258789063 240.4254150391 9.740020752 ) ( -2545.0517578125 -70.9655456543 -316.8201599121 ) q3r_stone/Stein2 544 136 0 0.5 0.5 0 0 0 -( -2460.0070800781 -477.6332550049 7.626159668 ) ( -2197.6154785156 -249.0406036377 7.626159668 ) ( -2540.3916015625 -385.3634796143 -318.1477661133 ) q3r_stone/Stein2 544 136 0 0.5 0.5 0 0 0 +( -2460.0070800781 -477.6332397461 7.626159668 ) ( -2197.6154785156 -249.0406036377 7.626159668 ) ( -2540.3916015625 -385.3634643555 -318.1477661133 ) q3r_stone/Stein2 544 136 0 0.5 0.5 0 0 0 ( -2432 516 864 ) ( -2432 572 -528 ) ( -2432 572 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0 } // brush 77 { -( -2434.416015625 482.3338012695 124.922668457 ) ( -2653.013671875 753.1087646484 124.922668457 ) ( -2344.99609375 554.5229187012 -203.5537872314 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 +( -2434.416015625 482.3338012695 124.922668457 ) ( -2653.013671875 753.1087646484 124.922668457 ) ( -2344.99609375 554.5229492188 -203.5537872314 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 ( -2433.0532226563 137.8883666992 -179.7564544678 ) ( -2268.2924804688 444.4139099121 -179.7564544678 ) ( -2600.1945800781 227.7286224365 -471.4694824219 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 -( -2449.7392578125 216.359085083 254.5848693848 ) ( -2365.8984375 554.1085205078 254.5848693848 ) ( -2212.3587646484 157.4331359863 7.0323638916 ) q3r_stone/Stein2 576 336 0 0.5 0.5 0 0 0 -( -2444.3203125 406.2386627197 219.2448120117 ) ( -2607.3142089844 713.7072753906 219.2448120117 ) ( -2259.4461669922 504.2433776855 -58.8210296631 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 +( -2449.7392578125 216.359085083 254.5848693848 ) ( -2365.8984375 554.1085205078 254.5848693848 ) ( -2212.3588867188 157.4331359863 7.0323638916 ) q3r_stone/Stein2 576 336 0 0.5 0.5 0 0 0 +( -2444.3203125 406.2386474609 219.2448120117 ) ( -2607.3142089844 713.7072753906 219.2448120117 ) ( -2259.4462890625 504.2433776855 -58.8210296631 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 ( -2473.6440429688 534.9678955078 95.0275726318 ) ( -2740.7060546875 758.0863037109 95.0275726318 ) ( -2419.12890625 600.2197265625 -242.4251098633 ) q3r_stone/Stein2 576 920 0 0.5 0.5 0 0 0 -( -2458.0676269531 51.1408996582 -119.4208374023 ) ( -2215.8338623047 300.9944915771 -119.4208374023 ) ( -2550.9877929688 141.2273864746 -442.4598999023 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 -( -2483.2465820313 205.9211425781 -261.0091094971 ) ( -2371.5349121094 535.5034790039 -261.0091094971 ) ( -2739.9125976563 292.9178314209 -479.3163757324 ) q3r_stone/Stein2 576 336 0 0.5 0.5 0 0 0 -( -2525.3845214844 41.3098449707 207.2974853516 ) ( -2240.4815673828 241.1453857422 207.2974853516 ) ( -2412.0883789063 -120.2150268555 -79.3690490723 ) q3r_stone/Stein2 576 920 0 0.5 0.5 0 0 0 +( -2458.0676269531 51.1408996582 -119.4208374023 ) ( -2215.833984375 300.9945068359 -119.4208374023 ) ( -2550.9877929688 141.2273864746 -442.4598999023 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 +( -2483.2465820313 205.9211425781 -261.0090942383 ) ( -2371.5349121094 535.5034790039 -261.0090942383 ) ( -2739.9125976563 292.9178466797 -479.3163757324 ) q3r_stone/Stein2 576 336 0 0.5 0.5 0 0 0 +( -2525.3845214844 41.3098449707 207.2974853516 ) ( -2240.4814453125 241.1453857422 207.2974853516 ) ( -2412.0883789063 -120.2150268555 -79.3690490723 ) q3r_stone/Stein2 576 920 0 0.5 0.5 0 0 0 ( -2372.9689941406 292.4476013184 -132.5653686523 ) ( -2390.9990234375 639.9802246094 -132.5653686523 ) ( -2515.3430175781 285.0612182617 -450.022644043 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 ( -2439.1005859375 322.798614502 -226.5658111572 ) ( -2502.91015625 664.8984985352 -226.5658111572 ) ( -2671.6555175781 279.421661377 -481.7924194336 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 -( -2394.2229003906 409.7789459229 -115.3918457031 ) ( -2537.6352539063 726.8545532227 -115.3918457031 ) ( -2508.4721679688 358.1044616699 -440.0160827637 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 +( -2394.2229003906 409.7789306641 -115.3918457031 ) ( -2537.6352539063 726.8545532227 -115.3918457031 ) ( -2508.4721679688 358.1044616699 -440.0160827637 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 ( -2417.7360839844 69.3767700195 75.4465332031 ) ( -2207.3591308594 346.5869445801 75.4465332031 ) ( -2365.6027832031 29.8122406006 -266.343963623 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 -( -2506.1000976563 570.9774169922 26.5266418457 ) ( -2801.4106445313 755.085144043 26.5266418457 ) ( -2497.3566894531 585.0018005371 -321.0807189941 ) q3r_stone/Stein2 576 920 0 0.5 0.5 0 0 0 +( -2506.1000976563 570.9774169922 26.5266418457 ) ( -2801.4106445313 755.085144043 26.5266418457 ) ( -2497.3566894531 585.0018310547 -321.0807189941 ) q3r_stone/Stein2 576 920 0 0.5 0.5 0 0 0 ( -2398.9279785156 223.8439025879 193.4687042236 ) ( -2337.5485839844 566.3881835938 193.4687042236 ) ( -2218.3354492188 191.4842376709 -102.2393188477 ) q3r_stone/Stein2 688 920 0 0.5 0.5 0 0 0 -( -2485.8830566406 530.9073791504 -110.259979248 ) ( -2757.5258789063 748.4254150391 -110.259979248 ) ( -2561.0517578125 437.0344543457 -436.8201599121 ) q3r_stone/Stein2 576 920 0 0.5 0.5 0 0 0 -( -2476.0070800781 30.3667449951 -112.373840332 ) ( -2213.6154785156 258.9593963623 -112.373840332 ) ( -2556.3916015625 122.6365203857 -438.1477661133 ) q3r_stone/Stein2 576 920 0 0.5 0.5 0 0 0 +( -2485.8830566406 530.9073486328 -110.259979248 ) ( -2757.5258789063 748.4254150391 -110.259979248 ) ( -2561.0517578125 437.0344543457 -436.8201599121 ) q3r_stone/Stein2 576 920 0 0.5 0.5 0 0 0 +( -2476.0070800781 30.3667449951 -112.373840332 ) ( -2213.6154785156 258.9594116211 -112.373840332 ) ( -2556.3916015625 122.6365203857 -438.1477661133 ) q3r_stone/Stein2 576 920 0 0.5 0.5 0 0 0 ( -2432 516 864 ) ( -2432 572 -528 ) ( -2432 572 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0 } // brush 78 { ( -2482.416015625 -409.6661987305 392.922668457 ) ( -2701.013671875 -138.8912353516 392.922668457 ) ( -2392.99609375 -337.4770812988 64.4462127686 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 -( -2481.0532226563 -754.1116333008 88.2435455322 ) ( -2316.2924804688 -447.5860900879 88.2435455322 ) ( -2648.1945800781 -664.2713775635 -203.4694824219 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 -( -2492.3203125 -485.7613372803 487.2448120117 ) ( -2655.3142089844 -178.2927246094 487.2448120117 ) ( -2307.4461669922 -387.7566223145 209.1789703369 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 -( -2506.0676269531 -840.8591003418 148.5791625977 ) ( -2263.8338623047 -591.0055084229 148.5791625977 ) ( -2598.9877929688 -750.7726135254 -174.4598999023 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 -( -2420.9689941406 -599.5523986816 135.4346313477 ) ( -2438.9990234375 -252.0197753906 135.4346313477 ) ( -2563.3430175781 -606.9387817383 -182.022644043 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 -( -2442.2229003906 -482.2210540771 152.6081542969 ) ( -2585.6352539063 -165.1454467773 152.6081542969 ) ( -2556.4721679688 -533.8955383301 -172.0160827637 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 -( -2465.7360839844 -822.6232299805 343.4465332031 ) ( -2255.3591308594 -545.4130554199 343.4465332031 ) ( -2413.6027832031 -862.1877593994 1.656036377 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 -( -2446.9279785156 -668.1560974121 461.4687042236 ) ( -2385.5485839844 -325.6118164063 461.4687042236 ) ( -2266.3354492188 -700.5157623291 165.7606811523 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 +( -2481.0532226563 -754.1116333008 88.2435455322 ) ( -2316.2924804688 -447.5860900879 88.2435455322 ) ( -2648.1945800781 -664.2713623047 -203.4694824219 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 +( -2492.3203125 -485.7613525391 487.2448120117 ) ( -2655.3142089844 -178.2927246094 487.2448120117 ) ( -2307.4462890625 -387.7566223145 209.1789703369 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 +( -2506.0676269531 -840.8591308594 148.5791625977 ) ( -2263.833984375 -591.0054931641 148.5791625977 ) ( -2598.9877929688 -750.7725830078 -174.4598999023 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 +( -2420.9689941406 -599.5523681641 135.4346313477 ) ( -2438.9990234375 -252.0197753906 135.4346313477 ) ( -2563.3430175781 -606.9387817383 -182.022644043 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 +( -2442.2229003906 -482.2210693359 152.6081542969 ) ( -2585.6352539063 -165.1454467773 152.6081542969 ) ( -2556.4721679688 -533.8955078125 -172.0160827637 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 +( -2465.7360839844 -822.6232299805 343.4465332031 ) ( -2255.3591308594 -545.4130859375 343.4465332031 ) ( -2413.6027832031 -862.1877441406 1.656036377 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 +( -2446.9279785156 -668.1561279297 461.4686889648 ) ( -2385.5485839844 -325.6118164063 461.4686889648 ) ( -2266.3354492188 -700.5157470703 165.7606811523 ) q3r_stone/Stein2 424 432 0 0.5 0.5 0 0 0 ( -2432 516 864 ) ( -2432 572 -528 ) ( -2432 572 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0 } // brush 79 { -( -2486.416015625 454.3338012695 332.922668457 ) ( -2705.013671875 725.1087646484 332.922668457 ) ( -2396.99609375 526.5229187012 4.4462127686 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 +( -2486.416015625 454.3338012695 332.922668457 ) ( -2705.013671875 725.1087646484 332.922668457 ) ( -2396.99609375 526.5229492188 4.4462127686 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 ( -2485.0532226563 109.8883666992 28.2435455322 ) ( -2320.2924804688 416.4139099121 28.2435455322 ) ( -2652.1945800781 199.7286224365 -263.4694824219 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 -( -2496.3203125 378.2386627197 427.2448120117 ) ( -2659.3142089844 685.7072753906 427.2448120117 ) ( -2311.4461669922 476.2433776855 149.1789703369 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 -( -2510.0676269531 23.1408996582 88.5791625977 ) ( -2267.8338623047 272.9944915771 88.5791625977 ) ( -2602.9877929688 113.2273864746 -234.4598999023 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 +( -2496.3203125 378.2386474609 427.2448120117 ) ( -2659.3142089844 685.7072753906 427.2448120117 ) ( -2311.4462890625 476.2433776855 149.1789703369 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 +( -2510.0676269531 23.1408996582 88.5791625977 ) ( -2267.833984375 272.9945068359 88.5791625977 ) ( -2602.9877929688 113.2273864746 -234.4598999023 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 ( -2424.9689941406 264.4476013184 75.4346313477 ) ( -2442.9990234375 611.9802246094 75.4346313477 ) ( -2567.3430175781 257.0612182617 -242.022644043 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 -( -2446.2229003906 381.7789459229 92.6081542969 ) ( -2589.6352539063 698.8545532227 92.6081542969 ) ( -2560.4721679688 330.1044616699 -232.0160827637 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 +( -2446.2229003906 381.7789306641 92.6081542969 ) ( -2589.6352539063 698.8545532227 92.6081542969 ) ( -2560.4721679688 330.1044616699 -232.0160827637 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 ( -2469.7360839844 41.3767700195 283.4465332031 ) ( -2259.3591308594 318.5869445801 283.4465332031 ) ( -2417.6027832031 1.8122406006 -58.343963623 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 -( -2450.9279785156 195.8439025879 401.4687042236 ) ( -2389.5485839844 538.3881835938 401.4687042236 ) ( -2270.3354492188 163.4842376709 105.7606811523 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 +( -2450.9279785156 195.8439025879 401.4686889648 ) ( -2389.5485839844 538.3881835938 401.4686889648 ) ( -2270.3354492188 163.4842376709 105.7606811523 ) q3r_stone/Stein2 744 312 0 0.5 0.5 0 0 0 ( -2432 516 864 ) ( -2432 572 -528 ) ( -2432 572 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0 } // brush 80 { -( -2430.2443847656 -833.5907440186 293.3124084473 ) ( -2623.1518554688 -543.9518127441 293.3124084473 ) ( -2181.1280517578 -667.6723632813 115.7846984863 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 -( -2322.416015625 -725.6661987305 108.922668457 ) ( -2541.013671875 -454.8912353516 108.922668457 ) ( -2232.99609375 -653.4770812988 -219.5537872314 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 -( -2321.0532226563 -1070.1116333008 -195.7564544678 ) ( -2156.2924804688 -763.5860900879 -195.7564544678 ) ( -2488.1945800781 -980.2713775635 -487.4694824219 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 -( -2524.5393066406 -637.6640014648 -183.7984161377 ) ( -2866.9375 -575.4738464355 -183.7984161377 ) ( -2556.3132324219 -812.6002655029 -482.9500732422 ) q3r_stone/Stein2 352 888 0 0.5 0.5 0 0 0 -( -2507.2922363281 -1042.560836792 316.3052978516 ) ( -2214.1202392578 -855.0663757324 316.3052978516 ) ( -2333.6413574219 -1314.0863952637 185.067779541 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 -( -2337.7392578125 -991.640914917 238.5848693848 ) ( -2253.8984375 -653.8914794922 238.5848693848 ) ( -2100.3587646484 -1050.5668640137 -8.9676361084 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 -( -2332.3203125 -801.7613372803 203.2448120117 ) ( -2495.3142089844 -494.2927246094 203.2448120117 ) ( -2147.4461669922 -703.7566223145 -74.8210296631 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 -( -2376.7717285156 -680.2164916992 125.2108459473 ) ( -2648.6186523438 -462.9534301758 125.2108459473 ) ( -2294.8542480469 -577.7185974121 -197.1053009033 ) q3r_stone/Stein2 352 888 0 0.5 0.5 0 0 0 +( -2430.2443847656 -833.5907592773 293.3124084473 ) ( -2623.1518554688 -543.9517822266 293.3124084473 ) ( -2181.1279296875 -667.6723632813 115.7846984863 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 +( -2322.416015625 -725.6661987305 108.922668457 ) ( -2541.013671875 -454.8912353516 108.922668457 ) ( -2232.99609375 -653.4770507813 -219.5537872314 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 +( -2321.0532226563 -1070.1115722656 -195.7564544678 ) ( -2156.2924804688 -763.5860595703 -195.7564544678 ) ( -2488.1945800781 -980.2713623047 -487.4694824219 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 +( -2524.5393066406 -637.6640014648 -183.7984161377 ) ( -2866.9375 -575.4738769531 -183.7984161377 ) ( -2556.3132324219 -812.6002807617 -482.9500732422 ) q3r_stone/Stein2 352 888 0 0.5 0.5 0 0 0 +( -2507.2922363281 -1042.5607910156 316.3052978516 ) ( -2214.1201171875 -855.06640625 316.3052978516 ) ( -2333.6413574219 -1314.0864257813 185.067779541 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 +( -2337.7392578125 -991.6409301758 238.5848693848 ) ( -2253.8984375 -653.8914794922 238.5848693848 ) ( -2100.3588867188 -1050.5668945313 -8.9676361084 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 +( -2332.3203125 -801.7613525391 203.2448120117 ) ( -2495.3142089844 -494.2927246094 203.2448120117 ) ( -2147.4462890625 -703.7565917969 -74.8210296631 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 +( -2376.7717285156 -680.2164916992 125.2108459473 ) ( -2648.6186523438 -462.9534301758 125.2108459473 ) ( -2294.8542480469 -577.7186279297 -197.1053009033 ) q3r_stone/Stein2 352 888 0 0.5 0.5 0 0 0 ( -2361.6440429688 -673.0321044922 79.0275726318 ) ( -2628.7060546875 -449.9136962891 79.0275726318 ) ( -2307.12890625 -607.7802734375 -258.4251098633 ) q3r_stone/Stein2 352 888 0 0.5 0.5 0 0 0 -( -2371.2465820313 -1002.0788574219 -277.0091094971 ) ( -2259.5349121094 -672.4965209961 -277.0091094971 ) ( -2627.9125976563 -915.0821685791 -495.3163757324 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 -( -2536.6745605469 -707.0836791992 -268.3144226074 ) ( -2878.9450683594 -644.1958312988 -268.3144226074 ) ( -2584.0778808594 -965.0793762207 -496.9957275391 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 -( -2260.9689941406 -915.5523986816 -148.5653686523 ) ( -2278.9990234375 -568.0197753906 -148.5653686523 ) ( -2403.3430175781 -922.9387817383 -466.022644043 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 -( -2327.1005859375 -885.201385498 -242.5658111572 ) ( -2390.91015625 -543.1015014648 -242.5658111572 ) ( -2559.6555175781 -928.578338623 -497.7924194336 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 -( -2282.2229003906 -798.2210540771 -131.3918457031 ) ( -2425.6352539063 -481.1454467773 -131.3918457031 ) ( -2396.4721679688 -849.8955383301 -456.0160827637 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 -( -2447.599609375 -609.4030456543 -0.4344177246 ) ( -2770.2380371094 -478.9860839844 -0.4344177246 ) ( -2445.5139160156 -604.2430725098 -348.3898925781 ) q3r_stone/Stein2 352 888 0 0.5 0.5 0 0 0 -( -2457.03515625 -997.0805664063 -325.7436523438 ) ( -2292.1552734375 -690.6191101074 -325.7436523438 ) ( -2738.6130371094 -845.5883636475 -463.1044921875 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 -( -2485.4384765625 -932.5722808838 329.4639282227 ) ( -2483.2868652344 -584.5789489746 329.4639282227 ) ( -2149.9809570313 -934.6463317871 236.9006652832 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 -( -2305.7360839844 -1138.6232299805 59.4465332031 ) ( -2095.3591308594 -861.4130554199 59.4465332031 ) ( -2253.6027832031 -1178.1877593994 -282.343963623 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 -( -2394.1000976563 -637.0225830078 10.5266418457 ) ( -2689.4106445313 -452.914855957 10.5266418457 ) ( -2385.3566894531 -622.9981994629 -337.0807189941 ) q3r_stone/Stein2 352 888 0 0.5 0.5 0 0 0 -( -2286.9279785156 -984.1560974121 177.4687042236 ) ( -2225.5485839844 -641.6118164063 177.4687042236 ) ( -2106.3354492188 -1016.5157623291 -118.2393188477 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 -( -2373.8830566406 -677.0926208496 -126.259979248 ) ( -2645.5258789063 -459.5745849609 -126.259979248 ) ( -2449.0517578125 -770.9655456543 -452.8201599121 ) q3r_stone/Stein2 352 888 0 0.5 0.5 0 0 0 +( -2371.2465820313 -1002.0788574219 -277.0090942383 ) ( -2259.5349121094 -672.4965209961 -277.0090942383 ) ( -2627.9125976563 -915.0821533203 -495.3163757324 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 +( -2536.6745605469 -707.0836791992 -268.3144226074 ) ( -2878.9450683594 -644.1958007813 -268.3144226074 ) ( -2584.0778808594 -965.0793457031 -496.9957275391 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 +( -2260.9689941406 -915.5523681641 -148.5653686523 ) ( -2278.9990234375 -568.0197753906 -148.5653686523 ) ( -2403.3430175781 -922.9387817383 -466.022644043 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 +( -2327.1005859375 -885.2014160156 -242.5658111572 ) ( -2390.91015625 -543.1015014648 -242.5658111572 ) ( -2559.6555175781 -928.5783691406 -497.7924194336 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 +( -2282.2229003906 -798.2210693359 -131.3918457031 ) ( -2425.6352539063 -481.1454467773 -131.3918457031 ) ( -2396.4721679688 -849.8955078125 -456.0160827637 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 +( -2447.599609375 -609.4030761719 -0.4344177246 ) ( -2770.2380371094 -478.9860839844 -0.4344177246 ) ( -2445.5139160156 -604.2430419922 -348.3898925781 ) q3r_stone/Stein2 352 888 0 0.5 0.5 0 0 0 +( -2457.03515625 -997.0805664063 -325.7436523438 ) ( -2292.1552734375 -690.619140625 -325.7436523438 ) ( -2738.6130371094 -845.5883789063 -463.1044921875 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 +( -2485.4384765625 -932.572265625 329.4639282227 ) ( -2483.2868652344 -584.5789794922 329.4639282227 ) ( -2149.9809570313 -934.6463623047 236.9006652832 ) q3r_stone/Stein2 352 992 0 0.5 0.5 0 0 0 +( -2305.7360839844 -1138.6232910156 59.4465332031 ) ( -2095.3591308594 -861.4130859375 59.4465332031 ) ( -2253.6027832031 -1178.1877441406 -282.343963623 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 +( -2394.1000976563 -637.0225830078 10.5266418457 ) ( -2689.4106445313 -452.914855957 10.5266418457 ) ( -2385.3566894531 -622.9981689453 -337.0807189941 ) q3r_stone/Stein2 352 888 0 0.5 0.5 0 0 0 +( -2286.9279785156 -984.1561279297 177.4687042236 ) ( -2225.5485839844 -641.6118164063 177.4687042236 ) ( -2106.3354492188 -1016.5157470703 -118.2393188477 ) q3r_stone/Stein2 32 888 0 0.5 0.5 0 0 0 +( -2373.8830566406 -677.0926513672 -126.259979248 ) ( -2645.5258789063 -459.5745849609 -126.259979248 ) ( -2449.0517578125 -770.9655761719 -452.8201599121 ) q3r_stone/Stein2 352 888 0 0.5 0.5 0 0 0 ( -2432 516 864 ) ( -2432 572 -528 ) ( -2432 572 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0 ( -2100 -1016 -528 ) ( -2448 -1016 864 ) ( -2100 -1016 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0 } // brush 81 { -( -2474.416015625 -677.6661987305 456.922668457 ) ( -2693.013671875 -406.8912353516 456.922668457 ) ( -2384.99609375 -605.4770812988 128.4462127686 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 -( -2473.0532226563 -1022.1116333008 152.2435455322 ) ( -2308.2924804688 -715.5860900879 152.2435455322 ) ( -2640.1945800781 -932.2713775635 -139.4694824219 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 -( -2484.3203125 -753.7613372803 551.2448120117 ) ( -2647.3142089844 -446.2927246094 551.2448120117 ) ( -2299.4461669922 -655.7566223145 273.1789703369 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 -( -2513.6440429688 -625.0321044922 427.0275726318 ) ( -2780.7060546875 -401.9136962891 427.0275726318 ) ( -2459.12890625 -559.7802734375 89.5748901367 ) q3r_stone/Stein2 656 560 0 0.5 0.5 0 0 0 -( -2412.9689941406 -867.5523986816 199.4346313477 ) ( -2430.9990234375 -520.0197753906 199.4346313477 ) ( -2555.3430175781 -874.9387817383 -118.022644043 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 -( -2434.2229003906 -750.2210540771 216.6081542969 ) ( -2577.6352539063 -433.1454467773 216.6081542969 ) ( -2548.4721679688 -801.8955383301 -108.0160827637 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 -( -2457.7360839844 -1090.6232299805 407.4465332031 ) ( -2247.3591308594 -813.4130554199 407.4465332031 ) ( -2405.6027832031 -1130.1877593994 65.656036377 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 -( -2438.9279785156 -936.1560974121 525.4687042236 ) ( -2377.5485839844 -593.6118164063 525.4687042236 ) ( -2258.3354492188 -968.5157623291 229.7606811523 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 +( -2474.416015625 -677.6661987305 456.922668457 ) ( -2693.013671875 -406.8912353516 456.922668457 ) ( -2384.99609375 -605.4770507813 128.4462127686 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 +( -2473.0532226563 -1022.1116333008 152.2435455322 ) ( -2308.2924804688 -715.5860595703 152.2435455322 ) ( -2640.1945800781 -932.2713623047 -139.4694824219 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 +( -2484.3203125 -753.7613525391 551.2448120117 ) ( -2647.3142089844 -446.2927246094 551.2448120117 ) ( -2299.4462890625 -655.7565917969 273.1789550781 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 +( -2513.6440429688 -625.0321044922 427.0275878906 ) ( -2780.7060546875 -401.9136962891 427.0275878906 ) ( -2459.12890625 -559.7802734375 89.5748901367 ) q3r_stone/Stein2 656 560 0 0.5 0.5 0 0 0 +( -2412.9689941406 -867.5523681641 199.4346313477 ) ( -2430.9990234375 -520.0197753906 199.4346313477 ) ( -2555.3430175781 -874.9387817383 -118.022644043 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 +( -2434.2229003906 -750.2210693359 216.6081542969 ) ( -2577.6352539063 -433.1454467773 216.6081542969 ) ( -2548.4721679688 -801.8955078125 -108.0160827637 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 +( -2457.7360839844 -1090.6232910156 407.4465332031 ) ( -2247.3591308594 -813.4130859375 407.4465332031 ) ( -2405.6027832031 -1130.1877441406 65.656036377 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 +( -2438.9279785156 -936.1561279297 525.4686889648 ) ( -2377.5485839844 -593.6118164063 525.4686889648 ) ( -2258.3354492188 -968.5157470703 229.7606811523 ) q3r_stone/Stein2 960 560 0 0.5 0.5 0 0 0 ( -2432 516 864 ) ( -2432 572 -528 ) ( -2432 572 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0 ( -2100 -1016 -528 ) ( -2448 -1016 864 ) ( -2100 -1016 864 ) q3r_stone/Stein2 0 0 0 0.5 0.5 0 0 0 } @@ -1503,3 +1503,22 @@ base_trim/rusty_pewter_big "classname" "rally_item_invis" "origin" "1664.000000 -888.000000 8.000000" } +// entity 101 +{ +"classname" "info_observer_spot" +"origin" "-2402 2590 1216" +"spawnflags" "1" +} +// entity 102 +{ +"classname" "info_observer_spot" +"origin" "1680 2592 1216" +"spawnflags" "1" +} +// entity 103 +{ +"classname" "info_observer_spot" +"origin" "6136 -982 1216" +"spawnflags" "1" +"angle" "158.7" +} diff --git a/baseq3r/menu/art/unknownmap.jpg b/baseq3r/menu/art/unknownmap.jpg index 470034d3..a0f40d7f 100644 Binary files a/baseq3r/menu/art/unknownmap.jpg and b/baseq3r/menu/art/unknownmap.jpg differ diff --git a/baseq3r/menu/medals/medal_gauntlet.tga b/baseq3r/menu/medals/medal_gauntlet.tga index 24454595..348d9183 100644 Binary files a/baseq3r/menu/medals/medal_gauntlet.tga and b/baseq3r/menu/medals/medal_gauntlet.tga differ diff --git a/baseq3r/models/flags/b_flag.tga b/baseq3r/models/flags/b_flag.tga index 38399075..07bf436b 100644 Binary files a/baseq3r/models/flags/b_flag.tga and b/baseq3r/models/flags/b_flag.tga differ diff --git a/baseq3r/models/flags/n_flag.tga b/baseq3r/models/flags/n_flag.tga index 9473b431..71b59a2a 100644 Binary files a/baseq3r/models/flags/n_flag.tga and b/baseq3r/models/flags/n_flag.tga differ diff --git a/baseq3r/models/flags/r_flag.tga b/baseq3r/models/flags/r_flag.tga index b548ea07..aab4e69f 100644 Binary files a/baseq3r/models/flags/r_flag.tga and b/baseq3r/models/flags/r_flag.tga differ diff --git a/baseq3r/models/players/heads/anarki.skin b/baseq3r/models/players/heads/anarki.skin index 757ad092..96d4ed31 100644 --- a/baseq3r/models/players/heads/anarki.skin +++ b/baseq3r/models/players/heads/anarki.skin @@ -1,3 +1,3 @@ -h_head,models/players/heads/anarki_h.tga -h_glasses,models/players/heads/anarki_g.tga +h_head,models/players/heads/quake3/anarki_h.tga +h_glasses,models/players/heads/quake3/anarki_g.tga tag_head, diff --git a/baseq3r/models/players/heads/anarki_g.tga b/baseq3r/models/players/heads/anarki_g.tga deleted file mode 100644 index cada579f..00000000 Binary files a/baseq3r/models/players/heads/anarki_g.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/anarki_h.tga b/baseq3r/models/players/heads/anarki_h.tga deleted file mode 100644 index 5edaa985..00000000 Binary files a/baseq3r/models/players/heads/anarki_h.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/angel.md3 b/baseq3r/models/players/heads/angel.md3 new file mode 100644 index 00000000..c6dcaebf Binary files /dev/null and b/baseq3r/models/players/heads/angel.md3 differ diff --git a/baseq3r/models/players/heads/angel.skin b/baseq3r/models/players/heads/angel.skin new file mode 100644 index 00000000..d695dd62 --- /dev/null +++ b/baseq3r/models/players/heads/angel.skin @@ -0,0 +1,2 @@ +tag_head, +h_head,/models/players/heads/quake3/angel_h.tga diff --git a/baseq3r/models/players/heads/biker.md3 b/baseq3r/models/players/heads/biker.md3 new file mode 100644 index 00000000..6c3c43d6 Binary files /dev/null and b/baseq3r/models/players/heads/biker.md3 differ diff --git a/baseq3r/models/players/heads/biker.skin b/baseq3r/models/players/heads/biker.skin new file mode 100644 index 00000000..58e53046 --- /dev/null +++ b/baseq3r/models/players/heads/biker.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/biker_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/bitterman.md3 b/baseq3r/models/players/heads/bitterman.md3 new file mode 100644 index 00000000..b6ef74c9 Binary files /dev/null and b/baseq3r/models/players/heads/bitterman.md3 differ diff --git a/baseq3r/models/players/heads/bitterman.skin b/baseq3r/models/players/heads/bitterman.skin new file mode 100644 index 00000000..0731717e --- /dev/null +++ b/baseq3r/models/players/heads/bitterman.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/bitterman_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/bones.md3 b/baseq3r/models/players/heads/bones.md3 index d7c3dc2f..b3d7e4da 100644 Binary files a/baseq3r/models/players/heads/bones.md3 and b/baseq3r/models/players/heads/bones.md3 differ diff --git a/baseq3r/models/players/heads/bones.skin b/baseq3r/models/players/heads/bones.skin index 52e66f73..73efa8a1 100644 --- a/baseq3r/models/players/heads/bones.skin +++ b/baseq3r/models/players/heads/bones.skin @@ -1,2 +1,2 @@ -h_head,models/players/heads/bones.tga +h_head,models/players/heads/quake3/bones_h.tga tag_head, diff --git a/baseq3r/models/players/heads/bones.tga b/baseq3r/models/players/heads/bones.tga deleted file mode 100644 index a8ba6959..00000000 Binary files a/baseq3r/models/players/heads/bones.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/bones2.md3 b/baseq3r/models/players/heads/bones2.md3 new file mode 100644 index 00000000..b3d7e4da Binary files /dev/null and b/baseq3r/models/players/heads/bones2.md3 differ diff --git a/baseq3r/models/players/heads/bones2.skin b/baseq3r/models/players/heads/bones2.skin new file mode 100644 index 00000000..4103ed42 --- /dev/null +++ b/baseq3r/models/players/heads/bones2.skin @@ -0,0 +1,2 @@ +h_head, models/players/heads/quake3/bones2_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/cadavre.md3 b/baseq3r/models/players/heads/cadavre.md3 new file mode 100644 index 00000000..6c3c43d6 Binary files /dev/null and b/baseq3r/models/players/heads/cadavre.md3 differ diff --git a/baseq3r/models/players/heads/cadavre.skin b/baseq3r/models/players/heads/cadavre.skin new file mode 100644 index 00000000..ab6a3b25 --- /dev/null +++ b/baseq3r/models/players/heads/cadavre.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/cadavre_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/crash.md3 b/baseq3r/models/players/heads/crash.md3 new file mode 100644 index 00000000..8d46c6ce Binary files /dev/null and b/baseq3r/models/players/heads/crash.md3 differ diff --git a/baseq3r/models/players/heads/crash.skin b/baseq3r/models/players/heads/crash.skin new file mode 100644 index 00000000..514b3850 --- /dev/null +++ b/baseq3r/models/players/heads/crash.skin @@ -0,0 +1,3 @@ +h_helmet,models/players/heads/quake3/crash_h.tga +h_visor,models/players/heads/quake3/crash_f.tga +tag_head, diff --git a/baseq3r/models/players/heads/daemia.md3 b/baseq3r/models/players/heads/daemia.md3 new file mode 100644 index 00000000..74cb03fa Binary files /dev/null and b/baseq3r/models/players/heads/daemia.md3 differ diff --git a/baseq3r/models/players/heads/daemia.skin b/baseq3r/models/players/heads/daemia.skin new file mode 100644 index 00000000..1665c76b --- /dev/null +++ b/baseq3r/models/players/heads/daemia.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/daemia_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/doom.skin b/baseq3r/models/players/heads/doom.skin index 18ba5a5b..dd0c2b16 100644 --- a/baseq3r/models/players/heads/doom.skin +++ b/baseq3r/models/players/heads/doom.skin @@ -1,3 +1,3 @@ -h_helmet,models/players/heads/doom.tga -h_visor,models/players/heads/doom_f.tga +h_helmet,models/players/heads/quake3/doom.tga +h_visor,models/players/heads/quake3/doom_f.tga tag_head, diff --git a/baseq3r/models/players/heads/doom.tga b/baseq3r/models/players/heads/doom.tga deleted file mode 100644 index f7f28a8c..00000000 Binary files a/baseq3r/models/players/heads/doom.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/doom_fx.tga b/baseq3r/models/players/heads/doom_fx.tga deleted file mode 100644 index cde663aa..00000000 Binary files a/baseq3r/models/players/heads/doom_fx.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/fanatic.md3 b/baseq3r/models/players/heads/fanatic.md3 new file mode 100644 index 00000000..79cd5d7d Binary files /dev/null and b/baseq3r/models/players/heads/fanatic.md3 differ diff --git a/baseq3r/models/players/heads/fanatic.skin b/baseq3r/models/players/heads/fanatic.skin new file mode 100644 index 00000000..57b5f258 --- /dev/null +++ b/baseq3r/models/players/heads/fanatic.skin @@ -0,0 +1,3 @@ +h_goggles,models/players/heads/quake3/patriot_gogs.tga +h_head,models/players/heads/quake3/fanatic_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/flisk.md3 b/baseq3r/models/players/heads/flisk.md3 new file mode 100644 index 00000000..d47711f9 Binary files /dev/null and b/baseq3r/models/players/heads/flisk.md3 differ diff --git a/baseq3r/models/players/heads/flisk.skin b/baseq3r/models/players/heads/flisk.skin new file mode 100644 index 00000000..f81e0776 --- /dev/null +++ b/baseq3r/models/players/heads/flisk.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/flisk_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/gorre.md3 b/baseq3r/models/players/heads/gorre.md3 new file mode 100644 index 00000000..3b27ca17 Binary files /dev/null and b/baseq3r/models/players/heads/gorre.md3 differ diff --git a/baseq3r/models/players/heads/gorre.skin b/baseq3r/models/players/heads/gorre.skin new file mode 100644 index 00000000..37cc67fa --- /dev/null +++ b/baseq3r/models/players/heads/gorre.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/gorre.tga +tag_head, diff --git a/baseq3r/models/players/heads/grrl.md3 b/baseq3r/models/players/heads/grrl.md3 new file mode 100644 index 00000000..b647dc21 Binary files /dev/null and b/baseq3r/models/players/heads/grrl.md3 differ diff --git a/baseq3r/models/players/heads/grrl.skin b/baseq3r/models/players/heads/grrl.skin new file mode 100644 index 00000000..17f12366 --- /dev/null +++ b/baseq3r/models/players/heads/grrl.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/grrl_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/grunt.skin b/baseq3r/models/players/heads/grunt.skin index c0ee9174..1dea9111 100644 --- a/baseq3r/models/players/heads/grunt.skin +++ b/baseq3r/models/players/heads/grunt.skin @@ -1,2 +1,2 @@ -h_head,models/players/heads/grunt_h.tga +h_head,models/players/heads/quake3/grunt_h.tga tag_head, diff --git a/baseq3r/models/players/heads/grunt_h.tga b/baseq3r/models/players/heads/grunt_h.tga deleted file mode 100644 index 7023be92..00000000 Binary files a/baseq3r/models/players/heads/grunt_h.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/harpy.md3 b/baseq3r/models/players/heads/harpy.md3 new file mode 100644 index 00000000..cd18293d Binary files /dev/null and b/baseq3r/models/players/heads/harpy.md3 differ diff --git a/baseq3r/models/players/heads/harpy.skin b/baseq3r/models/players/heads/harpy.skin new file mode 100644 index 00000000..b12356bd --- /dev/null +++ b/baseq3r/models/players/heads/harpy.skin @@ -0,0 +1,3 @@ +h_feathers,models/players/heads/quake3/harpy_f.tga +h_head,models/players/heads/quake3/harpy_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/hossman.md3 b/baseq3r/models/players/heads/hossman.md3 new file mode 100644 index 00000000..6c3c43d6 Binary files /dev/null and b/baseq3r/models/players/heads/hossman.md3 differ diff --git a/baseq3r/models/players/heads/hossman.skin b/baseq3r/models/players/heads/hossman.skin new file mode 100644 index 00000000..82edb52f --- /dev/null +++ b/baseq3r/models/players/heads/hossman.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/hossman_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/hunter.skin b/baseq3r/models/players/heads/hunter.skin index 16a00dec..637fce14 100644 --- a/baseq3r/models/players/heads/hunter.skin +++ b/baseq3r/models/players/heads/hunter.skin @@ -1,3 +1,3 @@ -h_head,models/players/heads/hunter_h.tga -h_feathers,models/players/heads/hunter_f.tga +h_head,models/players/heads/quake3/hunter_h.tga +h_feathers,models/players/heads/quake3/hunter_f.tga tag_head, diff --git a/baseq3r/models/players/heads/hunter_f.tga b/baseq3r/models/players/heads/hunter_f.tga deleted file mode 100644 index bebe1765..00000000 Binary files a/baseq3r/models/players/heads/hunter_f.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/hunter_h.tga b/baseq3r/models/players/heads/hunter_h.tga deleted file mode 100644 index 5965e945..00000000 Binary files a/baseq3r/models/players/heads/hunter_h.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/icon_anarki.tga b/baseq3r/models/players/heads/icon_anarki.tga index c39bb393..2a3a15ca 100644 Binary files a/baseq3r/models/players/heads/icon_anarki.tga and b/baseq3r/models/players/heads/icon_anarki.tga differ diff --git a/baseq3r/models/players/heads/icon_angel.tga b/baseq3r/models/players/heads/icon_angel.tga new file mode 100644 index 00000000..6a2a051b Binary files /dev/null and b/baseq3r/models/players/heads/icon_angel.tga differ diff --git a/baseq3r/models/players/heads/icon_biker.tga b/baseq3r/models/players/heads/icon_biker.tga new file mode 100644 index 00000000..086bb88a Binary files /dev/null and b/baseq3r/models/players/heads/icon_biker.tga differ diff --git a/baseq3r/models/players/heads/icon_bitterman.tga b/baseq3r/models/players/heads/icon_bitterman.tga new file mode 100644 index 00000000..2ef1da7c Binary files /dev/null and b/baseq3r/models/players/heads/icon_bitterman.tga differ diff --git a/baseq3r/models/players/heads/icon_bones.tga b/baseq3r/models/players/heads/icon_bones.tga index 7bc284e8..367fa036 100644 Binary files a/baseq3r/models/players/heads/icon_bones.tga and b/baseq3r/models/players/heads/icon_bones.tga differ diff --git a/baseq3r/models/players/heads/icon_bones2.tga b/baseq3r/models/players/heads/icon_bones2.tga new file mode 100644 index 00000000..9629089d Binary files /dev/null and b/baseq3r/models/players/heads/icon_bones2.tga differ diff --git a/baseq3r/models/players/heads/icon_cadavre.tga b/baseq3r/models/players/heads/icon_cadavre.tga new file mode 100644 index 00000000..c2640ae5 Binary files /dev/null and b/baseq3r/models/players/heads/icon_cadavre.tga differ diff --git a/baseq3r/models/players/heads/icon_crash.tga b/baseq3r/models/players/heads/icon_crash.tga new file mode 100644 index 00000000..16494b2e Binary files /dev/null and b/baseq3r/models/players/heads/icon_crash.tga differ diff --git a/baseq3r/models/players/heads/icon_daemia.tga b/baseq3r/models/players/heads/icon_daemia.tga new file mode 100644 index 00000000..845cdc54 Binary files /dev/null and b/baseq3r/models/players/heads/icon_daemia.tga differ diff --git a/baseq3r/models/players/heads/icon_doom.tga b/baseq3r/models/players/heads/icon_doom.tga index 1261ec94..f86fa657 100644 Binary files a/baseq3r/models/players/heads/icon_doom.tga and b/baseq3r/models/players/heads/icon_doom.tga differ diff --git a/baseq3r/models/players/heads/icon_fanatic.tga b/baseq3r/models/players/heads/icon_fanatic.tga new file mode 100644 index 00000000..8098a62d Binary files /dev/null and b/baseq3r/models/players/heads/icon_fanatic.tga differ diff --git a/baseq3r/models/players/heads/icon_flisk.tga b/baseq3r/models/players/heads/icon_flisk.tga new file mode 100644 index 00000000..beda32e9 Binary files /dev/null and b/baseq3r/models/players/heads/icon_flisk.tga differ diff --git a/baseq3r/models/players/heads/icon_gorre.tga b/baseq3r/models/players/heads/icon_gorre.tga new file mode 100644 index 00000000..c0722c4e Binary files /dev/null and b/baseq3r/models/players/heads/icon_gorre.tga differ diff --git a/baseq3r/models/players/heads/icon_grrl.tga b/baseq3r/models/players/heads/icon_grrl.tga new file mode 100644 index 00000000..511f0b16 Binary files /dev/null and b/baseq3r/models/players/heads/icon_grrl.tga differ diff --git a/baseq3r/models/players/heads/icon_grunt.tga b/baseq3r/models/players/heads/icon_grunt.tga index 48d42b84..ec32aabf 100644 Binary files a/baseq3r/models/players/heads/icon_grunt.tga and b/baseq3r/models/players/heads/icon_grunt.tga differ diff --git a/baseq3r/models/players/heads/icon_harpy.tga b/baseq3r/models/players/heads/icon_harpy.tga new file mode 100644 index 00000000..e51a2f21 Binary files /dev/null and b/baseq3r/models/players/heads/icon_harpy.tga differ diff --git a/baseq3r/models/players/heads/icon_hossman.tga b/baseq3r/models/players/heads/icon_hossman.tga new file mode 100644 index 00000000..368630d3 Binary files /dev/null and b/baseq3r/models/players/heads/icon_hossman.tga differ diff --git a/baseq3r/models/players/heads/icon_hunter.tga b/baseq3r/models/players/heads/icon_hunter.tga index 954e3026..e0ec22e7 100644 Binary files a/baseq3r/models/players/heads/icon_hunter.tga and b/baseq3r/models/players/heads/icon_hunter.tga differ diff --git a/baseq3r/models/players/heads/icon_id.tga b/baseq3r/models/players/heads/icon_id.tga new file mode 100644 index 00000000..17461448 Binary files /dev/null and b/baseq3r/models/players/heads/icon_id.tga differ diff --git a/baseq3r/models/players/heads/icon_keel.tga b/baseq3r/models/players/heads/icon_keel.tga new file mode 100644 index 00000000..ef159dae Binary files /dev/null and b/baseq3r/models/players/heads/icon_keel.tga differ diff --git a/baseq3r/models/players/heads/icon_klesk.tga b/baseq3r/models/players/heads/icon_klesk.tga index ad247f0e..8546044d 100644 Binary files a/baseq3r/models/players/heads/icon_klesk.tga and b/baseq3r/models/players/heads/icon_klesk.tga differ diff --git a/baseq3r/models/players/heads/icon_krusade.tga b/baseq3r/models/players/heads/icon_krusade.tga new file mode 100644 index 00000000..553ac1d2 Binary files /dev/null and b/baseq3r/models/players/heads/icon_krusade.tga differ diff --git a/baseq3r/models/players/heads/icon_lucy.tga b/baseq3r/models/players/heads/icon_lucy.tga new file mode 100644 index 00000000..72b2d28e Binary files /dev/null and b/baseq3r/models/players/heads/icon_lucy.tga differ diff --git a/baseq3r/models/players/heads/icon_major.tga b/baseq3r/models/players/heads/icon_major.tga index d74ec9cf..05ddbfd4 100644 Binary files a/baseq3r/models/players/heads/icon_major.tga and b/baseq3r/models/players/heads/icon_major.tga differ diff --git a/baseq3r/models/players/heads/icon_mynx.tga b/baseq3r/models/players/heads/icon_mynx.tga index f7622ddd..db86e5e0 100644 Binary files a/baseq3r/models/players/heads/icon_mynx.tga and b/baseq3r/models/players/heads/icon_mynx.tga differ diff --git a/baseq3r/models/players/heads/icon_orbb.tga b/baseq3r/models/players/heads/icon_orbb.tga index 89e710d5..7c1ffe4d 100644 Binary files a/baseq3r/models/players/heads/icon_orbb.tga and b/baseq3r/models/players/heads/icon_orbb.tga differ diff --git a/baseq3r/models/players/heads/icon_patriot.tga b/baseq3r/models/players/heads/icon_patriot.tga new file mode 100644 index 00000000..31f1fb3e Binary files /dev/null and b/baseq3r/models/players/heads/icon_patriot.tga differ diff --git a/baseq3r/models/players/heads/icon_phobos.tga b/baseq3r/models/players/heads/icon_phobos.tga new file mode 100644 index 00000000..1aa4bd59 Binary files /dev/null and b/baseq3r/models/players/heads/icon_phobos.tga differ diff --git a/baseq3r/models/players/heads/icon_ranger.tga b/baseq3r/models/players/heads/icon_ranger.tga new file mode 100644 index 00000000..1fde3237 Binary files /dev/null and b/baseq3r/models/players/heads/icon_ranger.tga differ diff --git a/baseq3r/models/players/heads/icon_razor.tga b/baseq3r/models/players/heads/icon_razor.tga new file mode 100644 index 00000000..e4130cdb Binary files /dev/null and b/baseq3r/models/players/heads/icon_razor.tga differ diff --git a/baseq3r/models/players/heads/icon_roderic.tga b/baseq3r/models/players/heads/icon_roderic.tga new file mode 100644 index 00000000..ceb0524e Binary files /dev/null and b/baseq3r/models/players/heads/icon_roderic.tga differ diff --git a/baseq3r/models/players/heads/icon_sarge.tga b/baseq3r/models/players/heads/icon_sarge.tga index 7cd1cc80..16f0fdb4 100644 Binary files a/baseq3r/models/players/heads/icon_sarge.tga and b/baseq3r/models/players/heads/icon_sarge.tga differ diff --git a/baseq3r/models/players/heads/icon_slammer.tga b/baseq3r/models/players/heads/icon_slammer.tga new file mode 100644 index 00000000..ffcefe23 Binary files /dev/null and b/baseq3r/models/players/heads/icon_slammer.tga differ diff --git a/baseq3r/models/players/heads/icon_slash.tga b/baseq3r/models/players/heads/icon_slash.tga new file mode 100644 index 00000000..2273d8ed Binary files /dev/null and b/baseq3r/models/players/heads/icon_slash.tga differ diff --git a/baseq3r/models/players/heads/icon_sorlag.tga b/baseq3r/models/players/heads/icon_sorlag.tga new file mode 100644 index 00000000..3d43a3c1 Binary files /dev/null and b/baseq3r/models/players/heads/icon_sorlag.tga differ diff --git a/baseq3r/models/players/heads/icon_stripe.tga b/baseq3r/models/players/heads/icon_stripe.tga new file mode 100644 index 00000000..cb0fe9d9 Binary files /dev/null and b/baseq3r/models/players/heads/icon_stripe.tga differ diff --git a/baseq3r/models/players/heads/icon_stroggo.tga b/baseq3r/models/players/heads/icon_stroggo.tga new file mode 100644 index 00000000..7e5b904b Binary files /dev/null and b/baseq3r/models/players/heads/icon_stroggo.tga differ diff --git a/baseq3r/models/players/heads/icon_tankjr.tga b/baseq3r/models/players/heads/icon_tankjr.tga index 99ee0400..38e52c30 100644 Binary files a/baseq3r/models/players/heads/icon_tankjr.tga and b/baseq3r/models/players/heads/icon_tankjr.tga differ diff --git a/baseq3r/models/players/heads/icon_uriel.tga b/baseq3r/models/players/heads/icon_uriel.tga new file mode 100644 index 00000000..75dece9b Binary files /dev/null and b/baseq3r/models/players/heads/icon_uriel.tga differ diff --git a/baseq3r/models/players/heads/icon_visor.tga b/baseq3r/models/players/heads/icon_visor.tga new file mode 100644 index 00000000..8bc327f8 Binary files /dev/null and b/baseq3r/models/players/heads/icon_visor.tga differ diff --git a/baseq3r/models/players/heads/icon_wrack.tga b/baseq3r/models/players/heads/icon_wrack.tga new file mode 100644 index 00000000..e6954699 Binary files /dev/null and b/baseq3r/models/players/heads/icon_wrack.tga differ diff --git a/baseq3r/models/players/heads/icon_xaero.tga b/baseq3r/models/players/heads/icon_xaero.tga new file mode 100644 index 00000000..a4f4ed22 Binary files /dev/null and b/baseq3r/models/players/heads/icon_xaero.tga differ diff --git a/baseq3r/models/players/heads/icon_yuriko.tga b/baseq3r/models/players/heads/icon_yuriko.tga new file mode 100644 index 00000000..e567cf6a Binary files /dev/null and b/baseq3r/models/players/heads/icon_yuriko.tga differ diff --git a/baseq3r/models/players/heads/icon_zael.tga b/baseq3r/models/players/heads/icon_zael.tga new file mode 100644 index 00000000..2c7e0fab Binary files /dev/null and b/baseq3r/models/players/heads/icon_zael.tga differ diff --git a/baseq3r/models/players/heads/id.md3 b/baseq3r/models/players/heads/id.md3 new file mode 100644 index 00000000..79cd5d7d Binary files /dev/null and b/baseq3r/models/players/heads/id.md3 differ diff --git a/baseq3r/models/players/heads/id.skin b/baseq3r/models/players/heads/id.skin new file mode 100644 index 00000000..b84ead81 --- /dev/null +++ b/baseq3r/models/players/heads/id.skin @@ -0,0 +1,3 @@ +h_goggles,models/players/heads/quake3/patriot_gogs.tga +h_head,models/players/heads/quake3/id_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/keel.md3 b/baseq3r/models/players/heads/keel.md3 new file mode 100644 index 00000000..166b22c8 Binary files /dev/null and b/baseq3r/models/players/heads/keel.md3 differ diff --git a/baseq3r/models/players/heads/keel.skin b/baseq3r/models/players/heads/keel.skin new file mode 100644 index 00000000..cea35708 --- /dev/null +++ b/baseq3r/models/players/heads/keel.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/keel_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/klesk.skin b/baseq3r/models/players/heads/klesk.skin index 833295f3..13d8c42f 100644 --- a/baseq3r/models/players/heads/klesk.skin +++ b/baseq3r/models/players/heads/klesk.skin @@ -1,2 +1,2 @@ -h_head,models/players/heads/klesk_h.tga +h_head,models/players/heads/quake3/klesk_h.tga tag_head, diff --git a/baseq3r/models/players/heads/klesk_h.tga b/baseq3r/models/players/heads/klesk_h.tga deleted file mode 100644 index 8243df34..00000000 Binary files a/baseq3r/models/players/heads/klesk_h.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/krusade.md3 b/baseq3r/models/players/heads/krusade.md3 new file mode 100644 index 00000000..66c71282 Binary files /dev/null and b/baseq3r/models/players/heads/krusade.md3 differ diff --git a/baseq3r/models/players/heads/krusade.skin b/baseq3r/models/players/heads/krusade.skin new file mode 100644 index 00000000..73b7cfa0 --- /dev/null +++ b/baseq3r/models/players/heads/krusade.skin @@ -0,0 +1,3 @@ +tag_head, +h_cigar,models/players/heads/quake3/null.tga +h_head,models/players/heads/quake3/krusade_h.tga diff --git a/baseq3r/models/players/heads/lucy.md3 b/baseq3r/models/players/heads/lucy.md3 new file mode 100644 index 00000000..c6dcaebf Binary files /dev/null and b/baseq3r/models/players/heads/lucy.md3 differ diff --git a/baseq3r/models/players/heads/lucy.skin b/baseq3r/models/players/heads/lucy.skin new file mode 100644 index 00000000..90b654ae --- /dev/null +++ b/baseq3r/models/players/heads/lucy.skin @@ -0,0 +1,2 @@ +tag_head, +h_head,models/players/heads/quake3/lucy_h.tga diff --git a/baseq3r/models/players/heads/major.skin b/baseq3r/models/players/heads/major.skin index 45999cfd..87b45676 100644 --- a/baseq3r/models/players/heads/major.skin +++ b/baseq3r/models/players/heads/major.skin @@ -1,2 +1,2 @@ -h_head,models/players/heads/major_h.tga +h_head,models/players/heads/quake3/major_h.tga tag_head, diff --git a/baseq3r/models/players/heads/major_h.tga b/baseq3r/models/players/heads/major_h.tga deleted file mode 100644 index 8b1386f1..00000000 Binary files a/baseq3r/models/players/heads/major_h.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/mynx.md3 b/baseq3r/models/players/heads/mynx.md3 index 30c01199..09df2886 100644 Binary files a/baseq3r/models/players/heads/mynx.md3 and b/baseq3r/models/players/heads/mynx.md3 differ diff --git a/baseq3r/models/players/heads/mynx.skin b/baseq3r/models/players/heads/mynx.skin index c034af1b..88b74385 100644 --- a/baseq3r/models/players/heads/mynx.skin +++ b/baseq3r/models/players/heads/mynx.skin @@ -1,3 +1,3 @@ -h_head,models/players/heads/mynx_h.tga -h_glasses_1,models/players/heads/mynx_g.tga +h_head,models/players/heads/quake3/mynx_h.tga +h_glasses,models/players/heads/quake3/mynx_shiny.tga tag_head, diff --git a/baseq3r/models/players/heads/mynx_h.tga b/baseq3r/models/players/heads/mynx_h.tga deleted file mode 100644 index 7d50165b..00000000 Binary files a/baseq3r/models/players/heads/mynx_h.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/orbb.skin b/baseq3r/models/players/heads/orbb.skin index 2f0d7dfb..441c7d16 100644 --- a/baseq3r/models/players/heads/orbb.skin +++ b/baseq3r/models/players/heads/orbb.skin @@ -1,2 +1,2 @@ -h_head,models/players/heads/orbb_h.tga +h_head,models/players/heads/quake3/orbb_h.tga tag_head, diff --git a/baseq3r/models/players/heads/orbb_h.tga b/baseq3r/models/players/heads/orbb_h.tga deleted file mode 100644 index 5f7b434d..00000000 Binary files a/baseq3r/models/players/heads/orbb_h.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/patriot.md3 b/baseq3r/models/players/heads/patriot.md3 new file mode 100644 index 00000000..79cd5d7d Binary files /dev/null and b/baseq3r/models/players/heads/patriot.md3 differ diff --git a/baseq3r/models/players/heads/patriot.skin b/baseq3r/models/players/heads/patriot.skin new file mode 100644 index 00000000..02347b6b --- /dev/null +++ b/baseq3r/models/players/heads/patriot.skin @@ -0,0 +1,3 @@ +h_goggles,models/players/heads/quake3/patriot_gogs.tga +h_head,models/players/heads/quake3/patriot_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/phobos.md3 b/baseq3r/models/players/heads/phobos.md3 new file mode 100644 index 00000000..2fb82afa Binary files /dev/null and b/baseq3r/models/players/heads/phobos.md3 differ diff --git a/baseq3r/models/players/heads/phobos.skin b/baseq3r/models/players/heads/phobos.skin new file mode 100644 index 00000000..ee7b8d0c --- /dev/null +++ b/baseq3r/models/players/heads/phobos.skin @@ -0,0 +1,3 @@ +h_helmet,models/players/heads/quake3/phobos.tga +h_visor,models/players/heads/quake3/phobos_f.tga +tag_head, diff --git a/baseq3r/models/players/heads/quake3/anarki_g.tga b/baseq3r/models/players/heads/quake3/anarki_g.tga new file mode 100644 index 00000000..4066b7f9 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/anarki_g.tga differ diff --git a/baseq3r/models/players/heads/quake3/anarki_g_fx.tga b/baseq3r/models/players/heads/quake3/anarki_g_fx.tga new file mode 100644 index 00000000..f72be01a Binary files /dev/null and b/baseq3r/models/players/heads/quake3/anarki_g_fx.tga differ diff --git a/baseq3r/models/players/heads/quake3/anarki_h.tga b/baseq3r/models/players/heads/quake3/anarki_h.tga new file mode 100644 index 00000000..f682d6ba Binary files /dev/null and b/baseq3r/models/players/heads/quake3/anarki_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/angel_h.tga b/baseq3r/models/players/heads/quake3/angel_h.tga new file mode 100644 index 00000000..b80752fe Binary files /dev/null and b/baseq3r/models/players/heads/quake3/angel_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/biker_h.tga b/baseq3r/models/players/heads/quake3/biker_h.tga new file mode 100644 index 00000000..b3b34f36 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/biker_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/bitterman_h.tga b/baseq3r/models/players/heads/quake3/bitterman_h.tga new file mode 100644 index 00000000..fabd4ef4 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/bitterman_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/bones2_fx.jpg b/baseq3r/models/players/heads/quake3/bones2_fx.jpg new file mode 100644 index 00000000..298fb3fe Binary files /dev/null and b/baseq3r/models/players/heads/quake3/bones2_fx.jpg differ diff --git a/baseq3r/models/players/heads/quake3/bones2_h.tga b/baseq3r/models/players/heads/quake3/bones2_h.tga new file mode 100644 index 00000000..95a65ca0 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/bones2_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/bones_h.tga b/baseq3r/models/players/heads/quake3/bones_h.tga new file mode 100644 index 00000000..63b9a2dc Binary files /dev/null and b/baseq3r/models/players/heads/quake3/bones_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/cadavre_h.tga b/baseq3r/models/players/heads/quake3/cadavre_h.tga new file mode 100644 index 00000000..01d5ad93 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/cadavre_h.tga differ diff --git a/baseq3r/models/players/heads/cigar.glow.tga b/baseq3r/models/players/heads/quake3/cigar.glow.tga similarity index 100% rename from baseq3r/models/players/heads/cigar.glow.tga rename to baseq3r/models/players/heads/quake3/cigar.glow.tga diff --git a/baseq3r/models/players/heads/cigar.tga b/baseq3r/models/players/heads/quake3/cigar.tga similarity index 100% rename from baseq3r/models/players/heads/cigar.tga rename to baseq3r/models/players/heads/quake3/cigar.tga diff --git a/baseq3r/models/players/heads/quake3/crash_h.tga b/baseq3r/models/players/heads/quake3/crash_h.tga new file mode 100644 index 00000000..0d572aaf Binary files /dev/null and b/baseq3r/models/players/heads/quake3/crash_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/daemia_h.tga b/baseq3r/models/players/heads/quake3/daemia_h.tga new file mode 100644 index 00000000..f92ef596 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/daemia_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/doom.tga b/baseq3r/models/players/heads/quake3/doom.tga new file mode 100644 index 00000000..27b18c0b Binary files /dev/null and b/baseq3r/models/players/heads/quake3/doom.tga differ diff --git a/baseq3r/models/players/heads/doom_f.tga b/baseq3r/models/players/heads/quake3/doom_f.tga similarity index 100% rename from baseq3r/models/players/heads/doom_f.tga rename to baseq3r/models/players/heads/quake3/doom_f.tga diff --git a/baseq3r/models/players/heads/quake3/fanatic_h.tga b/baseq3r/models/players/heads/quake3/fanatic_h.tga new file mode 100644 index 00000000..9be2370d Binary files /dev/null and b/baseq3r/models/players/heads/quake3/fanatic_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/flisk_h.tga b/baseq3r/models/players/heads/quake3/flisk_h.tga new file mode 100644 index 00000000..08dc904d Binary files /dev/null and b/baseq3r/models/players/heads/quake3/flisk_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/gorre.tga b/baseq3r/models/players/heads/quake3/gorre.tga new file mode 100644 index 00000000..1a058052 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/gorre.tga differ diff --git a/baseq3r/models/players/heads/quake3/grrl_h.tga b/baseq3r/models/players/heads/quake3/grrl_h.tga new file mode 100644 index 00000000..1d0ce2ef Binary files /dev/null and b/baseq3r/models/players/heads/quake3/grrl_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/grunt_h.tga b/baseq3r/models/players/heads/quake3/grunt_h.tga new file mode 100644 index 00000000..d99528f0 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/grunt_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/hossman_h.tga b/baseq3r/models/players/heads/quake3/hossman_h.tga new file mode 100644 index 00000000..ed349aa9 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/hossman_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/hunter_f.tga b/baseq3r/models/players/heads/quake3/hunter_f.tga new file mode 100644 index 00000000..20fc8938 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/hunter_f.tga differ diff --git a/baseq3r/models/players/heads/quake3/hunter_h.tga b/baseq3r/models/players/heads/quake3/hunter_h.tga new file mode 100644 index 00000000..60881f21 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/hunter_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/id_h.tga b/baseq3r/models/players/heads/quake3/id_h.tga new file mode 100644 index 00000000..8e7a1dca Binary files /dev/null and b/baseq3r/models/players/heads/quake3/id_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/keel_h.tga b/baseq3r/models/players/heads/quake3/keel_h.tga new file mode 100644 index 00000000..006872df Binary files /dev/null and b/baseq3r/models/players/heads/quake3/keel_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/klesk_g.tga b/baseq3r/models/players/heads/quake3/klesk_g.tga new file mode 100644 index 00000000..744c4c9b Binary files /dev/null and b/baseq3r/models/players/heads/quake3/klesk_g.tga differ diff --git a/baseq3r/models/players/heads/quake3/klesk_h.tga b/baseq3r/models/players/heads/quake3/klesk_h.tga new file mode 100644 index 00000000..2aa61b95 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/klesk_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/krusade_h.tga b/baseq3r/models/players/heads/quake3/krusade_h.tga new file mode 100644 index 00000000..a02c2e39 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/krusade_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/lucy_h.tga b/baseq3r/models/players/heads/quake3/lucy_h.tga new file mode 100644 index 00000000..71bc62c4 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/lucy_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/major_h.tga b/baseq3r/models/players/heads/quake3/major_h.tga new file mode 100644 index 00000000..0cdd1554 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/major_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/mynx_h.tga b/baseq3r/models/players/heads/quake3/mynx_h.tga new file mode 100644 index 00000000..4d401cc0 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/mynx_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/mynx_shiny.tga b/baseq3r/models/players/heads/quake3/mynx_shiny.tga new file mode 100644 index 00000000..31bff57a Binary files /dev/null and b/baseq3r/models/players/heads/quake3/mynx_shiny.tga differ diff --git a/baseq3r/models/players/heads/quake3/null.tga b/baseq3r/models/players/heads/quake3/null.tga new file mode 100644 index 00000000..9cf097c9 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/null.tga differ diff --git a/baseq3r/models/players/heads/quake3/orbb_h.tga b/baseq3r/models/players/heads/quake3/orbb_h.tga new file mode 100644 index 00000000..ed27f137 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/orbb_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/patriot_h.tga b/baseq3r/models/players/heads/quake3/patriot_h.tga new file mode 100644 index 00000000..02f3f1fb Binary files /dev/null and b/baseq3r/models/players/heads/quake3/patriot_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/phobos.tga b/baseq3r/models/players/heads/quake3/phobos.tga new file mode 100644 index 00000000..88ac1df2 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/phobos.tga differ diff --git a/baseq3r/models/players/heads/quake3/phobos_f.tga b/baseq3r/models/players/heads/quake3/phobos_f.tga new file mode 100644 index 00000000..f51d4bec Binary files /dev/null and b/baseq3r/models/players/heads/quake3/phobos_f.tga differ diff --git a/baseq3r/models/players/heads/quake3/ranger.tga b/baseq3r/models/players/heads/quake3/ranger.tga new file mode 100644 index 00000000..99174f1f Binary files /dev/null and b/baseq3r/models/players/heads/quake3/ranger.tga differ diff --git a/baseq3r/models/players/heads/quake3/ranger_h.tga b/baseq3r/models/players/heads/quake3/ranger_h.tga new file mode 100644 index 00000000..2717b826 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/ranger_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/razor_gogs.tga b/baseq3r/models/players/heads/quake3/razor_gogs.tga new file mode 100644 index 00000000..a95c8c5c Binary files /dev/null and b/baseq3r/models/players/heads/quake3/razor_gogs.tga differ diff --git a/baseq3r/models/players/heads/quake3/razor_gogs_fx.tga b/baseq3r/models/players/heads/quake3/razor_gogs_fx.tga new file mode 100644 index 00000000..de5c60ab Binary files /dev/null and b/baseq3r/models/players/heads/quake3/razor_gogs_fx.tga differ diff --git a/baseq3r/models/players/heads/quake3/razor_h.tga b/baseq3r/models/players/heads/quake3/razor_h.tga new file mode 100644 index 00000000..0021c9f1 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/razor_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/roderic_h.tga b/baseq3r/models/players/heads/quake3/roderic_h.tga new file mode 100644 index 00000000..308cd7bf Binary files /dev/null and b/baseq3r/models/players/heads/quake3/roderic_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/sarge_h.tga b/baseq3r/models/players/heads/quake3/sarge_h.tga new file mode 100644 index 00000000..6c6fe424 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/sarge_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/slammer_h.tga b/baseq3r/models/players/heads/quake3/slammer_h.tga new file mode 100644 index 00000000..8c93a274 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/slammer_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/slash_h.tga b/baseq3r/models/players/heads/quake3/slash_h.tga new file mode 100644 index 00000000..f9d948b1 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/slash_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/sorlag.tga b/baseq3r/models/players/heads/quake3/sorlag.tga new file mode 100644 index 00000000..2394e549 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/sorlag.tga differ diff --git a/baseq3r/models/players/heads/quake3/stripe_h.tga b/baseq3r/models/players/heads/quake3/stripe_h.tga new file mode 100644 index 00000000..c794840b Binary files /dev/null and b/baseq3r/models/players/heads/quake3/stripe_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/stroggo_h.tga b/baseq3r/models/players/heads/quake3/stroggo_h.tga new file mode 100644 index 00000000..73b1288f Binary files /dev/null and b/baseq3r/models/players/heads/quake3/stroggo_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/tankjr.tga b/baseq3r/models/players/heads/quake3/tankjr.tga new file mode 100644 index 00000000..82ff3a42 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/tankjr.tga differ diff --git a/baseq3r/models/players/heads/quake3/uriel.tga b/baseq3r/models/players/heads/quake3/uriel.tga new file mode 100644 index 00000000..918550d7 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/uriel.tga differ diff --git a/baseq3r/models/players/heads/quake3/uriel_h.tga b/baseq3r/models/players/heads/quake3/uriel_h.tga new file mode 100644 index 00000000..488e6b09 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/uriel_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/visor.tga b/baseq3r/models/players/heads/quake3/visor.tga new file mode 100644 index 00000000..e68f9bdb Binary files /dev/null and b/baseq3r/models/players/heads/quake3/visor.tga differ diff --git a/baseq3r/models/players/heads/quake3/wrack.tga b/baseq3r/models/players/heads/quake3/wrack.tga new file mode 100644 index 00000000..61172989 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/wrack.tga differ diff --git a/baseq3r/models/players/heads/quake3/wrack_h.tga b/baseq3r/models/players/heads/quake3/wrack_h.tga new file mode 100644 index 00000000..754c30fb Binary files /dev/null and b/baseq3r/models/players/heads/quake3/wrack_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/xaero_h.tga b/baseq3r/models/players/heads/quake3/xaero_h.tga new file mode 100644 index 00000000..6f3014d7 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/xaero_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/yuriko_h.tga b/baseq3r/models/players/heads/quake3/yuriko_h.tga new file mode 100644 index 00000000..3595c3a7 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/yuriko_h.tga differ diff --git a/baseq3r/models/players/heads/quake3/zael.tga b/baseq3r/models/players/heads/quake3/zael.tga new file mode 100644 index 00000000..4ac59c89 Binary files /dev/null and b/baseq3r/models/players/heads/quake3/zael.tga differ diff --git a/baseq3r/models/players/heads/quake3/zael_h.tga b/baseq3r/models/players/heads/quake3/zael_h.tga new file mode 100644 index 00000000..23dc558c Binary files /dev/null and b/baseq3r/models/players/heads/quake3/zael_h.tga differ diff --git a/baseq3r/models/players/heads/ranger.md3 b/baseq3r/models/players/heads/ranger.md3 new file mode 100644 index 00000000..29e0f992 Binary files /dev/null and b/baseq3r/models/players/heads/ranger.md3 differ diff --git a/baseq3r/models/players/heads/ranger.skin b/baseq3r/models/players/heads/ranger.skin new file mode 100644 index 00000000..b96e221f --- /dev/null +++ b/baseq3r/models/players/heads/ranger.skin @@ -0,0 +1,3 @@ +h_face,models/players/heads/quake3/ranger_h.tga +h_helmet,models/players/heads/quake3/ranger.tga +tag_head, diff --git a/baseq3r/models/players/heads/razor.md3 b/baseq3r/models/players/heads/razor.md3 new file mode 100644 index 00000000..79cd5d7d Binary files /dev/null and b/baseq3r/models/players/heads/razor.md3 differ diff --git a/baseq3r/models/players/heads/razor.skin b/baseq3r/models/players/heads/razor.skin new file mode 100644 index 00000000..8030cb2a --- /dev/null +++ b/baseq3r/models/players/heads/razor.skin @@ -0,0 +1,3 @@ +h_goggles,models/players/heads/quake3/razor_gogs.tga +h_head,models/players/heads/quake3/razor_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/roderic.md3 b/baseq3r/models/players/heads/roderic.md3 new file mode 100644 index 00000000..66c71282 Binary files /dev/null and b/baseq3r/models/players/heads/roderic.md3 differ diff --git a/baseq3r/models/players/heads/roderic.skin b/baseq3r/models/players/heads/roderic.skin new file mode 100644 index 00000000..1c1a47dd --- /dev/null +++ b/baseq3r/models/players/heads/roderic.skin @@ -0,0 +1,3 @@ +tag_head, +h_cigar,models/players/heads/quake3/null.tga +h_head,models/players/heads/quake3/roderic_h.tga diff --git a/baseq3r/models/players/heads/sarge.skin b/baseq3r/models/players/heads/sarge.skin index 1e9a247f..3e3b97eb 100644 --- a/baseq3r/models/players/heads/sarge.skin +++ b/baseq3r/models/players/heads/sarge.skin @@ -1,3 +1,3 @@ -h_head,models/players/heads/sarge_h.tga -h_cigar,models/players/heads/cigar.tga +h_head,models/players/heads/quake3/sarge_h.tga +h_cigar,models/players/heads/quake3/cigar.tga tag_head, diff --git a/baseq3r/models/players/heads/sarge_h.tga b/baseq3r/models/players/heads/sarge_h.tga deleted file mode 100644 index 294b9e08..00000000 Binary files a/baseq3r/models/players/heads/sarge_h.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/slammer.md3 b/baseq3r/models/players/heads/slammer.md3 new file mode 100644 index 00000000..6c3c43d6 Binary files /dev/null and b/baseq3r/models/players/heads/slammer.md3 differ diff --git a/baseq3r/models/players/heads/slammer.skin b/baseq3r/models/players/heads/slammer.skin new file mode 100644 index 00000000..f95836e6 --- /dev/null +++ b/baseq3r/models/players/heads/slammer.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/slammer_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/slash.md3 b/baseq3r/models/players/heads/slash.md3 new file mode 100644 index 00000000..b647dc21 Binary files /dev/null and b/baseq3r/models/players/heads/slash.md3 differ diff --git a/baseq3r/models/players/heads/slash.skin b/baseq3r/models/players/heads/slash.skin new file mode 100644 index 00000000..79b007a8 --- /dev/null +++ b/baseq3r/models/players/heads/slash.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/slash_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/sorlag.md3 b/baseq3r/models/players/heads/sorlag.md3 new file mode 100644 index 00000000..bdd3f611 Binary files /dev/null and b/baseq3r/models/players/heads/sorlag.md3 differ diff --git a/baseq3r/models/players/heads/sorlag.skin b/baseq3r/models/players/heads/sorlag.skin new file mode 100644 index 00000000..0ba70047 --- /dev/null +++ b/baseq3r/models/players/heads/sorlag.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/sorlag.tga +tag_head, diff --git a/baseq3r/models/players/heads/stripe.md3 b/baseq3r/models/players/heads/stripe.md3 new file mode 100644 index 00000000..b5656503 Binary files /dev/null and b/baseq3r/models/players/heads/stripe.md3 differ diff --git a/baseq3r/models/players/heads/stripe.skin b/baseq3r/models/players/heads/stripe.skin new file mode 100644 index 00000000..f878c677 --- /dev/null +++ b/baseq3r/models/players/heads/stripe.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/stripe_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/stroggo.md3 b/baseq3r/models/players/heads/stroggo.md3 new file mode 100644 index 00000000..6c3c43d6 Binary files /dev/null and b/baseq3r/models/players/heads/stroggo.md3 differ diff --git a/baseq3r/models/players/heads/stroggo.skin b/baseq3r/models/players/heads/stroggo.skin new file mode 100644 index 00000000..af435007 --- /dev/null +++ b/baseq3r/models/players/heads/stroggo.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/stroggo_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/tankjr.skin b/baseq3r/models/players/heads/tankjr.skin index b7d7f4af..c7b6f5e1 100644 --- a/baseq3r/models/players/heads/tankjr.skin +++ b/baseq3r/models/players/heads/tankjr.skin @@ -1,2 +1,2 @@ -h_head,models/players/heads/tankjr.tga +h_head,models/players/heads/quake3/tankjr.tga tag_head, diff --git a/baseq3r/models/players/heads/tankjr.tga b/baseq3r/models/players/heads/tankjr.tga deleted file mode 100644 index e2d26e41..00000000 Binary files a/baseq3r/models/players/heads/tankjr.tga and /dev/null differ diff --git a/baseq3r/models/players/heads/uriel.md3 b/baseq3r/models/players/heads/uriel.md3 new file mode 100644 index 00000000..5827c015 Binary files /dev/null and b/baseq3r/models/players/heads/uriel.md3 differ diff --git a/baseq3r/models/players/heads/uriel.skin b/baseq3r/models/players/heads/uriel.skin new file mode 100644 index 00000000..ba394393 --- /dev/null +++ b/baseq3r/models/players/heads/uriel.skin @@ -0,0 +1,3 @@ +h_face,models/players/heads/quake3/uriel_h.tga +h_hood,models/players/heads/quake3/uriel.tga +tag_head, diff --git a/baseq3r/models/players/heads/visor.md3 b/baseq3r/models/players/heads/visor.md3 new file mode 100644 index 00000000..3b27ca17 Binary files /dev/null and b/baseq3r/models/players/heads/visor.md3 differ diff --git a/baseq3r/models/players/heads/visor.skin b/baseq3r/models/players/heads/visor.skin new file mode 100644 index 00000000..bf58729a --- /dev/null +++ b/baseq3r/models/players/heads/visor.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/visor.tga +tag_head, diff --git a/baseq3r/models/players/heads/wrack.md3 b/baseq3r/models/players/heads/wrack.md3 new file mode 100644 index 00000000..29e0f992 Binary files /dev/null and b/baseq3r/models/players/heads/wrack.md3 differ diff --git a/baseq3r/models/players/heads/wrack.skin b/baseq3r/models/players/heads/wrack.skin new file mode 100644 index 00000000..6914a694 --- /dev/null +++ b/baseq3r/models/players/heads/wrack.skin @@ -0,0 +1,3 @@ +h_face,models/players/heads/quake3/wrack_h.tga +h_helmet,models/players/heads/quake3/wrack.tga +tag_head, diff --git a/baseq3r/models/players/heads/xaero.md3 b/baseq3r/models/players/heads/xaero.md3 new file mode 100644 index 00000000..9d63acda Binary files /dev/null and b/baseq3r/models/players/heads/xaero.md3 differ diff --git a/baseq3r/models/players/heads/xaero.skin b/baseq3r/models/players/heads/xaero.skin new file mode 100644 index 00000000..e33f95aa --- /dev/null +++ b/baseq3r/models/players/heads/xaero.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/xaero_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/yuriko.md3 b/baseq3r/models/players/heads/yuriko.md3 new file mode 100644 index 00000000..b647dc21 Binary files /dev/null and b/baseq3r/models/players/heads/yuriko.md3 differ diff --git a/baseq3r/models/players/heads/yuriko.skin b/baseq3r/models/players/heads/yuriko.skin new file mode 100644 index 00000000..1e2e198b --- /dev/null +++ b/baseq3r/models/players/heads/yuriko.skin @@ -0,0 +1,2 @@ +h_head,models/players/heads/quake3/yuriko_h.tga +tag_head, diff --git a/baseq3r/models/players/heads/zael.md3 b/baseq3r/models/players/heads/zael.md3 new file mode 100644 index 00000000..5827c015 Binary files /dev/null and b/baseq3r/models/players/heads/zael.md3 differ diff --git a/baseq3r/models/players/heads/zael.skin b/baseq3r/models/players/heads/zael.skin new file mode 100644 index 00000000..7296415a --- /dev/null +++ b/baseq3r/models/players/heads/zael.skin @@ -0,0 +1,3 @@ +h_face,models/players/heads/quake3/zael_h.tga +h_hood,models/players/heads/quake3/zael.tga +tag_head, diff --git a/baseq3r/models/weapons2/gauntlet/blade.tga b/baseq3r/models/weapons2/gauntlet/blade.tga new file mode 100644 index 00000000..8291b87e Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/blade.tga differ diff --git a/baseq3r/models/weapons2/gauntlet/chain.jpg b/baseq3r/models/weapons2/gauntlet/chain.jpg new file mode 100644 index 00000000..02cdafbf Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/chain.jpg differ diff --git a/baseq3r/models/weapons2/gauntlet/env_map.jpg b/baseq3r/models/weapons2/gauntlet/env_map.jpg new file mode 100644 index 00000000..a2f71a50 Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/env_map.jpg differ diff --git a/baseq3r/models/weapons2/gauntlet/env_map.tga b/baseq3r/models/weapons2/gauntlet/env_map.tga new file mode 100644 index 00000000..cf873c3f Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/env_map.tga differ diff --git a/baseq3r/models/weapons2/gauntlet/gauntlet.md3 b/baseq3r/models/weapons2/gauntlet/gauntlet.md3 index df96f5f5..3649e9ba 100644 Binary files a/baseq3r/models/weapons2/gauntlet/gauntlet.md3 and b/baseq3r/models/weapons2/gauntlet/gauntlet.md3 differ diff --git a/baseq3r/models/weapons2/gauntlet/gauntlet_1.md3 b/baseq3r/models/weapons2/gauntlet/gauntlet_1.md3 new file mode 100644 index 00000000..3649e9ba Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/gauntlet_1.md3 differ diff --git a/baseq3r/models/weapons2/gauntlet/gauntlet_2.md3 b/baseq3r/models/weapons2/gauntlet/gauntlet_2.md3 new file mode 100644 index 00000000..3649e9ba Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/gauntlet_2.md3 differ diff --git a/baseq3r/models/weapons2/gauntlet/gauntlet_barrel.md3 b/baseq3r/models/weapons2/gauntlet/gauntlet_barrel.md3 index 15c45ac6..9a3b3bdd 100644 Binary files a/baseq3r/models/weapons2/gauntlet/gauntlet_barrel.md3 and b/baseq3r/models/weapons2/gauntlet/gauntlet_barrel.md3 differ diff --git a/baseq3r/models/weapons2/gauntlet/gauntlet_barrel_1.md3 b/baseq3r/models/weapons2/gauntlet/gauntlet_barrel_1.md3 new file mode 100644 index 00000000..9a3b3bdd Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/gauntlet_barrel_1.md3 differ diff --git a/baseq3r/models/weapons2/gauntlet/gauntlet_barrel_2.md3 b/baseq3r/models/weapons2/gauntlet/gauntlet_barrel_2.md3 new file mode 100644 index 00000000..9a3b3bdd Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/gauntlet_barrel_2.md3 differ diff --git a/baseq3r/models/weapons2/gauntlet/gauntlet_hand.md3 b/baseq3r/models/weapons2/gauntlet/gauntlet_hand.md3 new file mode 100644 index 00000000..e8ac1c3a Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/gauntlet_hand.md3 differ diff --git a/baseq3r/models/weapons2/gauntlet/main.tga b/baseq3r/models/weapons2/gauntlet/main.tga new file mode 100644 index 00000000..91f68614 Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/main.tga differ diff --git a/baseq3r/models/weapons2/gauntlet/mainlite.jpg b/baseq3r/models/weapons2/gauntlet/mainlite.jpg new file mode 100644 index 00000000..e753dc52 Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/mainlite.jpg differ diff --git a/baseq3r/models/weapons2/gauntlet/tube.tga b/baseq3r/models/weapons2/gauntlet/tube.tga new file mode 100644 index 00000000..d5bc95a3 Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/tube.tga differ diff --git a/baseq3r/models/weapons2/gauntlet/tube2.tga b/baseq3r/models/weapons2/gauntlet/tube2.tga new file mode 100644 index 00000000..35c61b71 Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/tube2.tga differ diff --git a/baseq3r/models/weapons2/gauntlet/wheel.tga b/baseq3r/models/weapons2/gauntlet/wheel.tga new file mode 100644 index 00000000..316b820b Binary files /dev/null and b/baseq3r/models/weapons2/gauntlet/wheel.tga differ diff --git a/baseq3r/scripts/chainsaw.shader b/baseq3r/scripts/chainsaw.shader new file mode 100644 index 00000000..3e4cabe4 --- /dev/null +++ b/baseq3r/scripts/chainsaw.shader @@ -0,0 +1,67 @@ +models/weapons2/gauntlet/blade +{ +// { +// map textures/sfx/specular.tga +// blendFunc GL_ONE GL_ZERO +// tcGen environment +// rgbGeb identity +// } + { + map models/weapons2/gauntlet/blade.tga + blendFunc GL_ONE GL_ONE_MINUS_SRC_ALPHA +// rgbGen lightingDiffuse +// rgbGen identity + } +} +models/weapons2/gauntlet/chain +{ + { + map models/weapons2/gauntlet/main.tga + tcMod scroll -3 0 + // blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + // rgbGen lightingDiffuse + } +} +models/weapons2/gauntlet/wheel +{ + { + map models/weapons2/gauntlet/env_map.tga + blendFunc GL_ONE GL_ZERO + tcGen environment + //rgbGen lightingDiffuse + rgbGen identity + } + { + map models/weapons2/gauntlet/wheel.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + } +} +models/weapons2/gauntlet/tube +{ + { + map models/weapons2/gauntlet/tube2.tga + blendFunc GL_ONE GL_ZERO + // tcGen environment + // rgbGen lightingDiffuse + tcMod scroll .1 .75 + rgbGen identity + } + { + map models/weapons2/gauntlet/tube.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + } +} +models/weapons2/gauntlet/main +{ + sort additive + { + map models/weapons2/gauntlet/main.tga + } + { + map models/weapons2/gauntlet/mainlite.jpg + blendFunc add + rgbgen wave sin .575 .25 0 10 + } +} \ No newline at end of file diff --git a/baseq3r/scripts/domination.shader b/baseq3r/scripts/domination.shader new file mode 100644 index 00000000..71aa56f1 --- /dev/null +++ b/baseq3r/scripts/domination.shader @@ -0,0 +1,26 @@ +// ------------------------------------------------------------ +// flags (n_flag) +// ------------------------------------------------------------ + +models/flags/n_flag +{ + cull disable + deformVertexes wave 80 sin 2 8 0 3 + deformVertexes wave 20 square 0 2 0.5 0.2 + { + map textures/sfx/proto_zzztwhite.tga + rgbGen identity + tcMod turb 1 1 0.5 0.3 + tcGen environment + } + { + map models/flags/n_flag.tga + rgbGen lightingDiffuse + alphaFunc GE128 + } + { + map textures/effects/flagenv.tga + blendfunc gl_dst_color gl_src_color + tcGen environment + } +} \ No newline at end of file diff --git a/baseq3r/scripts/new_q3heads.shader b/baseq3r/scripts/new_q3heads.shader new file mode 100644 index 00000000..72ec2851 --- /dev/null +++ b/baseq3r/scripts/new_q3heads.shader @@ -0,0 +1,440 @@ +models/players/heads/quake3/crash_f +{ + + { + map textures/sfx/snow.tga + tcmod scale .5 .5 + tcmod scroll 9 0.3 + rgbGen identity + } + { + map textures/effects/tinfx2b.tga + tcGen environment + blendFunc add + rgbGen lightingdiffuse + } +} + +models/players/heads/quake3/doom_f +{ + + { + map textures/effects/tinfx.tga + tcGen environment + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } + { + + map models/players/heads/quake3/doom_f.tga + tcGen environment + rgbGen lightingDiffuse + blendfunc gl_ONE gl_ONE + } + +} + +models/players/heads/quake3/razor_gogs +{ + { + map models/players/heads/quake3/razor_gogs.tga + tcGen environment + + } + + + { + map models/players/heads/quake3/razor_gogs_fx.tga + blendfunc GL_ONE GL_ONE + tcMod scroll 1.2 9.3 + + } +} + +models/players/heads/quake3/uriel_h +{ + { + map models/players/heads/quake3/uriel_h.tga + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } + { + map textures/sfx/proto_zzzt.tga + blendFunc GL_ONE GL_ONE + tcmod scroll -0.2 1 + rgbGen identity + } + { + map models/players/heads/quake3/uriel_h.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + } + + +} + +models/players/heads/quake3/xaero_h +{ + { + map models/players/heads/quake3/xaero_h.tga + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } + { + map textures/sfx/firewalla.tga + blendFunc GL_ONE GL_ONE + tcmod scroll 0.1 1 + //rgbGen wave triangle .5 1 0 .4 + } + { + map models/players/heads/quake3/xaero_h.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + } + +} + +models/players/heads/quake3/hunter_f +{ + deformVertexes wave 100 sin 0 .3 0 .2 + cull disable + { + map models/players/heads/quake3/hunter_f.tga + //blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + //alphaFunc GT0 + alphaFunc GE128 + depthWrite + rgbGen lightingDiffuse + } + + +} + +models/players/heads/quake3/mynx_shiny +{ + + { + map textures/sfx/specular5.tga + blendFunc GL_ONE GL_ZERO + tcGen environment + } + { + map models/players/heads/quake3/mynx_shiny.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + } + +} + +models/players/heads/quake3/anarki_g + +{ + { + map models/players/heads/quake3/anarki_g.tga + //rgbGen vertex + } + { + + map models/players/heads/quake3/anarki_g_fx.tga + rgbGen lightingDiffuse + rgbGen wave triangle 0 1 0 .5 + blendfunc gl_ONE gl_ONE + } +} + +models/players/heads/quake3/klesk_h +{ + { + map models/players/heads/quake3/klesk_h.tga + blendfunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + + } + + { + map models/players/heads/quake3/klesk_g.tga + blendfunc GL_ONE GL_ONE + rgbGen wave triangle .5 1 0 .5 + + } +} + +models/players/heads/quake3/bones2_h +{ + { + map models/players/heads/quake3/bones2_h.tga + blendfunc add + //rgbGen wave sin 1 .8 0 9 + } + { + + map models/players/heads/quake3/bones2_fx.jpg + tcMod scroll -6 -.2 + tcgen environment + blendFunc GL_ONE GL_ONE + rgbGen identity + } + + +} + +models/players/heads/quake3/bones_h +{ + + cull disable + { + map models/players/heads/quake3/bones_h.tga + alphaFunc GE128 + depthWrite + rgbGen lightingdiffuse + } +} + +models/players/heads/quake3/phobos_f +{ + + { + map textures/effects/tinfx.tga + tcGen environment + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } + { + map models/players/heads/quake3/phobos_f.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + } +} + +models/players/heads/quake3/stripe_h +{ + + { + //map textures/effects/tinfx.tga + map textures/sfx/electricgrade3.tga + //tcmod scale 6 6 + //tcmod rotate 350 + tcmod scroll 0 -.5 + //tcGen environment + blendfunc GL_ONE GL_ZERO + rgbGen identity + } + { + map models/players/heads/quake3/stripe_h.tga + blendfunc gl_src_alpha gl_one_minus_src_alpha + rgbGen lightingDiffuse + } + +} + +models/players/heads/quake3/harpy_h +{ + { + map textures/effects/envmaproc.tga + tcGen environment + rgbGen lightingdiffuse + } + { + map models/players/heads/quake3/hunter_h.tga + blendFunc blend + rgbGen lightingdiffuse + } +} + +models/players/heads/quake3/flisk_h +{ + { + map models/players/heads/quake3/flisk_h.tga + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } + { + map textures/sfx/bolts.tga + blendFunc GL_ONE GL_ONE + tcmod scale 2 2 + tcmod scroll 2 2 + } + { + map models/players/heads/quake3/flisk_h.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + } + + +} + +//models/players/heads/quake3/wrack +//{ +// { +// map $whiteimage +// rgbGen lightingDiffuse +// } +// { +// map models/players/heads/quake3/wrack.tga +// blendFunc GL_DST_COLOR GL_SRC_ALPHA +// rgbGen identity +// alphaGen lightingSpecular +// } +// +//} +models/players/heads/quake3/wrack +{ + + { + map $whiteimage + rgbGen lightingDiffuse + } + { + map models/players/heads/quake3/wrack.tga + blendFunc GL_DST_COLOR GL_SRC_ALPHA + rgbGen identity + alphaGen lightingSpecular + } + +} + +models/players/heads/quake3/patriot_gogs +{ + { + map textures/effects/tinfx2d.tga + tcGen environment + blendFunc GL_ONE GL_ZERO + rgbGen lightingDiffuse + } + + +} + +models/players/heads/quake3/id_h +{ + { + map textures/effects/tinfx2d.tga + tcGen environment + rgbGen lightingdiffuse + } + { + map models/players/heads/quake3/id_h.tga + blendFunc blend + rgbGen lightingdiffuse + } +} + +models/players/heads/quake3/krusade_h +{ + { + map textures/sfx/firegorre.tga + blendFunc GL_ONE GL_ZERO + tcmod scroll 0 1 + tcMod turb 0 .25 0 1.6 + tcmod scale 4 4 + rgbGen identity + } + { + map models/players/heads/quake3/krusade_h.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + } + + +} + +models/players/heads/quake3/roderic_h +{ + { + map textures/sfx/firegorre.tga + blendFunc GL_ONE GL_ZERO + tcmod scroll 0 1 + tcMod turb 0 .25 0 1.6 + tcmod scale 4 4 + rgbGen identity + } + { + map models/players/heads/quake3/roderic_h.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + } + + +} + +models/players/heads/quake3/null +{ + { + map models/players/heads/quake3/null.tga + blendFunc GL_ONE GL_ONE + } + +} + +models/players/heads/quake3/grrl_h +{ + + { + map textures/effects/tinfx2d.tga + tcGen environment + rgbGen identity + } + { + map models/players/heads/quake3/grrl_h.tga + blendfunc blend + rgbGen lightingdiffuse + } + +} + +models/players/heads/quake3/yuriko_h +{ + { + map textures/effects/envmaproc.jpg + tcGen environment + rgbGen lightingdiffuse + } + { + map models/players/heads/quake3/yuriko_h.tga + blendFunc blend + rgbGen lightingdiffuse + } +} + +models/players/heads/quake3/gorre +{ + + { + map textures/sfx/firegorre.tga + blendFunc GL_ONE GL_ZERO + tcmod scroll 0 1 + tcMod turb 0 .25 0 1.6 + tcmod scale 4 4 + rgbGen identity + } + //{ + // map textures/sfx/firewallb.tga + // blendFunc GL_ONE GL_ONE + // tcmod scale 3 3 + // tcMod turb 0 .2 0 .1 + // tcMod scroll 0 3 + // //tcmod rotate 360 + // rgbGen identity + //} + { + map models/players/heads/quake3/gorre.tga + blendFunc GL_SRC_ALPHA GL_ONE_MINUS_SRC_ALPHA + rgbGen lightingDiffuse + } +} + +models/players/heads/quake3/zael +{ + + { + map $whiteimage + rgbGen lightingDiffuse + } + { + map models/players/heads/quake3/zael.tga + blendFunc GL_DST_COLOR GL_SRC_ALPHA + rgbGen identity + alphaGen lightingSpecular + } + +} \ No newline at end of file diff --git a/baseq3r/sound/weapons/melee/fstatck.wav b/baseq3r/sound/weapons/melee/fstatck.wav index f27a33c9..ce650f5d 100644 Binary files a/baseq3r/sound/weapons/melee/fstatck.wav and b/baseq3r/sound/weapons/melee/fstatck.wav differ diff --git a/baseq3r/sound/weapons/melee/fstrun.wav b/baseq3r/sound/weapons/melee/fstrun.wav index 8bf8c92d..5c5c523c 100644 Binary files a/baseq3r/sound/weapons/melee/fstrun.wav and b/baseq3r/sound/weapons/melee/fstrun.wav differ diff --git a/baseq3r/textures/organics/grass3.tga b/baseq3r/textures/organics/grass3.tga index 4270f4fc..10e4ea7e 100644 Binary files a/baseq3r/textures/organics/grass3.tga and b/baseq3r/textures/organics/grass3.tga differ diff --git a/baseq3r/textures/q3r_building/bricks01.tga b/baseq3r/textures/q3r_building/bricks01.tga index 79dea559..f67d0f18 100644 Binary files a/baseq3r/textures/q3r_building/bricks01.tga and b/baseq3r/textures/q3r_building/bricks01.tga differ diff --git a/baseq3r/textures/sfx/proto_zzztwhite.jpg b/baseq3r/textures/sfx/proto_zzztwhite.jpg new file mode 100644 index 00000000..97de492d Binary files /dev/null and b/baseq3r/textures/sfx/proto_zzztwhite.jpg differ diff --git a/engine/code/game/ai_chat.c b/engine/code/game/ai_chat.c index 93e99468..8ec1c495 100644 --- a/engine/code/game/ai_chat.c +++ b/engine/code/game/ai_chat.c @@ -254,7 +254,7 @@ BotWeaponNameForMeansOfDeath char *BotWeaponNameForMeansOfDeath(int mod) { switch(mod) { case MOD_SHOTGUN: return "Shotgun"; - case MOD_GAUNTLET: return "Gauntlet"; + case MOD_GAUNTLET: return "Chainsaw"; case MOD_MACHINEGUN: return "Machinegun"; case MOD_GRENADE: case MOD_GRENADE_SPLASH: return "Grenade Launcher"; @@ -292,7 +292,7 @@ char *BotRandomWeaponName(void) { rnd = random() * 8.9; #endif switch(rnd) { - case 0: return "Gauntlet"; + case 0: return "Chainsaw"; case 1: return "Shotgun"; case 2: return "Machinegun"; case 3: return "Grenade Launcher"; diff --git a/engine/code/game/bg_misc.c b/engine/code/game/bg_misc.c index 8b6b4d70..b5605b2c 100644 --- a/engine/code/game/bg_misc.c +++ b/engine/code/game/bg_misc.c @@ -228,7 +228,7 @@ gitem_t bg_itemlist[] = { "models/weapons2/gauntlet/gauntlet.md3", NULL, NULL, NULL}, /* icon */ "icons/iconw_gauntlet", -/* pickup */ "Gauntlet", +/* pickup */ "Chainsaw", 0, IT_WEAPON, WP_GAUNTLET, diff --git a/engine/code/q3_ui/ui_controls2.c b/engine/code/q3_ui/ui_controls2.c index 8c919592..6926a753 100644 --- a/engine/code/q3_ui/ui_controls2.c +++ b/engine/code/q3_ui/ui_controls2.c @@ -245,7 +245,7 @@ static bind_t g_bindings[] = {"+mlook", "mouse look", ID_MOUSELOOK, ANIM_IDLE, '/', -1, -1, -1}, {"centerview", "center view", ID_CENTERVIEW, ANIM_IDLE, K_END, -1, -1, -1}, {"+zoom", "zoom view", ID_ZOOMVIEW, ANIM_IDLE, -1, -1, -1, -1}, - {"weapon 1", "gauntlet", ID_WEAPON1, ANIM_WEAPON1, '1', -1, -1, -1}, + {"weapon 1", "chainsaw", ID_WEAPON1, ANIM_WEAPON1, '1', -1, -1, -1}, {"weapon 2", "machinegun", ID_WEAPON2, ANIM_WEAPON2, '2', -1, -1, -1}, {"weapon 3", "shotgun", ID_WEAPON3, ANIM_WEAPON3, '3', -1, -1, -1}, {"weapon 4", "grenade launcher", ID_WEAPON4, ANIM_WEAPON4, '4', -1, -1, -1}, diff --git a/engine/code/q3_ui/ui_rally_controls.c b/engine/code/q3_ui/ui_rally_controls.c index ed12dfdc..97b5d8d7 100644 --- a/engine/code/q3_ui/ui_rally_controls.c +++ b/engine/code/q3_ui/ui_rally_controls.c @@ -335,7 +335,7 @@ static bind_t g_bindings[] = {"+mlook", "mouse look", ID_MOUSELOOK, ANIM_IDLE, '/', -1, -1, -1}, {"centerview", "center view", ID_CENTERVIEW, ANIM_IDLE, K_END, -1, -1, -1}, {"+zoom", "zoom view", ID_ZOOMVIEW, ANIM_IDLE, -1, -1, -1, -1}, - {"weapon 1", "gauntlet", ID_WEAPON1, ANIM_WEAPON1, '1', -1, -1, -1}, + {"weapon 1", "chainsaw", ID_WEAPON1, ANIM_WEAPON1, '1', -1, -1, -1}, {"weapon 2", "machinegun", ID_WEAPON2, ANIM_WEAPON2, '2', -1, -1, -1}, {"weapon 3", "shotgun", ID_WEAPON3, ANIM_WEAPON3, '3', -1, -1, -1}, {"weapon 4", "grenade launcher", ID_WEAPON4, ANIM_WEAPON4, '4', -1, -1, -1}, diff --git a/engine/code/q3_ui/ui_sppostgame.c b/engine/code/q3_ui/ui_sppostgame.c index 89e3ef1b..89bde13e 100644 --- a/engine/code/q3_ui/ui_sppostgame.c +++ b/engine/code/q3_ui/ui_sppostgame.c @@ -78,7 +78,7 @@ typedef struct { static postgameMenuInfo_t postgameMenuInfo; static char arenainfo[MAX_INFO_VALUE]; -char *ui_medalNames[] = {"Accuracy", "Impressive", "Excellent", "Gauntlet", "Frags", "Perfect"}; +char *ui_medalNames[] = {"Accuracy", "Impressive", "Excellent", "Chainsaw", "Frags", "Perfect"}; char *ui_medalPicNames[] = { "menu/medals/medal_accuracy", "menu/medals/medal_impressive", diff --git a/engine/code/qcommon/q_shared.h b/engine/code/qcommon/q_shared.h index 47406c76..714a2038 100644 --- a/engine/code/qcommon/q_shared.h +++ b/engine/code/qcommon/q_shared.h @@ -67,7 +67,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define BASETA "missionpack" #ifndef PRODUCT_VERSION -#define PRODUCT_VERSION "v0.0.3.0_r305" +#define PRODUCT_VERSION "v0.0.3.0_r306" #endif diff --git a/engine/ui/menudef.h b/engine/ui/menudef.h index 1078c221..dc10fd09 100644 --- a/engine/ui/menudef.h +++ b/engine/ui/menudef.h @@ -304,5 +304,5 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define VOICECHAT_KILLINSULT "kill_insult" // I just killed you #define VOICECHAT_TAUNT "taunt" // I want to taunt you #define VOICECHAT_DEATHINSULT "death_insult" // you just killed me -#define VOICECHAT_KILLGAUNTLET "kill_gauntlet" // I just killed you with the gauntlet +#define VOICECHAT_KILLGAUNTLET "kill_chainsaw" // I just killed you with the gauntlet #define VOICECHAT_PRAISE "praise" // you did something good diff --git a/q3rallycode.ppr b/q3rallycode.ppr index 5dc7674a..df42dc51 100644 --- a/q3rallycode.ppr +++ b/q3rallycode.ppr @@ -858,118 +858,42 @@ q3rallycode engine\resync_svn.sh engine\cross-make-mingw64.sh [Open project files] -0=engine\code\qcommon\files.c -1=engine\code\game\g_weapon.c -2=engine\code\cgame\cg_weapons.c -3=engine\code\game\g_missile.c -4=engine\code\qcommon\q_shared.h -5=engine\code\q3_ui\ui_rally_credits.c -6=engine\code\q3_ui\ui_credits.c -7=engine\code\q3_ui\ui_qmenu.c -8=engine\code\q3_ui\ui_local.h -9=engine\code\game\bg_public.h -10=engine\code\cgame\cg_event.c -11=engine\code\cgame\cg_effects.c -12=engine\code\cgame\cg_local.h -13=engine\code\cgame\cg_rally_hud.c -14=engine\code\q3_ui\ui_rally_options.c -15=engine\code\q3_ui\ui_rally_servers.c -16=engine\code\qcommon\qcommon.h -17=engine\code\q3_ui\ui_serverinfo.c -18=engine\code\server\sv_init.c -19=engine\code\game\g_misc.c -20=engine\code\game\bg_misc.c -21=engine\code\game\g_local.h -22=engine\code\game\g_combat.c -23=engine\code\cgame\cg_ents.c -24=engine\code\cgame\cg_draw.c -25=engine\code\game\bg_pmove.c -26=engine\code\q3_ui\ui_cinematics.c -27=engine\code\cgame\cg_players.c +0=engine\code\qcommon\q_shared.h +1=engine\code\game\ai_chat.c +2=engine\code\game\bg_misc.c +3=engine\code\game\bg_public.h +4=engine\code\game\g_weapon.c +5=engine\code\q3_ui\ui_controls2.c +6=engine\code\q3_ui\ui_rally_controls.c +7=engine\code\q3_ui\ui_sppostgame.c +8=engine\ui\menudef.h [Selected Project Files] Main= -Selected=engine\code\qcommon\q_shared.h -[engine\code\qcommon\files.c] -TopLine=3681 -Caret=1,3695 -[engine\code\game\g_weapon.c] -TopLine=776 -Caret=1,776 -[engine\code\cgame\cg_weapons.c] -TopLine=2106 -Caret=1,2120 -[engine\code\game\g_missile.c] -TopLine=861 -Caret=13,865 +Selected=engine\ui\menudef.h [engine\code\qcommon\q_shared.h] -TopLine=52 +TopLine=44 Caret=39,70 -[engine\code\q3_ui\ui_rally_credits.c] -TopLine=63 -Caret=1,78 -[engine\code\q3_ui\ui_credits.c] -TopLine=111 -Caret=76,135 -[engine\code\q3_ui\ui_qmenu.c] -TopLine=1899 -Caret=64,1916 -[engine\code\q3_ui\ui_local.h] -TopLine=25 -Caret=33,40 -[engine\code\game\bg_public.h] -TopLine=893 -Caret=1,907 -[engine\code\cgame\cg_event.c] -TopLine=1117 -Caret=1,1132 -[engine\code\cgame\cg_effects.c] -TopLine=208 -Caret=48,229 -[engine\code\cgame\cg_local.h] -TopLine=1095 -Caret=1,1109 -[engine\code\cgame\cg_rally_hud.c] -TopLine=723 -Caret=1,738 -[engine\code\q3_ui\ui_rally_options.c] -TopLine=227 -Caret=1,242 -[engine\code\q3_ui\ui_rally_servers.c] -TopLine=1230 -Caret=1,1244 -[engine\code\qcommon\qcommon.h] -TopLine=253 -Caret=51,267 -[engine\code\q3_ui\ui_serverinfo.c] -TopLine=111 -Caret=29,136 -[engine\code\server\sv_init.c] -TopLine=671 -Caret=1,685 -[engine\code\game\g_misc.c] -TopLine=335 -Caret=1,349 +[engine\code\game\ai_chat.c] +TopLine=280 +Caret=27,295 [engine\code\game\bg_misc.c] -TopLine=1552 -Caret=1,1566 -[engine\code\game\g_local.h] -TopLine=630 -Caret=1,644 -[engine\code\game\g_combat.c] -TopLine=1079 -Caret=1,1093 -[engine\code\cgame\cg_ents.c] -TopLine=437 -Caret=1,463 -[engine\code\cgame\cg_draw.c] -TopLine=3413 -Caret=1,3427 -[engine\code\game\bg_pmove.c] -TopLine=2015 -Caret=1,2029 -[engine\code\q3_ui\ui_cinematics.c] -TopLine=21 -Caret=1,35 -[engine\code\cgame\cg_players.c] -TopLine=29 -Caret=1,29 +TopLine=215 +Caret=23,231 +[engine\code\game\bg_public.h] +TopLine=361 +Caret=1,376 +[engine\code\game\g_weapon.c] +TopLine=103 +Caret=1,58 +[engine\code\q3_ui\ui_controls2.c] +TopLine=233 +Caret=18,248 +[engine\code\q3_ui\ui_rally_controls.c] +TopLine=319 +Caret=25,338 +[engine\code\q3_ui\ui_sppostgame.c] +TopLine=70 +Caret=74,81 +[engine\ui\menudef.h] +TopLine=288 +Caret=47,307 diff --git a/tools/radiant-config/radiant15-netradiant/q3rally.game/baseq3r/entities.def b/tools/radiant-config/radiant15-netradiant/q3rally.game/baseq3r/entities.def index bc3ded7c..e0f8af2d 100644 --- a/tools/radiant-config/radiant15-netradiant/q3rally.game/baseq3r/entities.def +++ b/tools/radiant-config/radiant15-netradiant/q3rally.game/baseq3r/entities.def @@ -1,6 +1,7 @@ // Quake3 Arena entity definition file for Q3Radiant // Based on draft by Suicide 20 7.30.99 and inolen 9-3-99 // Upgraded by Eutectic: eutectic@ritualistic.com +// Q3Rally model defs added (info_player_start scale modified) by: To-mos 3-13-2021 // (visible models added by raYGunn - paths provided by Suicide 20) // (terrain information added to func_group entity by Paul Jaquays) // Q3Map2 entitys/keys added by ydnar @@ -958,7 +959,8 @@ In genuine bot arena matches, the podium for the 1st, 2nd and 3rd place players //============================================================================= -/*QUAKED info_player_start (1 0 0) (-16 -16 -24) (16 16 32) +//*QUAKED info_player_start (1 0 0) (-16 -16 -24) (16 16 32) +/*QUAKED info_player_start (1 0 0) (-50 -24 -24) (50 24 24) Player spawn location. It works in Quake III Arena, but it is not used in the Id maps. Use info_player_deathmatch instead. -------- KEYS -------- angle : direction in which player will look when spawning in the game. Does not apply to bots. @@ -2514,6 +2516,10 @@ Q3Rally Entities ================================= // +/*QUAKED rally_scripted_object (0 .9 .1) ? + +*/ + /*QUAKED rally_startfinish (0 .9 .1) ? "laps" number of laps, default is 1 @@ -2564,85 +2570,85 @@ disable_splash turns off splashes, improving framerates since there is not as mu //WEAPONS -/*QUAKED rally_weapon_bio (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ +/*QUAKED rally_weapon_bio (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED +model="models/rearfire/rf_bio.md3"*/ -/*QUAKED rally_weapon_flame (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ +/*QUAKED rally_weapon_flame (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED +model="models/rearfire/rf_flame.md3"*/ -/*QUAKED rally_weapon_mine (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ +/*QUAKED rally_weapon_mine (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED +model="models/rearfire/rf_mines.md3"*/ -/*QUAKED rally_weapon_oil (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ +/*QUAKED rally_weapon_oil (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED +model="models/rearfire/rf_oil.md3"*/ -/*QUAKED rally_weapon_smoke (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ +/*QUAKED rally_weapon_smoke (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED +model="models/rearfire/rf_smoke.md3"*/ //ITEMS -/*QUAKED rally_item_shield (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ +/*QUAKED rally_item_shield (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED +model="models/powerups/shield/shield.md3"*/ -/*QUAKED rally_item_turbo (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ +/*QUAKED rally_item_turbo (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED +model="models/powerups/turbo/turbo.md3"*/ -/*QUAKED rally_item_env (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ +/*QUAKED rally_item_env (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED +model="models/powerups/env/atomic.md3"*/ -/*QUAKED rally_item_invis (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ +/*QUAKED rally_item_invis (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED +model="models/powerups/invis/invis.md3"*/ -/*QUAKED rally_item_regen (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ +/*QUAKED rally_item_regen (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED +model="models/powerups/regen/regen.md3"*/ -/*QUAKED rally_item_haste (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ +/*QUAKED rally_item_haste (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED +model="models/powerups/haste/haste.md3"*/ -/*QUAKED rally_item_quad (.3 .3 1) (-16 -16 -16) (16 16 16) suspended -*/ +/*QUAKED rally_item_quad (.3 .3 1) (-16 -16 -16) (16 16 16) SUSPENDED +model="models/powerups/quad/quad.md3"*/ //ROADSIDE OBJECTS /*QUAKED rally_misc_cone (1 .5 0) (-6 -6 -7) (6 6 7) "model" selects skin type by path, random by default -*/ +model="models/mapobjects/cones/cone01.md3"*/ /*QUAKED rally_misc_pylon (1 .5 0) (-4 -4 0) (4 4 32) "model" selects skin type by path, random by default -*/ +model="models/mapobjects/pylons/pylon01.md3"*/ /*QUAKED rally_misc_barreloil (1 .5 0) (-8 -8 -13) (8 8 13) -*/ +model="models/mapobjects/barrels/b_oil.md3"*/ /*QUAKED rally_misc_barrelexp (1 .5 0) (-8 -8 -13) (8 8 13) -*/ +model="models/mapobjects/barrels/b_exp.md3"*/ /*QUAKED rally_misc_barrelbio (1 .5 0) (-8 -8 -13) (8 8 13) -*/ +model="models/mapobjects/barrels/b_bio.md3"*/ /*QUAKED rally_misc_barrelpoison (1 .5 0) (-8 -8 -13) (8 8 13) -*/ +model="models/mapobjects/barrels/b_psn.md3"*/ /*QUAKED rally_misc_barrelq3r (1 .5 0) (-8 -8 -13) (8 8 13) -*/ +model="models/mapobjects/barrels/b_q3r.md3"*/ /*QUAKED rally_misc_barrel311 (1 .5 0) (-8 -8 -13) (8 8 13) -*/ +model="models/mapobjects/barrels/b_311.md3"*/ /*QUAKED rally_misc_barreldef (1 .5 0) (-8 -8 -13) (8 8 13) -*/ +model="models/mapobjects/barrels/b_default.md3"*/ /*QUAKED rally_misc_barrel01 (1 .5 0) (-10 -10 -13) (10 10 13) -*/ +model="models/mapobjects/barrels/barrel01.md3"*/ /*QUAKED rally_misc_barrel02 (1 .5 0) (-10 -10 -13) (10 10 21) -*/ +model="models/mapobjects/barrels/barrel02.md3"*/ /*QUAKED rally_misc_barrel03 (1 .5 0) (-10 -10 -16) (10 10 18) -*/ +model="models/mapobjects/barrels/barrel03.md3"*/ //=============================================================================