]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'fruitiex/newpanelhud_stable' into fruitiex/newpanelhud
authorFruitieX <rasse@rasse-lappy.localdomain>
Wed, 16 Jun 2010 17:15:45 +0000 (20:15 +0300)
committerFruitieX <rasse@rasse-lappy.localdomain>
Wed, 16 Jun 2010 17:15:45 +0000 (20:15 +0300)
61 files changed:
defaultXonotic.cfg
gfx/hud/wickedhud/ammo_rocket.tga [new file with mode: 0644]
gfx/hud/wickedhud/border.tga
gfx/hud/wickedhud/border_chat.tga [new file with mode: 0644]
gfx/hud/wickedhud/border_healtharmor.tga
gfx/hud/wickedhud/border_inventory.tga
gfx/hud/wickedhud/border_modicons.tga
gfx/hud/wickedhud/border_powerups.tga
gfx/hud/wickedhud/border_radar.tga
gfx/hud/wickedhud/border_score.tga
gfx/hud/wickedhud/border_timer.tga
gfx/hud/wickedhud/border_vote.tga [new file with mode: 0644]
gfx/hud/wickedhud/border_weaponicons.tga
gfx/hud/wickedhud/flag_red_shielded.tga
gfx/hud/wickedhud/notify_camping.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_death.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_lava.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_selfkill.tga
gfx/hud/wickedhud/notify_slime.tga [new file with mode: 0644]
gfx/hud/wickedhud/notify_water.tga [new file with mode: 0644]
models/grass03.md3 [deleted file]
models/player/erebus.iqm [new file with mode: 0644]
models/player/erebus.iqm.framegroups [new file with mode: 0644]
models/player/erebus.iqm_0.tga [new file with mode: 0644]
models/player/erebus.iqm_0.txt [new file with mode: 0644]
models/player/nyx.iqm [new file with mode: 0644]
models/player/nyx.iqm.framegroups [new file with mode: 0644]
models/player/nyx.iqm_0.tga [new file with mode: 0644]
models/player/nyx.iqm_0.txt [new file with mode: 0644]
qcsrc/server/arena.qc
qcsrc/server/bot/bot.qc
qcsrc/server/cl_player.qc
qcsrc/server/vote.qc
scripts/tree.shader [new file with mode: 0644]
textures/e8support02c.tga [new file with mode: 0644]
textures/e8support02c_gloss.jpg [new file with mode: 0644]
textures/e8support02c_norm.tga [new file with mode: 0644]
textures/e8support02c_shirt.jpg [new file with mode: 0644]
textures/erebus.tga [new file with mode: 0644]
textures/erebus_gloss.tga [new file with mode: 0644]
textures/erebus_glow.tga [new file with mode: 0644]
textures/erebus_norm.tga [new file with mode: 0644]
textures/erebus_shirt.tga [new file with mode: 0644]
textures/grass2.tga [new file with mode: 0644]
textures/leaves6.tga [new file with mode: 0644]
textures/leaves7.tga [new file with mode: 0644]
textures/leaves7_norm.tga [new file with mode: 0644]
textures/nyx.tga [new file with mode: 0644]
textures/nyx_gloss.tga [new file with mode: 0644]
textures/nyx_glow.tga [new file with mode: 0644]
textures/nyx_norm.tga [new file with mode: 0644]
textures/nyx_shirt.tga [new file with mode: 0644]
textures/shadowhead.tga [new file with mode: 0644]
textures/shadowhead_gloss.tga [new file with mode: 0644]
textures/shadowhead_glow.tga [new file with mode: 0644]
textures/shadowhead_norm.tga [new file with mode: 0644]
textures/shadowhead_shirt.tga [new file with mode: 0644]
textures/uzi.tga
textures/uzi_norm.tga
textures/uzi_pants.tga
textures/uzi_shirt.tga [deleted file]

index 83574f60dc3633194a5d685bcb7b52d984fa5e8e..73a976122693cc6bbbe95801e4c8321fa081d488 100644 (file)
@@ -460,7 +460,7 @@ set bot_ai_aimskill_order_filter_5th 0.5 "Movement prediction filter. Used rarel
 set g_waypointeditor 0
 set bot_ignore_bots 0  "When set, bots don't shoot at other bots"
 set bot_join_empty 0   "When set, bots also play if no player has joined the server"
