]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'refs/remotes/origin/mirceakitsune/highres_weapon_textures'
authorRudolf Polzer <divverent@alientrap.org>
Wed, 23 Jun 2010 08:31:48 +0000 (10:31 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 23 Jun 2010 08:31:48 +0000 (10:31 +0200)
33 files changed:
textures/campingrifle.tga
textures/campingrifle_bump.tga
textures/campingrifle_gloss.tga
textures/electro.tga
textures/electro_gloss.tga
textures/electro_glow.tga
textures/electro_norm.tga
textures/electro_pants.tga
textures/glauncher.tga
textures/glauncher_gloss.tga
textures/glauncher_norm.tga
textures/glauncher_pants.tga
textures/glauncher_shirt.tga
textures/hagar2.tga
textures/hagar2_gloss.tga
textures/hagar2_glow.tga
textures/hagar2_norm.tga
textures/hagar2_pants.tga
textures/hagar2_shirt.tga
textures/hlac_body.tga
textures/hlac_body_gloss.tga
textures/hlac_body_norm.tga
textures/hlac_body_pants.tga
textures/hlac_body_shirt.tga
textures/hookgun.tga
textures/hookgun_gloss.tga
textures/hookgun_norm.tga
textures/hookgun_pants.tga
textures/shotgun2.tga
textures/shotgun2_gloss.tga
textures/shotgun2_glow.tga
textures/shotgun2_norm.tga
textures/shotgun2_shirt.tga

index b707d7f583c8975b60a639d0a53be418ff2de2b4..6d719e6bcf91efe4d7d2a8013334d8182ff3a0bf 100644 (file)
Binary files a/textures/campingrifle.tga and b/textures/campingrifle.tga differ
index b319739c930af84fa541b686c6ffbf66a6ece894..28bd453d6d3351d405fd6010033094c11926e7fd 100644 (file)
Binary files a/textures/campingrifle_bump.tga and b/textures/campingrifle_bump.tga differ
index 0e0156ecdae297b4c1fa5687808dbbbf327161e4..7f4b0326dd1399d83b4246ab7c63b0c7c4504f9b 100644 (file)
Binary files a/textures/campingrifle_gloss.tga and b/textures/campingrifle_gloss.tga differ
index d6f1f8b0e024895561fd1bfe065749a252862334..1fe74b161d971d7c2077766f8408139f32be58ef 100644 (file)
Binary files a/textures/electro.tga and b/textures/electro.tga differ
index d5f259281391311595a9c5907502d2b2daa3efa7..d506dcbb0ad164e50b1afa46d1ab82ac5510c5b0 100644 (file)
Binary files a/textures/electro_gloss.tga and b/textures/electro_gloss.tga differ
index 085f0b069d5acabd35f95c06d41997e66eca300c..91736effd5bc035d29967a7d367dd015d55ce784 100644 (file)
Binary files a/textures/electro_glow.tga and b/textures/electro_glow.tga differ
index 54718a6bbda61ffc1e2d8e5d86904889f9d46b90..019abc9ce038b427eda1f71031553806a002b167 100644 (file)
Binary files a/textures/electro_norm.tga and b/textures/electro_norm.tga differ
index 9454d81a532adbc667da3ea1af902bc93cf8eb6c..b8e70848b29e232d91567a59e56ed5f0e6456b77 100644 (file)
Binary files a/textures/electro_pants.tga and b/textures/electro_pants.tga differ
index a68b0fe80c6f362b9f46b2b1e2b897f7b64bcde5..12a331a952ebf5ed2a91430bbda4dc6aa087feba 100644 (file)
Binary files a/textures/glauncher.tga and b/textures/glauncher.tga differ
index 5d9abed0feca9a1df14b2b494fc537c86db360cb..c6add3e6072f7e99e00ccf39f1a3f00d44acafc4 100644 (file)
Binary files a/textures/glauncher_gloss.tga and b/textures/glauncher_gloss.tga differ
index d8131da38accc93b9661593f145857d9a9dcadf3..910eaa1e7210a444e95db474662612e81e922be0 100644 (file)
Binary files a/textures/glauncher_norm.tga and b/textures/glauncher_norm.tga differ
index f750e1d1975f0c6c9717c2271bfa90370de403a9..1f3957e1e2ecc77b4ba4d575d27e0513d7e67ace 100644 (file)
Binary files a/textures/glauncher_pants.tga and b/textures/glauncher_pants.tga differ
index bb8be51b69c5d85895f0b2de9b2a36ffafcd2f49..853e50b69fd29ec75e0c1110324b59d51a3154af 100644 (file)
Binary files a/textures/glauncher_shirt.tga and b/textures/glauncher_shirt.tga differ
index 1a878799d3e8a6d60b8d4993d4a8206ee6b1926a..2b77dd918ec3b9e572f72ff99861a600a79e9f0a 100644 (file)
Binary files a/textures/hagar2.tga and b/textures/hagar2.tga differ
index 7b7d86d6efae3db77af7a864aaad3d51aff6aa29..f4f597a4a004eb04abb677db0e7695048079eb7c 100644 (file)
Binary files a/textures/hagar2_gloss.tga and b/textures/hagar2_gloss.tga differ
index 48f29bf98d86933f061b4a4881ccbae5fc9027ae..9fff206a2252d8dd5b4659f5487a9794384e55bc 100644 (file)
Binary files a/textures/hagar2_glow.tga and b/textures/hagar2_glow.tga differ
index 27178fd4573fb13505881d7bcdd79e3be4337808..145509deb05f62ae567281f98be1f3e55ae36e17 100644 (file)
Binary files a/textures/hagar2_norm.tga and b/textures/hagar2_norm.tga differ
index 44e4bec4fc19a0b15d7917f99b03b4909699cadf..5992dbf962be2b89364f4240b1f6be12857883fc 100644 (file)
Binary files a/textures/hagar2_pants.tga and b/textures/hagar2_pants.tga differ
index b6700dd82639f115ffa0eff132a566087a3669a8..4527f7e31acc1f1fab4ca3dd3f5f61927b114835 100644 (file)
Binary files a/textures/hagar2_shirt.tga and b/textures/hagar2_shirt.tga differ
index 49d17bb4f4c60943f644374cba4989e9f9980f85..c4c6882a20a117012d1f9fd353d361fc01332c1f 100644 (file)
Binary files a/textures/hlac_body.tga and b/textures/hlac_body.tga differ
index b362c1d13c609b011bb386283e976ab2c1581eb5..b1b517bdaeffbcf3b84787b2cd841852d08ed7f8 100644 (file)
Binary files a/textures/hlac_body_gloss.tga and b/textures/hlac_body_gloss.tga differ
index 5387a5d39be149bdd20c7762d33d25d51fe4b600..fb22b9e8363d26a9275756aed2687d79872f1287 100644 (file)
Binary files a/textures/hlac_body_norm.tga and b/textures/hlac_body_norm.tga differ
index b9ff4f1f6718e93da344a2c4b24e32974c5bd68b..32ee034605b015e575aa0cf4e19e796606611e97 100644 (file)
Binary files a/textures/hlac_body_pants.tga and b/textures/hlac_body_pants.tga differ
index 637c977110e5b08ca985d1c6c14c14350d875892..c3bddd150d9ce505f1a8c36003d1e8a6b7b0bc02 100644 (file)
Binary files a/textures/hlac_body_shirt.tga and b/textures/hlac_body_shirt.tga differ
index 5e4f8f291ff2b1d82f6f074baff807fbfcc4477b..aa65f2f555e0e6d97156794ef4941dceb604241c 100644 (file)
Binary files a/textures/hookgun.tga and b/textures/hookgun.tga differ
index ba1b5edcd085c64b098076434d4dde37acc8ba98..484c2c58cb07707c07a077da19129719a98dc306 100644 (file)
Binary files a/textures/hookgun_gloss.tga and b/textures/hookgun_gloss.tga differ
index 33ec9de397625ec5ef35e1ce88ab18a9ae2c365b..625d4771555e829efece1ea15f377370775f1fd5 100644 (file)
Binary files a/textures/hookgun_norm.tga and b/textures/hookgun_norm.tga differ
index 4091e9d6804e88d9c79128dd3d43ae8a1829eac2..327822d4ef625e2b984a4eeafbe187de7cec5b55 100644 (file)
Binary files a/textures/hookgun_pants.tga and b/textures/hookgun_pants.tga differ
index 55e561a10210fcf8ecfff190bfc5ecda746727b0..cdfd47d42719c02312f54dc43b1b672dce1cd2b8 100644 (file)
Binary files a/textures/shotgun2.tga and b/textures/shotgun2.tga differ
index ef85807342a997b9cd34ce7968d666eb26b81e35..78fdd3167b88c5c890947ee51a6823029e689a3a 100644 (file)
Binary files a/textures/shotgun2_gloss.tga and b/textures/shotgun2_gloss.tga differ
index 16f6b002fa361cb51d6ec4c3afa8f991347c4f28..863f3830b5588939a962f1fbccb5c12cb27b74c7 100644 (file)
Binary files a/textures/shotgun2_glow.tga and b/textures/shotgun2_glow.tga differ
index cff6611f339e874526bcc3a3005442d2f0fc132f..100b3a4ac83f53919cd32de9ba134a7d2ab319db 100644 (file)
Binary files a/textures/shotgun2_norm.tga and b/textures/shotgun2_norm.tga differ
index ea9a7d86d7f36da0f807eed5b04567966df3bdee..442ced63a698906dbc6a1590aefc4e1fda8f98d4 100644 (file)
Binary files a/textures/shotgun2_shirt.tga and b/textures/shotgun2_shirt.tga differ