[nexuiz-commits] r8506 - in trunk: data/gfx/hud data/gfx/hud/race data/qcsrc/client data/qcsrc/common data/qcsrc/server misc/mediasource/hud
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Sat Jan 16 14:25:28 EST 2010
Author: fruitiex
Date: 2010-01-16 14:25:28 -0500 (Sat, 16 Jan 2010)
New Revision: 8506
Added:
trunk/data/gfx/hud/race/
trunk/data/gfx/hud/race/newrank.tga
trunk/data/gfx/hud/race/newrecord.tga
trunk/data/gfx/hud/race/newtime.tga
trunk/misc/mediasource/hud/nr_icon_rank.svg
trunk/misc/mediasource/hud/nr_icon_rank_bg.tga
trunk/misc/mediasource/hud/nr_icon_record.svg
trunk/misc/mediasource/hud/nr_icon_record_bg.tga
trunk/misc/mediasource/hud/nr_icon_time.svg
trunk/misc/mediasource/hud/nr_icon_time_bg.tga
trunk/misc/mediasource/hud/nr_icons.txt
Modified:
trunk/data/qcsrc/client/Defs.qc
trunk/data/qcsrc/client/Main.qc
trunk/data/qcsrc/client/sbar.qc
trunk/data/qcsrc/common/constants.qh
trunk/data/qcsrc/server/race.qc
Log:
race/cts "record badges" (new time/rank/record) by sev, update notify message color scheme to match them :)
Added: trunk/data/gfx/hud/race/newrank.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/hud/race/newrank.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/hud/race/newrecord.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/hud/race/newrecord.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/data/gfx/hud/race/newtime.tga
===================================================================
(Binary files differ)
Property changes on: trunk/data/gfx/hud/race/newtime.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: trunk/data/qcsrc/client/Defs.qc
===================================================================
--- trunk/data/qcsrc/client/Defs.qc 2010-01-16 18:04:00 UTC (rev 8505)
+++ trunk/data/qcsrc/client/Defs.qc 2010-01-16 19:25:28 UTC (rev 8506)
@@ -210,6 +210,7 @@
float race_othercheckpointlapsdelta;
string race_othercheckpointenemy;
float sb_showscores_force;
+float race_status;
// Nexball
float nb_pb_period;
Modified: trunk/data/qcsrc/client/Main.qc
===================================================================
--- trunk/data/qcsrc/client/Main.qc 2010-01-16 18:04:00 UTC (rev 8505)
+++ trunk/data/qcsrc/client/Main.qc 2010-01-16 19:25:28 UTC (rev 8506)
@@ -1119,6 +1119,9 @@
strunzone(grecordholder[pos-1]);
grecordholder[pos-1] = strzone(ReadString());
grecordtime[pos-1] = ReadInt24_t();
+ break;
+ case RACE_NET_SERVER_STATUS:
+ race_status = ReadShort();
}
}
Modified: trunk/data/qcsrc/client/sbar.qc
===================================================================
--- trunk/data/qcsrc/client/sbar.qc 2010-01-16 18:04:00 UTC (rev 8505)
+++ trunk/data/qcsrc/client/sbar.qc 2010-01-16 19:25:28 UTC (rev 8506)
@@ -1575,6 +1575,31 @@
return strcat(col, cpname, " (", timestr, " ", strcat(hisname, col, lapstr), ")");
}
+float race_status_time;
+float race_status_prev;
+void Sbar_DrawRaceStatus(vector pos)
+{
+ if (race_status != race_status_prev) {
+ race_status_time = time + 3;
+ race_status_prev = race_status;
+ }
+
+ float a;
+ a = bound(0, race_status_time - time, 1);
+
+ if(race_status == 0)
+ drawpic(pos, "gfx/hud/race/newtime", '50 50 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
+ else if(race_status == 1)
+ drawpic(pos, "gfx/hud/race/newrank", '50 50 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
+ else if(race_status == 2)
+ drawpic(pos, "gfx/hud/race/newrecord", '50 50 0', '1 1 1', sbar_alpha_fg * a, DRAWFLAG_NORMAL);
+
+ if (race_status_time - time <= 0) {
+ race_status_prev = -1;
+ race_status = -1;
+ }
+}
+
void Sbar_Score()
{
float score, distribution, leader;
@@ -1704,6 +1729,7 @@
m = '0.5 0 0' * vid_conwidth + '0 1 0' * cvar_or("cl_racetimer_position", 0.25) * vid_conheight;
+ Sbar_DrawRaceStatus(m + '100 0 0');
if(race_checkpointtime)
{
a = bound(0, 2 - (time - race_checkpointtime), 1);
Modified: trunk/data/qcsrc/common/constants.qh
===================================================================
--- trunk/data/qcsrc/common/constants.qh 2010-01-16 18:04:00 UTC (rev 8505)
+++ trunk/data/qcsrc/common/constants.qh 2010-01-16 19:25:28 UTC (rev 8506)
@@ -66,6 +66,7 @@
const float RACE_NET_SPEED_AWARD = 9; // speed award, sent to client
const float RACE_NET_SPEED_AWARD_BEST = 10; // all time best speed award, sent to client
const float RACE_NET_SERVER_RANKINGS = 11;
+const float RACE_NET_SERVER_STATUS = 12;
const float RANKINGS_CNT = 15;
const float ENT_CLIENT = 0;
Modified: trunk/data/qcsrc/server/race.qc
===================================================================
--- trunk/data/qcsrc/server/race.qc 2010-01-16 18:04:00 UTC (rev 8505)
+++ trunk/data/qcsrc/server/race.qc 2010-01-16 19:25:28 UTC (rev 8506)
@@ -138,22 +138,22 @@
}
#ifdef UID
-float race_CheckUID(string uid, string netname) { // return existing UID or player name ranking pos, else 0
+float race_CheckUID(string myuid, string net_name) { // return existing UID or player name ranking pos, else 0
float i;
for (i=RANKINGS_CNT-1;i>=0;--i)
- if(grecorduid[i] == uid)
+ if(grecorduid[i] == myuid)
return i+1;
for (i=RANKINGS_CNT-1;i>=0;--i)
- if(grecordholder[i] == netname)
+ if(grecordholder[i] == net_name)
return i+1;
return 0;
}
#endif
-float race_CheckName(string netname) { // Does the name already exist in rankings? In that case, where? (otherwise 0)
+float race_CheckName(string net_name) { // Does the name already exist in rankings? In that case, where? (otherwise 0)
float i;
for (i=RANKINGS_CNT-1;i>=0;--i)
- if(grecordholder[i] == netname)
+ if(grecordholder[i] == net_name)
return i+1;
return 0;
}
@@ -193,6 +193,15 @@
WriteInt24_t(msg, race_GetTime(pos));
}
+void race_SendStatus(float id)
+{
+ float msg = MSG_ONE;
+ WriteByte(msg, SVC_TEMPENTITY);
+ WriteByte(msg, TE_CSQC_RACE);
+ WriteByte(msg, RACE_NET_SERVER_STATUS);
+ WriteShort(msg, id);
+}
+
string race_PlaceName(float pos) {
if(pos == 1)
return "1st";
@@ -209,44 +218,41 @@
return;
float oldrec;
- string oldname;
+ string recorddifference;
float pos;
pos = race_GetPos(t);
+ float prevpos;
- float prevpos = race_CheckName(e.netname);
+ prevpos = race_CheckName(e.netname);
#ifdef UID
- float prevpos = race_CheckUID(e.uid, e.netname);
+ prevpos = race_CheckUID(e.uid, e.netname);
#endif
if (prevpos && (prevpos < pos || !pos))
{
oldrec = race_GetTime(prevpos);
- string recorddifference = strcat(" ^1[+", TIME_ENCODED_TOSTRING(t - oldrec), "]");
- bprint(e.netname, "^1 couldn't break their ", race_PlaceName(prevpos), " place record of ", TIME_ENCODED_TOSTRING(oldrec), recorddifference, "\n");
+ recorddifference = strcat(" ^1[+", TIME_ENCODED_TOSTRING(t - oldrec), "]");
+ bprint(e.netname, "^7 couldn't break their ", race_PlaceName(prevpos), " place record of ", TIME_ENCODED_TOSTRING(oldrec), recorddifference, "\n");
return;
} else if (!pos) { // no ranking, time worse than the worst ranked
- string recorddifference = strcat(" ^1[+", TIME_ENCODED_TOSTRING(t - grecordtime[RANKINGS_CNT-1]), "]");
- bprint(e.netname, "^1 couldn't break the ", race_PlaceName(RANKINGS_CNT), " place record of ", TIME_ENCODED_TOSTRING(grecordtime[RANKINGS_CNT-1]), recorddifference, "\n");
+ recorddifference = strcat(" ^1[+", TIME_ENCODED_TOSTRING(t - grecordtime[RANKINGS_CNT-1]), "]");
+ bprint(e.netname, "^7 couldn't break the ", race_PlaceName(RANKINGS_CNT), " place record of ", TIME_ENCODED_TOSTRING(grecordtime[RANKINGS_CNT-1]), recorddifference, "\n");
return;
}
-
// move other rankings out of the way
float i;
if (prevpos) { // player improved his existing record
- if(prevpos == pos) {
+ if(prevpos == pos)
oldrec = grecordtime[pos-1];
- }
+ else
+ oldrec = grecordtime[pos-1];
for (i=prevpos-1;i>pos-1;--i) {
db_put(ServerProgsDB, strcat(GetMapname(), rr, "time", ftos(i)), ftos(grecordtime[i-1]));
db_put(ServerProgsDB, strcat(GetMapname(), rr, "netname", ftos(i)), grecordholder[i-1]);
#ifdef UID
db_put(ServerProgsDB, strcat(GetMapname(), rr, "uid", ftos(i)), grecorduid[i-1]);
#endif
- if(i == prevpos-1) {
- oldrec = grecordtime[i];
- oldname = grecordholder[i];
- }
grecordtime[i] = grecordtime[i-1];
if (grecordholder[i])
@@ -259,6 +265,7 @@
#endif
}
} else { // player has no ranked record yet
+ oldrec = grecordtime[pos-1];
for (i=RANKINGS_CNT-1;i>pos-1;--i) {
db_put(ServerProgsDB, strcat(GetMapname(), rr, "time", ftos(i)), ftos(grecordtime[i-1]));
db_put(ServerProgsDB, strcat(GetMapname(), rr, "netname", ftos(i)), grecordholder[i-1]);
@@ -324,16 +331,30 @@
if(rankings_reply)
strunzone(rankings_reply);
rankings_reply = strzone(getrankings());
- if(pos == prevpos) {
- string recorddifference = strcat(" ^3[-", TIME_ENCODED_TOSTRING(oldrec - t), "]");
- bprint(e.netname, "^3 improved their ", race_PlaceName(pos), " ^3place record with ", TIME_ENCODED_TOSTRING(t), recorddifference, "\n");
+ if(pos == 1) {
+ if(pos == prevpos) {
+ recorddifference = strcat(" ^2[-", TIME_ENCODED_TOSTRING(oldrec - t), "]");
+ bprint(e.netname, "^1 improved their 1st place record with ", TIME_ENCODED_TOSTRING(t), recorddifference, "\n");
+ race_SendStatus(2); // "new record"
+ } else {
+ recorddifference = strcat(" ^2[-", TIME_ENCODED_TOSTRING(oldrec - t), "]");
+ bprint(e.netname, "^1 broke ", grecordholder[pos], "^1's 1st place record with ", strcat(TIME_ENCODED_TOSTRING(t), recorddifference, "\n"));
+ race_SendStatus(2); // "new record"
+ }
+ } else {
+ if(pos == prevpos) {
+ recorddifference = strcat(" ^2[-", TIME_ENCODED_TOSTRING(oldrec - t), "]");
+ bprint(e.netname, "^3 improved their ", race_PlaceName(pos), " ^3place record with ", TIME_ENCODED_TOSTRING(t), recorddifference, "\n");
+ race_SendStatus(0); // "new time"
+ } else if (oldrec == 0) {
+ bprint(e.netname, "^2 set the ", race_PlaceName(pos), " ^2place record with ", TIME_ENCODED_TOSTRING(t), "\n");
+ race_SendStatus(1); // "new rank"
+ } else {
+ recorddifference = strcat(" ^2[-", TIME_ENCODED_TOSTRING(oldrec - t), "]");
+ bprint(e.netname, "^2 broke ", grecordholder[pos], "^2's ", race_PlaceName(pos), " ^2place record with ", strcat(TIME_ENCODED_TOSTRING(t), recorddifference, "\n"));
+ race_SendStatus(1); // "new rank"
+ }
}
- else if(oldname == "")
- bprint(e.netname, "^2 set the ", race_PlaceName(pos), " ^2place record with ", TIME_ENCODED_TOSTRING(t), "\n");
- else {
- string recorddifference = strcat(" ^2[-", TIME_ENCODED_TOSTRING(oldrec - t), "]");
- bprint(e.netname, "^2 broke ", oldname, "^2's ", race_PlaceName(pos), " ^2place record ", strcat(TIME_ENCODED_TOSTRING(oldrec), " ^2with ", TIME_ENCODED_TOSTRING(t), recorddifference, "\n"));
- }
}
void race_DeleteTime(float pos) {
@@ -343,26 +364,53 @@
if (i == 0) {
db_put(ServerProgsDB, strcat(GetMapname(), rr, "time"), ftos(grecordtime[1]));
db_put(ServerProgsDB, strcat(GetMapname(), rr, "netname"), grecordholder[1]);
+#ifdef UID
+ db_put(ServerProgsDB, strcat(GetMapname(), rr, "uid"), grecorduid[1]);
+#endif
grecordtime[0] = grecordtime[1];
if (grecordholder[i])
strunzone(grecordholder[0]);
grecordholder[0] = strzone(grecordholder[1]);
+
+#ifdef UID
+ if (grecorduid[i])
+ strunzone(grecorduid[0]);
+ grecorduid[0] = strzone(grecorduid[1]);
+#endif
}
else if (i == RANKINGS_CNT-1) {
db_put(ServerProgsDB, strcat(GetMapname(), rr, "time", ftos(i)), string_null);
db_put(ServerProgsDB, strcat(GetMapname(), rr, "netname", ftos(i)), string_null);
+#ifdef UID
+ db_put(ServerProgsDB, strcat(GetMapname(), rr, "uid", ftos(i)), string_null);
+#endif
grecordtime[i] = 0;
if (grecordholder[i])
strunzone(grecordholder[i]);
grecordholder[i] = string_null;
+
+#ifdef UID
+ if (grecorduid[i])
+ strunzone(grecorduid[i]);
+ grecorduid[i] = string_null;
+#endif
}
else {
db_put(ServerProgsDB, strcat(GetMapname(), rr, "time", ftos(i)), ftos(grecordtime[i+1]));
db_put(ServerProgsDB, strcat(GetMapname(), rr, "netname", ftos(i)), grecordholder[i+1]);
+#ifdef UID
+ db_put(ServerProgsDB, strcat(GetMapname(), rr, "uid", ftos(i)), grecorduid[i+1]);
+#endif
grecordtime[i] = grecordtime[i+1];
if (grecordholder[i])
strunzone(grecordholder[i]);
grecordholder[i] = strzone(grecordholder[i+1]);
+
+#ifdef UID
+ if (grecorduid[i])
+ strunzone(grecorduid[i]);
+ grecorduid[i] = strzone(grecorduid[i+1]);
+#endif
}
}
Added: trunk/misc/mediasource/hud/nr_icon_rank.svg
===================================================================
--- trunk/misc/mediasource/hud/nr_icon_rank.svg (rev 0)
+++ trunk/misc/mediasource/hud/nr_icon_rank.svg 2010-01-16 19:25:28 UTC (rev 8506)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="256"
+ height="256"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="nr_icon_rank.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/sev/.nexuiz/data/nr_icons/nr_icon_rank.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <pattern
+ patternUnits="userSpaceOnUse"
+ width="256"
+ height="256"
+ id="BGImage">
+ <image
+ xlink:href="nr_icon_rank_bg.tga"
+ sodipodi:absref="/home/sev/Desktop/data/nr_icons/nr_icon_rank_bg.tga"
+ width="256"
+ height="256"
+ id="image3180"
+ x="0"
+ y="0" />
+ </pattern>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3197">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3199" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3201" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3197"
+ id="linearGradient3203"
+ x1="224"
+ y1="128"
+ x2="0"
+ y2="128"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="2.2651564"
+ inkscape:cx="135.8964"
+ inkscape:cy="120.75383"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:showpageshadow="false"
+ inkscape:snap-bbox="true"
+ gridtolerance="8"
+ inkscape:window-width="1280"
+ inkscape:window-height="961"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ showguides="false"
+ inkscape:guide-bbox="true"
+ guidecolor="#00007f"
+ guideopacity="0.49803922"
+ guidehicolor="#ff0000"
+ guidehiopacity="0.49803922">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2389"
+ visible="true"
+ enabled="true"
+ empspacing="8"
+ color="#003fff"
+ opacity="0.1254902"
+ empcolor="#007eff"
+ empopacity="0.25098039" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <cc:license
+ rdf:resource="" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:url(#BGImage);fill-opacity:1;stroke:#000000;stroke-width:9.85714289;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="Circle"
+ sodipodi:cx="148"
+ sodipodi:cy="132"
+ sodipodi:rx="92"
+ sodipodi:ry="92"
+ d="M 240,132 A 92,92 0 1 1 56,132 A 92,92 0 1 1 240,132 z"
+ transform="matrix(1.2173913,0,0,1.2173913,-52.173912,-32.695652)"
+ inkscape:label="Icon" />
+ <text
+ xml:space="preserve"
+ style="font-size:36px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Gothic L;-inkscape-font-specification:URW Gothic L Semi-Bold"
+ x="129.96484"
+ y="208"
+ id="Text"
+ sodipodi:linespacing="100%"
+ inkscape:label="Text"><tspan
+ sodipodi:role="line"
+ id="tspan3307"
+ x="129.96484"
+ y="208">RANK</tspan></text>
+ <text
+ sodipodi:linespacing="100%"
+ id="TextNew"
+ y="176"
+ x="101.46602"
+ style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Gothic L;-inkscape-font-specification:URW Gothic L Semi-Bold"
+ xml:space="preserve"
+ inkscape:label="Text"><tspan
+ y="176"
+ x="101.46602"
+ id="tspan3311"
+ sodipodi:role="line">NEW</tspan></text>
+ <path
+ style="opacity:1;fill:url(#linearGradient3203);fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 125,32 C 101.10774,32.982071 78.443149,42.8043 62.15625,58.15625 L 77.0625,73.0625 C 88.453412,67.324004 101.77,64 116,64 C 118.69813,64 122.37421,64.049911 125,64.28125 L 125,32 z M 131,32 L 131,65.34375 C 145.43614,67.951747 159.31871,74.125288 169.4375,82.5625 L 193.84375,58.15625 C 177.55685,42.8043 154.89225,32.982071 131,32 z M 58.15625,62.15625 C 41.937752,79.346128 32,102.51834 32,128 L 40,128 C 40,106.51863 52.606661,87.516195 71.90625,75.90625 L 58.15625,62.15625 z M 197.84375,62.15625 L 173.65625,86.34375 C 185.07906,97.539106 192,112.08999 192,128 L 224,128 C 224,102.51834 214.06225,79.346128 197.84375,62.15625 z"
+ id="Speed"
+ sodipodi:nodetypes="cccsccccccccccccccccc"
+ inkscape:label="Icon" />
+ <path
+ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 149.49666,50.94227 C 147.57021,50.404854 147.0328,52.331297 147.0328,52.331297 L 126.17081,112.11163 C 119.90573,112.84092 114.38714,117.25303 112.58845,123.70067 C 110.98548,129.44675 112.75103,135.32706 116.67791,139.27872 L 115.9949,141.26188 C 114.92006,145.11477 117.69812,150.04249 121.551,151.11732 C 125.40389,152.19215 130.33161,149.4141 131.40644,145.56121 L 131.84865,143.51088 C 137.25404,142.16262 141.80857,138.04541 143.41155,132.29933 C 145.21023,125.85169 142.77251,119.22002 137.78967,115.35293 L 150.88568,53.40613 C 150.88568,53.40613 151.4231,51.479687 149.49666,50.94227 z"
+ id="Dial"
+ inkscape:transform-center-y="-26.901003"
+ inkscape:transform-center-x="-3.4767781"
+ inkscape:label="Icon" />
+ </g>
+</svg>
Added: trunk/misc/mediasource/hud/nr_icon_rank_bg.tga
===================================================================
(Binary files differ)
Property changes on: trunk/misc/mediasource/hud/nr_icon_rank_bg.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/misc/mediasource/hud/nr_icon_record.svg
===================================================================
--- trunk/misc/mediasource/hud/nr_icon_record.svg (rev 0)
+++ trunk/misc/mediasource/hud/nr_icon_record.svg 2010-01-16 19:25:28 UTC (rev 8506)
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="256"
+ height="256"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="nr_icon_record.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/sev/.nexuiz/data/nr_icons/nr_icon_record.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <pattern
+ patternUnits="userSpaceOnUse"
+ width="256"
+ height="256"
+ id="BGImage">
+ <image
+ xlink:href="nr_icon_record_bg.tga"
+ sodipodi:absref="/home/sev/Desktop/data/nr_icons/nr_icon_record_bg.tga"
+ width="256"
+ height="256"
+ id="image3180"
+ x="0"
+ y="0" />
+ </pattern>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3197">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3199" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3201" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3197"
+ id="linearGradient3203"
+ x1="224"
+ y1="128"
+ x2="0"
+ y2="128"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.6064939"
+ inkscape:cx="135.8964"
+ inkscape:cy="120.75383"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:showpageshadow="false"
+ inkscape:snap-bbox="true"
+ gridtolerance="8"
+ inkscape:window-width="1280"
+ inkscape:window-height="961"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ showguides="false"
+ inkscape:guide-bbox="true"
+ guidecolor="#00007f"
+ guideopacity="0.49803922"
+ guidehicolor="#ff0000"
+ guidehiopacity="0.49803922">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2389"
+ visible="true"
+ enabled="true"
+ empspacing="8"
+ color="#003fff"
+ opacity="0.1254902"
+ empcolor="#007eff"
+ empopacity="0.25098039" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <cc:license
+ rdf:resource="" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:url(#BGImage);fill-opacity:1;stroke:#000000;stroke-width:9.85714289;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="Circle"
+ sodipodi:cx="148"
+ sodipodi:cy="132"
+ sodipodi:rx="92"
+ sodipodi:ry="92"
+ d="M 240,132 A 92,92 0 1 1 56,132 A 92,92 0 1 1 240,132 z"
+ transform="matrix(1.2173913,0,0,1.2173913,-52.173912,-32.695652)"
+ inkscape:label="Icon" />
+ <text
+ xml:space="preserve"
+ style="font-size:36px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Gothic L;-inkscape-font-specification:URW Gothic L Semi-Bold"
+ x="129.96484"
+ y="208"
+ id="Text"
+ sodipodi:linespacing="100%"
+ inkscape:label="Text"><tspan
+ sodipodi:role="line"
+ id="tspan3307"
+ x="129.96484"
+ y="208">RECORD</tspan></text>
+ <text
+ sodipodi:linespacing="100%"
+ id="TextNew"
+ y="176"
+ x="101.46602"
+ style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Gothic L;-inkscape-font-specification:URW Gothic L Semi-Bold"
+ xml:space="preserve"
+ inkscape:label="Text"><tspan
+ y="176"
+ x="101.46602"
+ id="tspan3311"
+ sodipodi:role="line">NEW</tspan></text>
+ <path
+ style="opacity:1;fill:url(#linearGradient3203);fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 125,32 C 101.10774,32.982071 78.443149,42.8043 62.15625,58.15625 L 77.0625,73.0625 C 88.453412,67.324004 101.77,64 116,64 C 118.69813,64 122.37421,64.049911 125,64.28125 L 125,32 z M 131,32 L 131,65.34375 C 145.43614,67.951747 159.31871,74.125288 169.4375,82.5625 L 193.84375,58.15625 C 177.55685,42.8043 154.89225,32.982071 131,32 z M 58.15625,62.15625 C 41.937752,79.346128 32,102.51834 32,128 L 40,128 C 40,106.51863 52.606661,87.516195 71.90625,75.90625 L 58.15625,62.15625 z M 197.84375,62.15625 L 173.65625,86.34375 C 185.07906,97.539106 192,112.08999 192,128 L 224,128 C 224,102.51834 214.06225,79.346128 197.84375,62.15625 z"
+ id="Speed"
+ sodipodi:nodetypes="cccsccccccccccccccccc"
+ inkscape:label="Icon" />
+ <path
+ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 206.96709,115.186 C 206.64674,113.21182 204.67256,113.53218 204.67256,113.53218 L 141.6552,119.67403 C 138.36484,114.29289 132.0446,111.1344 125.4372,112.20658 C 119.54874,113.1621 114.95161,117.2317 113.01193,122.45411 L 110.92518,122.66609 C 106.97682,123.30679 103.66917,127.89585 104.30987,131.8442 C 104.95057,135.79255 109.53963,139.10021 113.48798,138.45951 L 115.53468,138.00076 C 119.02624,142.34185 124.67434,144.74894 130.5628,143.79342 C 137.1702,142.72123 142.16739,137.72627 143.5873,131.58079 L 205.31326,117.48053 C 205.31326,117.48053 207.28744,117.16018 206.96709,115.186 z"
+ id="Dial"
+ inkscape:transform-center-y="-6.9069179e-05"
+ inkscape:transform-center-x="-27.616141"
+ inkscape:label="Icon" />
+ </g>
+</svg>
Added: trunk/misc/mediasource/hud/nr_icon_record_bg.tga
===================================================================
(Binary files differ)
Property changes on: trunk/misc/mediasource/hud/nr_icon_record_bg.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/misc/mediasource/hud/nr_icon_time.svg
===================================================================
--- trunk/misc/mediasource/hud/nr_icon_time.svg (rev 0)
+++ trunk/misc/mediasource/hud/nr_icon_time.svg 2010-01-16 19:25:28 UTC (rev 8506)
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="256"
+ height="256"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.46"
+ version="1.0"
+ sodipodi:docname="nr_icon_time.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ inkscape:export-filename="/home/sev/.nexuiz/data/nr_icons/nr_icon_time.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 128 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="256 : 128 : 1"
+ inkscape:persp3d-origin="128 : 85.333333 : 1"
+ id="perspective21" />
+ <pattern
+ patternUnits="userSpaceOnUse"
+ width="256"
+ height="256"
+ id="BGImage">
+ <image
+ xlink:href="nr_icon_time_bg.tga"
+ sodipodi:absref="/home/sev/Desktop/data/nr_icons/nr_icon_time_bg.tga"
+ width="256"
+ height="256"
+ id="image3180"
+ x="0"
+ y="0" />
+ </pattern>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3197">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3199" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3201" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3197"
+ id="linearGradient3203"
+ x1="224"
+ y1="128"
+ x2="0"
+ y2="128"
+ gradientUnits="userSpaceOnUse" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="1.6064939"
+ inkscape:cx="135.8964"
+ inkscape:cy="120.75383"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:showpageshadow="false"
+ inkscape:snap-bbox="true"
+ gridtolerance="8"
+ inkscape:window-width="1280"
+ inkscape:window-height="961"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ showguides="false"
+ inkscape:guide-bbox="true"
+ guidecolor="#00007f"
+ guideopacity="0.49803922"
+ guidehicolor="#ff0000"
+ guidehiopacity="0.49803922">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2389"
+ visible="true"
+ enabled="true"
+ empspacing="8"
+ color="#003fff"
+ opacity="0.1254902"
+ empcolor="#007eff"
+ empopacity="0.25098039" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <cc:license
+ rdf:resource="" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Ebene 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ style="display:inline">
+ <path
+ sodipodi:type="arc"
+ style="opacity:1;fill:url(#BGImage);fill-opacity:1;stroke:#000000;stroke-width:9.85714289;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="Circle"
+ sodipodi:cx="148"
+ sodipodi:cy="132"
+ sodipodi:rx="92"
+ sodipodi:ry="92"
+ d="M 240,132 A 92,92 0 1 1 56,132 A 92,92 0 1 1 240,132 z"
+ transform="matrix(1.2173913,0,0,1.2173913,-52.173912,-32.695652)"
+ inkscape:label="Icon" />
+ <text
+ xml:space="preserve"
+ style="font-size:36px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:center;line-height:100%;writing-mode:lr-tb;text-anchor:middle;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Gothic L;-inkscape-font-specification:URW Gothic L Semi-Bold"
+ x="129.96484"
+ y="208"
+ id="Text"
+ sodipodi:linespacing="100%"
+ inkscape:label="Text"><tspan
+ sodipodi:role="line"
+ id="tspan3307"
+ x="129.96484"
+ y="208">TIME</tspan></text>
+ <text
+ sodipodi:linespacing="100%"
+ id="TextNew"
+ y="176"
+ x="101.46602"
+ style="font-size:24px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;text-align:start;line-height:100%;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:URW Gothic L;-inkscape-font-specification:URW Gothic L Semi-Bold"
+ xml:space="preserve"
+ inkscape:label="Text"><tspan
+ y="176"
+ x="101.46602"
+ id="tspan3311"
+ sodipodi:role="line">NEW</tspan></text>
+ <path
+ style="opacity:1;fill:url(#linearGradient3203);fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 125,32 C 101.10774,32.982071 78.443149,42.8043 62.15625,58.15625 L 77.0625,73.0625 C 88.453412,67.324004 101.77,64 116,64 C 118.69813,64 122.37421,64.049911 125,64.28125 L 125,32 z M 131,32 L 131,65.34375 C 145.43614,67.951747 159.31871,74.125288 169.4375,82.5625 L 193.84375,58.15625 C 177.55685,42.8043 154.89225,32.982071 131,32 z M 58.15625,62.15625 C 41.937752,79.346128 32,102.51834 32,128 L 40,128 C 40,106.51863 52.606661,87.516195 71.90625,75.90625 L 58.15625,62.15625 z M 197.84375,62.15625 L 173.65625,86.34375 C 185.07906,97.539106 192,112.08999 192,128 L 224,128 C 224,102.51834 214.06225,79.346128 197.84375,62.15625 z"
+ id="Speed"
+ sodipodi:nodetypes="cccsccccccccccccccccc"
+ inkscape:label="Icon" />
+ <path
+ style="opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:16;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 81.219109,63.103556 C 79.596694,64.273084 80.76622,65.89549 80.76622,65.89549 L 114.44564,119.51086 C 111.10446,124.86059 111.10642,131.92611 115.02071,137.35618 C 118.50909,142.19541 124.20511,144.48684 129.74359,143.88582 L 130.86654,145.65738 C 133.20557,148.9022 138.78946,149.80798 142.03426,147.46893 C 145.27909,145.12989 146.18487,139.54602 143.84582,136.3012 L 142.52008,134.67583 C 144.84104,129.61133 144.46767,123.48305 140.97929,118.64382 C 137.06499,113.21376 130.3624,110.97843 124.23082,112.45718 L 84.011039,63.556451 C 84.011039,63.556451 82.841518,61.934037 81.219109,63.103556 z"
+ id="Dial"
+ inkscape:transform-center-y="-22.270339"
+ inkscape:transform-center-x="15.242566"
+ inkscape:label="Icon" />
+ </g>
+</svg>
Added: trunk/misc/mediasource/hud/nr_icon_time_bg.tga
===================================================================
(Binary files differ)
Property changes on: trunk/misc/mediasource/hud/nr_icon_time_bg.tga
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/misc/mediasource/hud/nr_icons.txt
===================================================================
--- trunk/misc/mediasource/hud/nr_icons.txt (rev 0)
+++ trunk/misc/mediasource/hud/nr_icons.txt 2010-01-16 19:25:28 UTC (rev 8506)
@@ -0,0 +1,9 @@
+The svg files have been created and edited with Inkscape 0.46
+The background images are based on the following files provided with Nexuiz:
+
+textures/ons_boom1.tga
+gfx/hud/sb_scoreboard_bg.tga
+
+License: GNU GPL version 2 or any later version
+
+sev
More information about the nexuiz-commits
mailing list