Atlas armour textures to 2048x1024, make models use them. remove old models and chang...

diff --git a/models/items/armor_chest.tga b/models/items/armor_chest.tga
deleted file mode 100644 (file)
index 9341fab..0000000
Binary files a/models/items/armor_chest.tga and /dev/null differ

diff --git a/models/items/armor_chest_gloss.tga b/models/items/armor_chest_gloss.tga
deleted file mode 100644 (file)
index 49ae23a..0000000
Binary files a/models/items/armor_chest_gloss.tga and /dev/null differ

diff --git a/models/items/armor_chest_glow.tga b/models/items/armor_chest_glow.tga
deleted file mode 100644 (file)
index 16a855a..0000000
Binary files a/models/items/armor_chest_glow.tga and /dev/null differ

diff --git a/models/items/armor_chest_norm.tga b/models/items/armor_chest_norm.tga
deleted file mode 100644 (file)
index e7df20c..0000000
Binary files a/models/items/armor_chest_norm.tga and /dev/null differ

diff --git a/models/items/armor_head.tga b/models/items/armor_head.tga
deleted file mode 100644 (file)
index 6a794b2..0000000
Binary files a/models/items/armor_head.tga and /dev/null differ

diff --git a/models/items/armor_head_gloss.tga b/models/items/armor_head_gloss.tga
deleted file mode 100644 (file)
index 080b812..0000000
Binary files a/models/items/armor_head_gloss.tga and /dev/null differ

diff --git a/models/items/armor_head_glow.tga b/models/items/armor_head_glow.tga
deleted file mode 100644 (file)
index f583f17..0000000
Binary files a/models/items/armor_head_glow.tga and /dev/null differ

diff --git a/models/items/armor_head_norm.tga b/models/items/armor_head_norm.tga
deleted file mode 100644 (file)
index 8e50654..0000000
Binary files a/models/items/armor_head_norm.tga and /dev/null differ

diff --git a/models/items/armor_shoulder.tga b/models/items/armor_shoulder.tga
deleted file mode 100644 (file)
index 70e86f4..0000000
Binary files a/models/items/armor_shoulder.tga and /dev/null differ

diff --git a/models/items/armor_shoulder_gloss.tga b/models/items/armor_shoulder_gloss.tga
deleted file mode 100644 (file)
index e455f77..0000000
Binary files a/models/items/armor_shoulder_gloss.tga and /dev/null differ

diff --git a/models/items/armor_shoulder_glow.tga b/models/items/armor_shoulder_glow.tga
deleted file mode 100644 (file)
index 2f92702..0000000
Binary files a/models/items/armor_shoulder_glow.tga and /dev/null differ

diff --git a/models/items/armor_shoulder_norm.tga b/models/items/armor_shoulder_norm.tga
deleted file mode 100644 (file)
index 0f104c8..0000000
Binary files a/models/items/armor_shoulder_norm.tga and /dev/null differ

diff --git a/models/items/g_a1.md3 b/models/items/g_a1.md3
deleted file mode 100644 (file)
index 28a8e7b..0000000
Binary files a/models/items/g_a1.md3 and /dev/null differ

diff --git a/models/items/g_a25.md3 b/models/items/g_a25.md3
deleted file mode 100644 (file)
index 93d8bdb..0000000
Binary files a/models/items/g_a25.md3 and /dev/null differ

diff --git a/models/items/g_a50.md3 b/models/items/g_a50.md3
deleted file mode 100644 (file)
index b5ad78d..0000000
Binary files a/models/items/g_a50.md3 and /dev/null differ

diff --git a/models/items/g_armormedium.md3 b/models/items/g_armormedium.md3
deleted file mode 100644 (file)
index 7c3be80..0000000
Binary files a/models/items/g_armormedium.md3 and /dev/null differ

diff --git a/models/items/item_armor_big.md3 b/models/items/item_armor_big.md3
index b5ad78d9e5ddf10a454427dbf65bfc72dddcb0c5..f7ac71e38d0de2f6910f446b24a1b2c6772d7a22 100644 (file)
Binary files a/models/items/item_armor_big.md3 and b/models/items/item_armor_big.md3 differ