-set bot_vs_human 0     "Bots and humans play in different teams when set. positive values to make an all-bot blue team, set to negative values to make an all-bot red team, the absolute value is the ratio bots vs humans (1 for equal count)"
+set bot_vs_human 0     "Bots and humans play in different teams when set. positive values to make an all-bot blue team, set to negative values to make an all-bot red team, the absolute value is the ratio bots vs humans (1 for equal count). Changes will be correctly applied only from the next game"
 
 alias g_waypointeditor_spawn "impulse 103"
 alias g_waypointeditor_remove "impulse 104"
diff --git a/gfx/hud/wickedhud/ammo_rocket.tga b/gfx/hud/wickedhud/ammo_rocket.tga
new file mode 100644 (file)
index 0000000..c412659
Binary files /dev/null and b/gfx/hud/wickedhud/ammo_rocket.tga differ
index 4ec6c014242748272395ed0989a9a7f40ac17a6e..8ceee44525062106e8dcb827fd3fd664871977d5 100644 (file)
Binary files a/gfx/hud/wickedhud/border.tga and b/gfx/hud/wickedhud/border.tga differ
diff --git a/gfx/hud/wickedhud/border_chat.tga b/gfx/hud/wickedhud/border_chat.tga
new file mode 100644 (file)
index 0000000..1cd065e
Binary files /dev/null and b/gfx/hud/wickedhud/border_chat.tga differ
index 07b21fd052c14bb9fe204c50344dcfbbc5659a65..7109ab570cf95890d69f93e50548851f1be63c01 100644 (file)
Binary files a/gfx/hud/wickedhud/border_healtharmor.tga and b/gfx/hud/wickedhud/border_healtharmor.tga differ
index 5ed8e82fafe0d259d6a637049290c1e7d9eaad92..20ae8f604437175019f07d52a71d8b09415fe1e4 100644 (file)
Binary files a/gfx/hud/wickedhud/border_inventory.tga and b/gfx/hud/wickedhud/border_inventory.tga differ
index ef29279646dc60cc71cf3c9583ccc21e8e212cb5..5437b042e3991233e9645226a7435f53e47b3771 100644 (file)
Binary files a/gfx/hud/wickedhud/border_modicons.tga and b/gfx/hud/wickedhud/border_modicons.tga differ
index 9c0f258312b8fad99c2eee41d8591f9ccfefdff8..f8fbf4439e5e49e817df46cb8d55ceea9a10a3b8 100644 (file)
Binary files a/gfx/hud/wickedhud/border_powerups.tga and b/gfx/hud/wickedhud/border_powerups.tga differ
index 1ffd9c8d78957ecdaba0e446453d2756c2fffeb0..a300f5207d07d166c6caa9a9deb3daca1307975b 100644 (file)
Binary files a/gfx/hud/wickedhud/border_radar.tga and b/gfx/hud/wickedhud/border_radar.tga differ
index 1db70da92784fcd87aa4ae0d0c1549303ffacfcc..a4d8b6c47808974cf109d0689c2339968e62dd72 100644 (file)
Binary files a/gfx/hud/wickedhud/border_score.tga and b/gfx/hud/wickedhud/border_score.tga differ
index 5a81f00e2669c78fc58f974f47e98a664986bc5e..c657136fb0dd11ff2bb2fa7b8304890523dda58d 100644 (file)
Binary files a/gfx/hud/wickedhud/border_timer.tga and b/gfx/hud/wickedhud/border_timer.tga differ
diff --git a/gfx/hud/wickedhud/border_vote.tga b/gfx/hud/wickedhud/border_vote.tga
new file mode 100644 (file)
index 0000000..13b948e
Binary files /dev/null and b/gfx/hud/wickedhud/border_vote.tga differ
index 5f3bd3e858560564007e7eaed7cc07a977911370..08e8dcd7d204a961c1b85fb5566774952167af3b 100644 (file)
Binary files a/gfx/hud/wickedhud/border_weaponicons.tga and b/gfx/hud/wickedhud/border_weaponicons.tga differ
index d7c3aeae57482afe6f7da06f5c2966cf7f89d209..ed9994ac402c568a34afeed31b52f4a0c7e1dbcb 100644 (file)
Binary files a/gfx/hud/wickedhud/flag_red_shielded.tga and b/gfx/hud/wickedhud/flag_red_shielded.tga differ
diff --git a/gfx/hud/wickedhud/notify_camping.tga b/gfx/hud/wickedhud/notify_camping.tga
new file mode 100644 (file)
index 0000000..2766dd1
Binary files /dev/null and b/gfx/hud/wickedhud/notify_camping.tga differ
diff --git a/gfx/hud/wickedhud/notify_death.tga b/gfx/hud/wickedhud/notify_death.tga
new file mode 100644 (file)
index 0000000..d5e8045
Binary files /dev/null and b/gfx/hud/wickedhud/notify_death.tga differ
diff --git a/gfx/hud/wickedhud/notify_lava.tga b/gfx/hud/wickedhud/notify_lava.tga
new file mode 100644 (file)
index 0000000..3976e8b
Binary files /dev/null and b/gfx/hud/wickedhud/notify_lava.tga differ
index 6d714f91288090536623e8a62a042cdb8bdb8198..646a1a23814b5c07b5cab4679fae6e211cd3812f 100644 (file)
Binary files a/gfx/hud/wickedhud/notify_selfkill.tga and b/gfx/hud/wickedhud/notify_selfkill.tga differ
diff --git a/gfx/hud/wickedhud/notify_slime.tga b/gfx/hud/wickedhud/notify_slime.tga
new file mode 100644 (file)
index 0000000..c08a6a3
Binary files /dev/null and b/gfx/hud/wickedhud/notify_slime.tga differ
diff --git a/gfx/hud/wickedhud/notify_water.tga b/gfx/hud/wickedhud/notify_water.tga
new file mode 100644 (file)
index 0000000..8315f12
Binary files /dev/null and b/gfx/hud/wickedhud/notify_water.tga differ
diff --git a/models/grass03.md3 b/models/grass03.md3
deleted file mode 100644 (file)
index c96e60c..0000000
Binary files a/models/grass03.md3 and /dev/null differ
diff --git a/models/player/erebus.iqm b/models/player/erebus.iqm
new file mode 100644 (file)
index 0000000..28a3c07
Binary files /dev/null and b/models/player/erebus.iqm differ
diff --git a/models/player/erebus.iqm.framegroups b/models/player/erebus.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/erebus.iqm_0.tga b/models/player/erebus.iqm_0.tga
new file mode 100644 (file)
index 0000000..ee7fb58
Binary files /dev/null and b/models/player/erebus.iqm_0.tga differ
diff --git a/models/player/erebus.iqm_0.txt b/models/player/erebus.iqm_0.txt
new file mode 100644 (file)
index 0000000..ac81e7e
--- /dev/null
@@ -0,0 +1,7 @@
+name Erebus
+species human
+sex Male
+weight 105
+age 26
+
+Heavyweight Xonotic Solider
diff --git a/models/player/nyx.iqm b/models/player/nyx.iqm
new file mode 100644 (file)
index 0000000..85cc5f5
Binary files /dev/null and b/models/player/nyx.iqm differ
diff --git a/models/player/nyx.iqm.framegroups b/models/player/nyx.iqm.framegroups
new file mode 100644 (file)
index 0000000..71128c6
--- /dev/null
@@ -0,0 +1,23 @@
+0 36 15.000000 0 // dieone
+36 20 15.000000 0 // dietwo
+56 15 15.000000 1 // draw
+71 20 15.000000 1 // duck
+91 21 30.000000 1 // duckwalk
+112 16 15.000000 0 // duckjump
+128 15 5.000000 1 // duckidle
+143 41 5.000000 1 // idle
+184 21 25.000000 0 // jump
+205 15 15.000000 0 // painone
+220 17 15.000000 0 // paintwo
+237 3 15.000000 1 // shoot
+240 21 15.000000 1 // taunt
+261 21 35.000000 1 // run
+282 21 35.000000 1 // runbackwards
+303 21 35.000000 1 // strafeleft
+324 21 35.000000 1 // straferight
+345 2 15.000000 0 // deadone
+347 2 15.000000 0 // deadtwo
+349 21 35.000000 1 // forwardright
+370 21 35.000000 1 // forwardleft
+391 21 35.000000 1 // backright
+412 21 30.000000 1 // backleft
diff --git a/models/player/nyx.iqm_0.tga b/models/player/nyx.iqm_0.tga
new file mode 100644 (file)
index 0000000..da5cbe7
Binary files /dev/null and b/models/player/nyx.iqm_0.tga differ
diff --git a/models/player/nyx.iqm_0.txt b/models/player/nyx.iqm_0.txt
new file mode 100644 (file)
index 0000000..9fb92f6
--- /dev/null
@@ -0,0 +1,7 @@
+name Nyx
+species human
+sex Female
+weight 100
+age 24
+
+Heavyweight Xonotic Soldier
index 5dd01d4ddf58a18aafc5404bcce1045710658f0b..e68e295022f29ecfe2ef3e579f47caded8ecfdf8 100644 (file)
@@ -11,6 +11,7 @@ entity champion;
 float warmup;
 float allowed_to_spawn;
 float player_cnt;
