From: Jakob MG Date: Sun, 26 Sep 2010 14:59:40 +0000 (+0200) Subject: Atlas armour textures to 2048x1024, make models use them. remove old models and chang... X-Git-Tag: xonotic-v0.1.0preview~310^2~7^2~1^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3c98c0fc5d168740f8fb21e3f6d54820efc5f894;p=xonotic%2Fxonotic-data.pk3dir.git Atlas armour textures to 2048x1024, make models use them. remove old models and change code to match new names. --- diff --git a/models/items/armor_chest.tga b/models/items/armor_chest.tga deleted file mode 100644 index 9341fabd0..000000000 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 index 49ae23aca..000000000 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 index 16a855a33..000000000 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 index e7df20c5f..000000000 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 index 6a794b299..000000000 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 index 080b81224..000000000 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 index f583f17fb..000000000 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 index 8e50654a7..000000000 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 index 70e86f41d..000000000 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 index e455f77df..000000000 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 index 2f92702df..000000000 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 index 0f104c8f7..000000000 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 index 28a8e7be8..000000000 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 index 93d8bdb12..000000000 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 index b5ad78d9e..000000000 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 index 7c3be8023..000000000 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 b5ad78d9e..f7ac71e38 100644 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 93d8bdb12..8be97a7ef 100644 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 7c3be8023..acc90eba8 100644 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 28a8e7be8..f92744a16 100644 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 c2b2deb87..beed37321 100644 --- 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) {