[nexuiz-commits] r7661 - in branches/nexuiz-2.0: . data/gfx/menu/wickedz data/models/player misc/mediasource/menuskins/wickedz/background_builder
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sun Sep 6 07:14:56 EDT 2009
Author: div0
Date: 2009-09-06 07:14:56 -0400 (Sun, 06 Sep 2009)
New Revision: 7661
Added:
branches/nexuiz-2.0/misc/mediasource/menuskins/wickedz/background_builder/background_l2.tga
Removed:
branches/nexuiz-2.0/data/gfx/menu/wickedz/background_ingame_l3.tga
Modified:
branches/nexuiz-2.0/.patchsets
branches/nexuiz-2.0/data/gfx/menu/wickedz/skinvalues.txt
branches/nexuiz-2.0/data/models/player/carni.txt
branches/nexuiz-2.0/data/models/player/carniarmor.txt
branches/nexuiz-2.0/data/models/player/fricka.txt
branches/nexuiz-2.0/data/models/player/grunt.txt
branches/nexuiz-2.0/data/models/player/headhunter.txt
branches/nexuiz-2.0/data/models/player/heroine.txt
branches/nexuiz-2.0/data/models/player/insurrectionist.txt
branches/nexuiz-2.0/data/models/player/lurk.txt
branches/nexuiz-2.0/data/models/player/lycanthrope.txt
branches/nexuiz-2.0/data/models/player/marine.txt
branches/nexuiz-2.0/data/models/player/mulder.txt
branches/nexuiz-2.0/data/models/player/nexus.txt
branches/nexuiz-2.0/data/models/player/pyria.txt
branches/nexuiz-2.0/data/models/player/quark.txt
branches/nexuiz-2.0/data/models/player/reptile.txt
branches/nexuiz-2.0/data/models/player/shock.txt
branches/nexuiz-2.0/data/models/player/skadi.txt
branches/nexuiz-2.0/data/models/player/specop.txt
branches/nexuiz-2.0/data/models/player/xolar.txt
branches/nexuiz-2.0/misc/mediasource/menuskins/wickedz/background_builder/append.sh
Log:
r7651 | div0 | 2009-09-05 15:59:12 -0400 (Sat, 05 Sep 2009) | 2 lines
remove the stupid ingame bottom left image
r7658 | div0 | 2009-09-06 07:04:27 -0400 (Sun, 06 Sep 2009) | 2 lines
lbs -> kg AHAHAHAHAH))
r7660 | div0 | 2009-09-06 07:12:41 -0400 (Sun, 06 Sep 2009) | 2 lines
background builder: fix background_l2
Modified: branches/nexuiz-2.0/.patchsets
===================================================================
--- branches/nexuiz-2.0/.patchsets 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/.patchsets 2009-09-06 11:14:56 UTC (rev 7661)
@@ -1,2 +1,2 @@
master = svn://svn.icculus.org/nexuiz/trunk
-revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7601-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7644-7650
+revisions_applied = 1-7563,7565-7586,7589-7589,7592-7592,7595-7595,7597-7597,7601-7602,7605-7610,7612-7615,7619-7620,7623-7623,7626-7628,7644-7651,7658-7660
Deleted: branches/nexuiz-2.0/data/gfx/menu/wickedz/background_ingame_l3.tga
===================================================================
(Binary files differ)
Modified: branches/nexuiz-2.0/data/gfx/menu/wickedz/skinvalues.txt
===================================================================
--- branches/nexuiz-2.0/data/gfx/menu/wickedz/skinvalues.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/gfx/menu/wickedz/skinvalues.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -65,7 +65,7 @@
// uses "background" images
// uses "background_ingame" images
ALIGN_BACKGROUND 37915
-ALIGN_BACKGROUND_INGAME 591
+ALIGN_BACKGROUND_INGAME 59
ALPHA_BACKGROUND_INGAME 0.7
ALPHA_DISABLED 0.2
ALPHA_BEHIND 0.5
Modified: branches/nexuiz-2.0/data/models/player/carni.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/carni.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/carni.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -7,5 +7,4 @@
Mutated Warrior
Sex: Male
-Weight: 236 lb
-Age: 15
+Weight: 107 kg
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/carniarmor.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/carniarmor.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/carniarmor.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -7,5 +7,5 @@
Mutated Warrior
Sex: Male
-Weight: 236 lb
-Age: 15
+Weight: 107 kg
+Age: 15
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/fricka.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/fricka.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/fricka.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -7,5 +7,5 @@
Mutated Warrior
Sex: Female
-Weight: 126 lb
-Age: 16
+Weight: 57 kg
+Age: 16
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/grunt.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/grunt.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/grunt.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -8,5 +8,5 @@
Human Fighter
Sex: Male
-Weight: 375 lb
-Age: 53
+Weight: 170 kg
+Age: 53
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/headhunter.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/headhunter.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/headhunter.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -7,5 +7,5 @@
Mutated Warrior
Sex: Male
-Weight: 254 lb
-Age: 34
+Weight: 115 kg
+Age: 34
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/heroine.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/heroine.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/heroine.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -7,5 +7,5 @@
Solo Fighter
Sex: Female
-Weight: 111 lb
-Age: 23
+Weight: 50 kg
+Age: 23
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/insurrectionist.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/insurrectionist.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/insurrectionist.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -7,5 +7,5 @@
Warrior
Sex: Male
-Weight: 192 lb
-Age: 56
+Weight: 87 kg
+Age: 56
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/lurk.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/lurk.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/lurk.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -6,5 +6,5 @@
Reptilian Combatant
-Weight: 186 lb
-Age: 47
+Weight: 84 kg
+Age: 47
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/lycanthrope.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/lycanthrope.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/lycanthrope.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -7,5 +7,5 @@
Monsterous Opponent
Sex: Female
-Weight: 234 lb
-Age: 24
+Weight: 106 kg
+Age: 24
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/marine.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/marine.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/marine.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -7,5 +7,5 @@
Service Man
Sex: Male
-Weight: 204 lb
-Age: 35
+Weight: 93 kg
+Age: 35
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/mulder.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/mulder.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/mulder.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -6,5 +6,5 @@
Nexuiz's Soldier
-Weight: 621 lb
-Age: 313
+Weight: 282 kg
+Age: 313
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/nexus.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/nexus.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/nexus.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -6,5 +6,5 @@
Nexuiz's Soldier
-Weight: 621 lb
-Age: 313
+Weight: 282 kg
+Age: 313
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/pyria.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/pyria.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/pyria.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -7,5 +7,5 @@
Necro Warrior
Sex: Female
-Weight: 125 lb
-Age: 53
+Weight: 57 kg
+Age: 53
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/quark.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/quark.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/quark.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -6,5 +6,5 @@
Robot Fighter
-Weight: 305 lb
-Age: 3 years
+Weight: 138 kg
+Age: 3 years
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/reptile.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/reptile.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/reptile.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -6,5 +6,5 @@
Reptilian Combatant
-Weight: 176 lb
-Age: 32
+Weight: 80 kg
+Age: 32
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/shock.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/shock.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/shock.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -7,5 +7,5 @@
Necro Warrior
Sex: Male
-Weight: 145 lb
-Age: 65
+Weight: 66 kg
+Age: 65
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/skadi.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/skadi.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/skadi.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -7,5 +7,5 @@
Necro Warrior
Sex: Female
-Weight: 115 lb
-Age: 63
+Weight: 52 kg
+Age: 63
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/specop.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/specop.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/specop.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -7,5 +7,5 @@
Solo Warrior
Sex: Female
-Weight: 134 lb
-Age: 31
+Weight: 61 kg
+Age: 31
\ No newline at end of file
Modified: branches/nexuiz-2.0/data/models/player/xolar.txt
===================================================================
--- branches/nexuiz-2.0/data/models/player/xolar.txt 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/data/models/player/xolar.txt 2009-09-06 11:14:56 UTC (rev 7661)
@@ -6,5 +6,5 @@
Nexuiz's Soldier
-Weight: 621 lb
-Age: 313
+Weight: 282 kg
+Age: 313
\ No newline at end of file
Modified: branches/nexuiz-2.0/misc/mediasource/menuskins/wickedz/background_builder/append.sh
===================================================================
--- branches/nexuiz-2.0/misc/mediasource/menuskins/wickedz/background_builder/append.sh 2009-09-06 11:12:41 UTC (rev 7660)
+++ branches/nexuiz-2.0/misc/mediasource/menuskins/wickedz/background_builder/append.sh 2009-09-06 11:14:56 UTC (rev 7661)
@@ -24,8 +24,9 @@
# place the image string on the big image
place_on_bg()
{
- convert background_25.tga -page +259+41 TGA:"$1" -flatten "$2"/background.tga
- convert background_ingame_25.tga -page +259+41 TGA:"$1" -flatten "$2"/background_ingame.tga
+ #convert background_25.tga -page +259+41 TGA:"$1" -flatten "$2"/background.tga
+ #convert background_ingame_25.tga -page +259+41 TGA:"$1" -flatten "$2"/background_ingame.tga
+ convert background_l2.tga -draw "image over 259,41 0,0 'TGA:$1'" "$2"/background_l2.tga
}
# test case
Copied: branches/nexuiz-2.0/misc/mediasource/menuskins/wickedz/background_builder/background_l2.tga (from rev 7660, trunk/misc/mediasource/menuskins/wickedz/background_builder/background_l2.tga)
===================================================================
(Binary files differ)
More information about the nexuiz-commits
mailing list