diff --git a/models/items/item_armor_large.md3 b/models/items/item_armor_large.md3
index 93d8bdb126fd568165d8852728d123dc0771ab25..8be97a7ef95e1273e68739deb22f5b2cfad6946d 100644 (file)
Binary files a/models/items/item_armor_large.md3 and b/models/items/item_armor_large.md3 differ

diff --git a/models/items/item_armor_medium.md3 b/models/items/item_armor_medium.md3
index 7c3be802307e7f90b084de478c1d1c2041682f4e..acc90eba8caace78caae91a4e11c63286a394d5c 100644 (file)
Binary files a/models/items/item_armor_medium.md3 and b/models/items/item_armor_medium.md3 differ

diff --git a/models/items/item_armor_small.md3 b/models/items/item_armor_small.md3
index 28a8e7be8f732779e1b1fb95f53c0db5e459e592..f92744a16278c0b0294d1e20e258c95f9e7ba407 100644 (file)
Binary files a/models/items/item_armor_small.md3 and b/models/items/item_armor_small.md3 differ

diff --git a/qcsrc/server/t_items.qc b/qcsrc/server/t_items.qc
index c2b2deb8713cc919e32c450f30b3ebfdb009dc62..beed37321c40bc6d6ec3026577510a9c75874f8d 100644 (file)
--- a/qcsrc/server/t_items.qc
+++ b/qcsrc/server/t_items.qc
@@ -1197,7 +1197,7 @@ void spawnfunc_item_armor_small (void) {
                self.max_armorvalue = g_pickup_armorsmall_max;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_armorsmall_anyway;
-       StartItem ("models/items/g_a1.md3", "misc/armor1.wav", g_pickup_respawntime_short, g_pickup_respawntimejitter_short, "5 Armor", IT_ARMOR_SHARD, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW);
+       StartItem ("models/items/item_armor_small.md3", "misc/armor1.wav", g_pickup_respawntime_short, g_pickup_respawntimejitter_short, "5 Armor", IT_ARMOR_SHARD, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_LOW);
 }
 
 void spawnfunc_item_armor_medium (void) {
@@ -1207,7 +1207,7 @@ void spawnfunc_item_armor_medium (void) {
                self.max_armorvalue = g_pickup_armormedium_max;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_armormedium_anyway;
-       StartItem ("models/items/g_armormedium.md3", "misc/armor10.wav", g_pickup_respawntime_medium, g_pickup_respawntimejitter_medium, "25 Armor", IT_ARMOR, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_MID);
+       StartItem ("models/items/item_armor_medium.md3", "misc/armor10.wav", g_pickup_respawntime_medium, g_pickup_respawntimejitter_medium, "25 Armor", IT_ARMOR, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_MID);
 }
 
 void spawnfunc_item_armor_big (void) {
@@ -1217,7 +1217,7 @@ void spawnfunc_item_armor_big (void) {
                self.max_armorvalue = g_pickup_armorbig_max;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_armorbig_anyway;
-       StartItem ("models/items/g_a50.md3", "misc/armor17_5.wav", g_pickup_respawntime_long, g_pickup_respawntimejitter_long, "50 Armor", IT_ARMOR, 0, 0, commodity_pickupevalfunc, 20000);
+       StartItem ("models/items/item_armor_big.md3", "misc/armor17_5.wav", g_pickup_respawntime_long, g_pickup_respawntimejitter_long, "50 Armor", IT_ARMOR, 0, 0, commodity_pickupevalfunc, 20000);
 }
 
 void spawnfunc_item_armor_large (void) {
@@ -1227,7 +1227,7 @@ void spawnfunc_item_armor_large (void) {
                self.max_armorvalue = g_pickup_armorlarge_max;
        if(!self.pickup_anyway)
                self.pickup_anyway = g_pickup_armorlarge_anyway;
-       StartItem ("models/items/g_a25.md3", "misc/armor25.wav", g_pickup_respawntime_long, g_pickup_respawntimejitter_long, "100 Armor", IT_ARMOR, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_HIGH);
+       StartItem ("models/items/item_armor_large.md3", "misc/armor25.wav", g_pickup_respawntime_long, g_pickup_respawntimejitter_long, "100 Armor", IT_ARMOR, 0, 0, commodity_pickupevalfunc, BOT_PICKUP_RATING_HIGH);
 }
 
 void spawnfunc_item_health_small (void) {