+float required_ca_players;
 .float caplayer;
 
 void PutObserverInServer();
@@ -43,7 +44,7 @@ void reset_map(float dorespawn)
        lms_next_place = player_count;
 
        race_ReadyRestart();
-       
+
        for(self = world; (self = nextent(self)); )
        if(clienttype(self) == CLIENTTYPE_NOTACLIENT)
        {
@@ -198,7 +199,7 @@ void Arena_Warmup()
 
        allowed_to_spawn = 0;
 
-       if(g_ca && (player_cnt < 2 || inWarmupStage))
+       if(g_ca && (player_cnt < required_ca_players || inWarmupStage))
                allowed_to_spawn = 1;
 
        msg = NEWLINES;
@@ -280,13 +281,15 @@ void Spawnqueue_Check()
                        }
                }
 
-               if(player_cnt < 2 && (redspawned && bluespawned)) {
+               required_ca_players = max(2, fabs(cvar("bot_vs_human") + 1));
+
+               if(player_cnt < required_ca_players && (redspawned && bluespawned)) {
                        reset_map(TRUE);
                }
-               else if(player_cnt < 2) {
+               else if(player_cnt < required_ca_players) {
                        FOR_EACH_CLIENT(self) 
                        if(self.classname == "player")
-                               centerprint(self, strcat("^1Need at least 2 players to play CA", "^7\n"));
+                               centerprint(self, strcat("^1Need at least 1 player in each team to play CA", "^7\n"));
 
                        allowed_to_spawn = 1;
                        return;
index 44ece52bfd9c66cd2caf0d67af3ce2c4c0256d4e..940782c8239d9538f474405d87d7b21f967dc447 100644 (file)
@@ -544,7 +544,7 @@ void bot_serverframe()
 
        FOR_EACH_REALCLIENT(head)
        {
-               if(head.classname == "player" || g_lms || g_arena)
+               if(head.classname == "player" || g_lms || g_arena || g_ca)
                        ++activerealplayers;
                ++realplayers;
        }
index b3f0e3ee5aac7fd72f57ea2a4b9e3c5eb570519f..3911ffecb89a5db3921992c8f729f91808f08dfa 100644 (file)
@@ -433,7 +433,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, float deatht
        else
                Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker);
 
-       if((g_arena && numspawned < 2) || (g_ca && player_cnt < 2) && !inWarmupStage)
+       if((g_arena && numspawned < 2) || (g_ca && player_cnt < required_ca_players) && !inWarmupStage)
                return;
 
        if (!g_minstagib)
index 9a377f9e8565eb2e183eacd78fd0e0b1a21a7f4e..338d98476b38b2a685cfd71ce2b396d827e204b5 100644 (file)
@@ -162,7 +162,7 @@ float GameCommand_Vote(string s, entity e) {
                                                print_to(e, "^1Your vote is empty. See 'vhelp' for more info.");
                                        } else if(e
                                                && time < e.vote_next) {
-                                                       print_to(e, strcat("^1You have to wait ^2", ftos(e.vote_next - time), "^1 seconds before you can again call a vote."));
+                                                       print_to(e, strcat("^1You have to wait ^2", ftos(ceil(e.vote_next - time)), "^1 seconds before you can again call a vote."));
                                        } else if(VoteCheckNasty(vote)) {
                                                print_to(e, "Syntax error in command. See 'vhelp' for more info.");
                                        } else if(RemapVote(vote, "vcall", e)) {
diff --git a/scripts/tree.shader b/scripts/tree.shader
new file mode 100644 (file)
index 0000000..2b3c2b8
--- /dev/null
@@ -0,0 +1,62 @@
+morph/leaves3
+{
+cull none
+       qer_editorimage leaves6.tga
+       qer_trans 0.6
+       surfaceparm trans
+//     surfaceparm nolightmap
+       surfaceparm alphashadow
+       deformVertexes autosprite
+       q3map_vertexScale 1
+       deformVertexes wave 128 sin 0 1 0 0.4 
+       {
+               map leaves6.tga
+               alphaFunc GT0
+               rgbGen vertex
+       }
+}
+
+grass02
+{
+       distancecull 256 1024 0.4
+       cull none
+       qer_editorimage grass2.tga
+       qer_trans 0.2
+       surfaceparm nolightmap
+       surfaceparm trans
+       q3map_vertexScale 1
+       deformVertexes autosprite
+       deformVertexes wave 128 sin 0 1 0 0.1 
+       {
+               map grass2.tga
+               alphaFunc GT0
+               rgbGen vertex
+       }
+}
+
+leaves4
+{
+cull none
+       qer_editorimage leaves7.tga
+       qer_trans 0.6
+       deformVertexes autosprite
+       surfaceparm nolightmap
+       surfaceparm trans
+       q3map_vertexScale 1
+       deformVertexes wave 128 sin 0 1 0 0.5
+       {
+               map leaves7.tga
+               alphaFunc GT0
+               rgbGen vertex
+       }
+}
+
+e8teamcolor
+       {
+       qer_editorimage morphed/e8support02c_shirt.jpg
+       map morphed/e8support02c.tga
+               {
+               map $lightmap
+               rgbGen identity
+               }
+       }
diff --git a/textures/e8support02c.tga b/textures/e8support02c.tga
new file mode 100644 (file)
index 0000000..7dc7a0d
Binary files /dev/null and b/textures/e8support02c.tga differ
diff --git a/textures/e8support02c_gloss.jpg b/textures/e8support02c_gloss.jpg
new file mode 100644 (file)
index 0000000..7521315
Binary files /dev/null and b/textures/e8support02c_gloss.jpg differ
diff --git a/textures/e8support02c_norm.tga b/textures/e8support02c_norm.tga
new file mode 100644 (file)
index 0000000..5200aaa
Binary files /dev/null and b/textures/e8support02c_norm.tga differ
diff --git a/textures/e8support02c_shirt.jpg b/textures/e8support02c_shirt.jpg
new file mode 100644 (file)
index 0000000..d3a28d9
Binary files /dev/null and b/textures/e8support02c_shirt.jpg differ
diff --git a/textures/erebus.tga b/textures/erebus.tga
new file mode 100644 (file)
index 0000000..5a470f6
Binary files /dev/null and b/textures/erebus.tga differ
diff --git a/textures/erebus_gloss.tga b/textures/erebus_gloss.tga
new file mode 100644 (file)
index 0000000..992af75
Binary files /dev/null and b/textures/erebus_gloss.tga differ
diff --git a/textures/erebus_glow.tga b/textures/erebus_glow.tga
new file mode 100644 (file)
index 0000000..561e995
Binary files /dev/null and b/textures/erebus_glow.tga differ
diff --git a/textures/erebus_norm.tga b/textures/erebus_norm.tga
new file mode 100644 (file)
index 0000000..007228b
Binary files /dev/null and b/textures/erebus_norm.tga differ
diff --git a/textures/erebus_shirt.tga b/textures/erebus_shirt.tga
new file mode 100644 (file)
index 0000000..364bae2
Binary files /dev/null and b/textures/erebus_shirt.tga differ
diff --git a/textures/grass2.tga b/textures/grass2.tga
new file mode 100644 (file)
index 0000000..f0ea62a
Binary files /dev/null and b/textures/grass2.tga differ
diff --git a/textures/leaves6.tga b/textures/leaves6.tga
new file mode 100644 (file)
index 0000000..6110f38
Binary files /dev/null and b/textures/leaves6.tga differ
diff --git a/textures/leaves7.tga b/textures/leaves7.tga
new file mode 100644 (file)
index 0000000..e3a81b1
Binary files /dev/null and b/textures/leaves7.tga differ
diff --git a/textures/leaves7_norm.tga b/textures/leaves7_norm.tga
new file mode 100644 (file)
index 0000000..46d8bca
Binary files /dev/null and b/textures/leaves7_norm.tga differ
diff --git a/textures/nyx.tga b/textures/nyx.tga
new file mode 100644 (file)
index 0000000..8169f37
Binary files /dev/null and b/textures/nyx.tga differ
diff --git a/textures/nyx_gloss.tga b/textures/nyx_gloss.tga
new file mode 100644 (file)
index 0000000..6b53f91
Binary files /dev/null and b/textures/nyx_gloss.tga differ
diff --git a/textures/nyx_glow.tga b/textures/nyx_glow.tga
new file mode 100644 (file)
index 0000000..b283553
Binary files /dev/null and b/textures/nyx_glow.tga differ
diff --git a/textures/nyx_norm.tga b/textures/nyx_norm.tga
new file mode 100644 (file)
index 0000000..a27d974
Binary files /dev/null and b/textures/nyx_norm.tga differ
diff --git a/textures/nyx_shirt.tga b/textures/nyx_shirt.tga
new file mode 100644 (file)
index 0000000..364bae2
Binary files /dev/null and b/textures/nyx_shirt.tga differ
diff --git a/textures/shadowhead.tga b/textures/shadowhead.tga
new file mode 100644 (file)
index 0000000..29893e2
Binary files /dev/null and b/textures/shadowhead.tga differ
diff --git a/textures/shadowhead_gloss.tga b/textures/shadowhead_gloss.tga
new file mode 100644 (file)
index 0000000..2abb3f0
Binary files /dev/null and b/textures/shadowhead_gloss.tga differ
diff --git a/textures/shadowhead_glow.tga b/textures/shadowhead_glow.tga
new file mode 100644 (file)
index 0000000..1e69d82
Binary files /dev/null and b/textures/shadowhead_glow.tga differ
diff --git a/textures/shadowhead_norm.tga b/textures/shadowhead_norm.tga
new file mode 100644 (file)
index 0000000..19dd82c
Binary files /dev/null and b/textures/shadowhead_norm.tga differ
diff --git a/textures/shadowhead_shirt.tga b/textures/shadowhead_shirt.tga
new file mode 100644 (file)
index 0000000..aa1f645
Binary files /dev/null and b/textures/shadowhead_shirt.tga differ
index ecd2637266aa034223560efef952c7b0ade64555..45f2d9bf79db2a5cd12418a32c1300dc18f0af3e 100644 (file)
Binary files a/textures/uzi.tga and b/textures/uzi.tga differ
index 574490877779c7f5fcc2716865a2724288a89968..8df77a4da1bc10cb8d9bf105f2087222ed63f38e 100644 (file)
Binary files a/textures/uzi_norm.tga and b/textures/uzi_norm.tga differ
index 82d1ca29ce821e6f2e636d2e1fbe89bfd700f000..62f6659ed81d4ba362fd6bcc3348b5e96dcc2fa8 100644 (file)
Binary files a/textures/uzi_pants.tga and b/textures/uzi_pants.tga differ
diff --git a/textures/uzi_shirt.tga b/textures/uzi_shirt.tga
deleted file mode 100644 (file)
index 4123247..0000000
Binary files a/textures/uzi_shirt.tga and /dev/null differ