Menu
▾
▴
xqf-commits — svn commit notifications
You can subscribe to this list here.
| 2008 |
Jan
(9) |
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(4) |
Oct
|
Nov
(3) |
Dec
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2009 |
Jan
(1) |
Feb
|
Mar
|
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
|
From: <l-...@us...> - 2010-12-21 14:22:16
|
Revision: 837
http://xqf.svn.sourceforge.net/xqf/?rev=837&view=rev
Author: l-n
Date: 2010-12-21 14:22:10 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
add hack for systems without gtk1
Modified Paths:
--------------
trunk/xqf/autogen.sh
Added Paths:
-----------
trunk/xqf/xqf-acinclude-nogtk1.m4
Modified: trunk/xqf/autogen.sh
===================================================================
--- trunk/xqf/autogen.sh 2010-12-21 14:22:01 UTC (rev 836)
+++ trunk/xqf/autogen.sh 2010-12-21 14:22:10 UTC (rev 837)
@@ -17,6 +17,11 @@
(
cd $srcdir
+if ! gtk-config --version >/dev/null 2>&1; then
+ mkdir m4
+ ln -s ../xqf-acinclude-nogtk1.m4 m4/gtk.m4
+fi
+
# extract flag icons
rm pixmaps/flags/*.png
tar -C pixmaps -xzf pixmaps/flags.tar.gz
Added: trunk/xqf/xqf-acinclude-nogtk1.m4
===================================================================
--- trunk/xqf/xqf-acinclude-nogtk1.m4 (rev 0)
+++ trunk/xqf/xqf-acinclude-nogtk1.m4 2010-12-21 14:22:10 UTC (rev 837)
@@ -0,0 +1,3 @@
+AC_DEFUN([AM_PATH_GLIB], [AC_MSG_ERROR([GTK1 support not available])])dnl
+AC_DEFUN([AM_PATH_GTK], [AC_MSG_ERROR([GTK1 support not available])])dnl
+AC_DEFUN([AM_PATH_GDK_PIXBUF], [AC_MSG_ERROR([GTK1 support not available])])dnl
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2010-12-21 14:22:09
|
Revision: 836
http://xqf.svn.sourceforge.net/xqf/?rev=836&view=rev
Author: l-n
Date: 2010-12-21 14:22:01 +0000 (Tue, 21 Dec 2010)
Log Message:
-----------
add support for objects
Modified Paths:
--------------
trunk/xqf/src/gensyms.pl
Modified: trunk/xqf/src/gensyms.pl
===================================================================
--- trunk/xqf/src/gensyms.pl 2009-04-25 14:12:53 UTC (rev 835)
+++ trunk/xqf/src/gensyms.pl 2010-12-21 14:22:01 UTC (rev 836)
@@ -24,7 +24,6 @@
my %versions;
my $versfile;
my $outfile;
-my $weak;
sub help($)
{
@@ -38,7 +37,6 @@
-x <SYM1[,SYM2[,...]]> exclude symbols from list
-v <FILE> write version map into FILE
-o <FILE> write C code into FILE
- --weak generate weak symbols
--help this screen
EOF
exit(shift);
@@ -49,7 +47,6 @@
"x=s@" => $except,
"v=s" => \$versfile,
"o=s" => \$outfile,
- "weak" => \$weak,
"h|help" => sub { help(0); }
) or exit(1);
@@ -65,29 +62,42 @@
$except->{'_fini'} = 1;
open (OUT, '>', $outfile) or die;
-print OUT "static void segv(void) { char* die = 0; ++*die; }\n";
+print OUT "#include <stdlib.h>\n";
+print OUT "static void segv(void) { exit(0); }\n";
+print OUT "static char array[1];\n";
+srand(42);
+
foreach my $file (@ARGV)
{
- my %seen;
+ my %sectlist;
+ open (IN, "/usr/bin/readelf -W --sections $file|") or die;
+ while(<IN>)
+ {
+ next unless /^ +\[ *(\d+)\] *(\.rodata|\.data.rel.ro|\.data|\.bss)/;
+ $sectlist{$1} = $2;
+ }
+ close IN;
open (IN, "/usr/bin/readelf -W --symbols $file|") or die;
while(<IN>)
{
- my ($sym, $ver, $at);
+ my ($size, $type, $bind, $visib, $sect, $sym, $ver, $at);
next unless s/^ +\d+: *//;
chomp;
my @f = split(/ +/);
next unless $#f >= 6;
- next unless $f[2] eq 'FUNC';
- next unless $f[3] eq 'GLOBAL';
+ $size = $f[1];
+ next unless $f[2] eq 'FUNC' or $f[2] eq 'OBJECT';
+ $type = $f[2];
+ next unless $f[3] eq 'GLOBAL' or $f[3] eq 'WEAK';
+ $bind = $f[3];
+ $visib = $f[4];
next unless $f[5] =~ /\d+/;
+ $sect = $f[5];
$sym = $f[6];
- next if exists $seen{$sym};
- $seen{$sym} = 1;
-
if($sym =~ /(.*?)(\@\@?)(.*)/)
{
$sym = $1;
@@ -97,19 +107,42 @@
next if exists $except->{$sym};
+ if($visib eq 'PROTECTED') {
+ print OUT "__attribute__ ((visibility (\"protected\"))) ";
+ }
if($ver)
{
my $vsym = sprintf "SEGV_%08X_%s",int(rand(0xffffffff)), $sym;
push @{$versions{$ver}}, $vsym;
print OUT "__asm__(\".symver $vsym,$sym$at$ver\");\n";
- print OUT "void $vsym() { segv(); }\n" unless $weak;
- print OUT "void $vsym() __attribute__ ((weak, alias (\"segv\")));\n" if $weak;
+ $sym=$vsym;
}
- else
+ if($type eq 'FUNC')
{
- print OUT "void $sym() { segv(); }\n" unless $weak;
- print OUT "void $sym() __attribute__ ((weak, alias (\"segv\")));\n" if $weak;
+ print OUT "void $sym() { segv(); }\n" if $bind eq 'GLOBAL';;
+ print OUT "void $sym() __attribute__ ((weak, alias (\"segv\")));\n" if $bind eq 'WEAK';
}
+ elsif($type eq 'OBJECT')
+ {
+ print OUT "__attribute__ ((weak)) " if $bind eq 'WEAK';
+
+ if($sectlist{$sect} eq '.rodata')
+ {
+ print OUT "const char $sym\[$size\]={1};\n";
+ }
+ elsif($sectlist{$sect} eq '.data.rel.ro')
+ {
+ print OUT "char* const $sym\[$size/sizeof(void*)\]={array};\n";
+ }
+ elsif($sectlist{$sect} eq '.data')
+ {
+ print OUT "char $sym\[$size\]={1};\n";
+ }
+ elsif($sectlist{$sect} eq '.bss')
+ {
+ print OUT "char $sym\[$size\];\n";
+ }
+ }
}
close IN;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2009-04-25 14:12:54
|
Revision: 835
http://xqf.svn.sourceforge.net/xqf/?rev=835&view=rev
Author: l-n
Date: 2009-04-25 14:12:53 +0000 (Sat, 25 Apr 2009)
Log Message:
-----------
increase buffer size for qstat version check
Modified Paths:
--------------
trunk/xqf/src/utils.c
Modified: trunk/xqf/src/utils.c
===================================================================
--- trunk/xqf/src/utils.c 2009-01-11 19:58:14 UTC (rev 834)
+++ trunk/xqf/src/utils.c 2009-04-25 14:12:53 UTC (rev 835)
@@ -1053,7 +1053,7 @@
if (conn.fd<0||conn.pid<=0)
return FALSE;
- conn.bufsize = 512;
+ conn.bufsize = 1024;
conn.buf = g_new0(char,conn.bufsize);
conn.result = FALSE;
conn.do_quit = TRUE;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2009-01-11 19:58:20
|
Revision: 834
http://xqf.svn.sourceforge.net/xqf/?rev=834&view=rev
Author: l-n
Date: 2009-01-11 19:58:14 +0000 (Sun, 11 Jan 2009)
Log Message:
-----------
don't switch q3 server to iourt if iourt isn't configured
Modified Paths:
--------------
trunk/xqf/src/game.c
Modified: trunk/xqf/src/game.c
===================================================================
--- trunk/xqf/src/game.c 2008-11-23 19:42:30 UTC (rev 833)
+++ trunk/xqf/src/game.c 2009-01-11 19:58:14 UTC (rev 834)
@@ -1531,7 +1531,7 @@
{
s->type=TREMULOUS_SERVER;
}
- else if(!strncmp(info_ptr[1],"ioq3 1.35urt",12))
+ else if(games[IOURT_SERVER].cmd && !strncmp(info_ptr[1],"ioq3 1.35urt",12))
{
s->type=IOURT_SERVER;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-11-23 19:42:34
|
Revision: 833
http://xqf.svn.sourceforge.net/xqf/?rev=833&view=rev
Author: l-n
Date: 2008-11-23 19:42:30 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
bump version to 1.0.5.2
Modified Paths:
--------------
trunk/xqf/configure.in
Modified: trunk/xqf/configure.in
===================================================================
--- trunk/xqf/configure.in 2008-11-23 16:58:10 UTC (rev 832)
+++ trunk/xqf/configure.in 2008-11-23 19:42:30 UTC (rev 833)
@@ -3,7 +3,7 @@
# Initially written by Markus Fischer <mfi...@jo...>
#
-AC_INIT([XQF],[1.0.5.1],[xqf...@li...], [xqf])
+AC_INIT([XQF],[1.0.5.2],[xqf...@li...], [xqf])
AC_CONFIG_SRCDIR([src/xqf.c])
AC_PREREQ(2.52)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-11-23 16:58:12
|
Revision: 832
http://xqf.svn.sourceforge.net/xqf/?rev=832&view=rev
Author: l-n
Date: 2008-11-23 16:58:10 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
merge qstat.cfg from qstat
Modified Paths:
--------------
trunk/xqf/src/qstat.cfg
Modified: trunk/xqf/src/qstat.cfg
===================================================================
--- trunk/xqf/src/qstat.cfg 2008-11-23 16:55:17 UTC (rev 831)
+++ trunk/xqf/src/qstat.cfg 2008-11-23 16:58:10 UTC (rev 832)
@@ -136,11 +136,19 @@
name = Call of Duty 4 Master
default port = 20810
template var = COD4MASTER
- master protocol = 2
+ master protocol = 6
master for gametype = COD4S
master query = full empty
end
+# Config for Call of Duty Word at War
+gametype WAWS new extend Q3S
+ name = Call of Duty World at War
+ default port = 28960
+ template var = CALLOFDUTYWAW
+ game rule = gametype
+end
+
# enemy territory
gametype WOETS new extend Q3S
name = Enemy Territory
@@ -250,6 +258,14 @@
master for gametype = PREYS
end
+gametype UT3S new extend GS4
+ name = UT3
+ default port = 6500
+ template var = UT3
+end
+
+
+# ioq3 fork
gametype OPENARENAS new extend Q3S
name = OpenArena
template var = OPENARENA
@@ -266,6 +282,7 @@
master for gametype = OPENARENAS
end
+# ioq3 fork
gametype IOURTS new extend Q3S
name = ioUrbanTerror
template var = IOURT
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-11-23 16:55:22
|
Revision: 831
http://xqf.svn.sourceforge.net/xqf/?rev=831&view=rev
Author: l-n
Date: 2008-11-23 16:55:17 +0000 (Sun, 23 Nov 2008)
Log Message:
-----------
add ioUrbanTerror as separate game
Modified Paths:
--------------
trunk/xqf/ChangeLog
trunk/xqf/src/game.c
trunk/xqf/src/games.c
trunk/xqf/src/games.xml
trunk/xqf/src/pixmaps.c
trunk/xqf/src/pref.c
trunk/xqf/src/qstat.cfg
trunk/xqf/src/source.c
trunk/xqf/src/xqf.h
Added Paths:
-----------
trunk/xqf/src/xpm/iourt.xpm
Modified: trunk/xqf/ChangeLog
===================================================================
--- trunk/xqf/ChangeLog 2008-09-19 15:14:37 UTC (rev 830)
+++ trunk/xqf/ChangeLog 2008-11-23 16:55:17 UTC (rev 831)
@@ -1,3 +1,7 @@
+Nov 23, 2008: Ludwig Nussel <l-...@us...>
+- add ioUrbanTerror as separate game
+ (#2330187, patch by Alexander Hambalgo)
+
Sep 13, 2008: Ludwig Nussel <l-...@us...>
- add OpenArena as separate game
Modified: trunk/xqf/src/game.c
===================================================================
--- trunk/xqf/src/game.c 2008-09-19 15:14:37 UTC (rev 830)
+++ trunk/xqf/src/game.c 2008-11-23 16:55:17 UTC (rev 831)
@@ -170,6 +170,7 @@
static struct quake_private warsow_private;
static struct quake_private tremulous_private;
static struct quake_private openarena_private;
+static struct quake_private iourt_private;
#include "games.c"
@@ -1442,6 +1443,15 @@
}
};
+struct q3a_gametype_s iourt_gametype_map[] =
+{
+ {
+ "q3ut4",
+ q3a_ut3_gametypes,
+ MAX_Q3A_UT3_TYPES
+ }
+};
+
void q3_decode_gametype (struct server *s, struct q3a_gametype_s map[])
{
char *endptr;
@@ -1521,7 +1531,10 @@
{
s->type=TREMULOUS_SERVER;
}
-
+ else if(!strncmp(info_ptr[1],"ioq3 1.35urt",12))
+ {
+ s->type=IOURT_SERVER;
+ }
break;
}
}
@@ -1629,7 +1642,11 @@
{
q3_decode_gametype( s, jk3_gametype_map );
}
-
+ else if ( s->type == IOURT_SERVER)
+ {
+ q3_decode_gametype( s, iourt_gametype_map );
+ }
+
}
}
Modified: trunk/xqf/src/games.c
===================================================================
--- trunk/xqf/src/games.c 2008-09-19 15:14:37 UTC (rev 830)
+++ trunk/xqf/src/games.c 2008-11-23 16:55:17 UTC (rev 831)
@@ -50,6 +50,8 @@
static char* stringlist048[] = { "baseq3", NULL };
static char* stringlist049[] = { "openarena", NULL };
static char* stringlist050[] = { "openttd", NULL };
+static char* stringlist051[] = { "q3ut4", NULL };
+static char* stringlist052[] = { "ioUrbanTerror", NULL };
struct game games[] = {
{
type : Q1_SERVER,
@@ -1028,6 +1030,38 @@
command : stringlist050,
},
{
+ type : IOURT_SERVER,
+ flags : GAME_CONNECT | GAME_PASSWORD | GAME_RCON | GAME_QUAKE3_MASTERPROTOCOL | GAME_Q3COLORS,
+ name : "ioUrbanTerror",
+ default_port : 27960,
+ default_master_port : 27950,
+ id : "IOURTS",
+ qstat_str : "IOURTS",
+ qstat_option : "-iourts",
+ qstat_master_option : "-iourtm",
+ icon : "iourt.xpm",
+ parse_player : q3_parse_player,
+ parse_server : quake_parse_server,
+ analyze_serverinfo : q3_analyze_serverinfo,
+ config_is_valid : config_is_valid_generic,
+ exec_client : q3_exec,
+ custom_cfgs : quake_custom_cfgs,
+ save_info : quake_save_info,
+ init_maps : q3_init_maps,
+ has_map : quake_has_map,
+ get_mapshot : q3_get_mapshot,
+ arch_identifier : "version",
+ identify_cpu : identify_cpu,
+ identify_os : identify_os,
+ cmd_or_dir_changed : tremulous_cmd_or_dir_changed,
+ prefs_load : q3_prefs_load_common,
+ update_prefs : tremulous_update_prefs,
+ default_home : "~/.ioUrbanTerror",
+ pd : &iourt_private,
+ main_mod : stringlist051,
+ command : stringlist052,
+ },
+ {
type : GPS_SERVER,
flags : GAME_CONNECT,
name : "Generic Gamespy",
Modified: trunk/xqf/src/games.xml
===================================================================
--- trunk/xqf/src/games.xml 2008-09-19 15:14:37 UTC (rev 830)
+++ trunk/xqf/src/games.xml 2008-11-23 16:55:17 UTC (rev 831)
@@ -781,6 +781,24 @@
<default_home>~/.openttd</default_home>
</game>
<game>
+ <base>Q3_SERVER</base>
+ <type>IOURT_SERVER</type>
+ <name>ioUrbanTerror</name>
+ <id>IOURTS</id>
+ <qstat_str>IOURTS</qstat_str>
+ <qstat_option>-iourts</qstat_option>
+ <qstat_master_option>-iourtm</qstat_master_option>
+ <icon>iourt.xpm</icon>
+ <config_is_valid>config_is_valid_generic</config_is_valid>
+ <command>ioUrbanTerror</command>
+ <default_home>~/.ioUrbanTerror</default_home>
+ <cmd_or_dir_changed>tremulous_cmd_or_dir_changed</cmd_or_dir_changed>
+ <prefs_load>q3_prefs_load_common</prefs_load>
+ <update_prefs>tremulous_update_prefs</update_prefs>
+ <main_mod>q3ut4</main_mod>
+ <pd>iourt_private</pd>
+ </game>
+ <game>
<type>GPS_SERVER</type>
<name>Generic Gamespy</name>
<flags>GAME_CONNECT</flags>
Modified: trunk/xqf/src/pixmaps.c
===================================================================
--- trunk/xqf/src/pixmaps.c 2008-09-19 15:14:37 UTC (rev 830)
+++ trunk/xqf/src/pixmaps.c 2008-11-23 16:55:17 UTC (rev 831)
@@ -83,6 +83,7 @@
#include "xpm/etqw.xpm"
#include "xpm/openttd.xpm"
#include "xpm/openarena.xpm"
+#include "xpm/iourt.xpm"
#include "xpm/green-plus.xpm"
#include "xpm/red-minus.xpm"
Modified: trunk/xqf/src/pref.c
===================================================================
--- trunk/xqf/src/pref.c 2008-09-19 15:14:37 UTC (rev 830)
+++ trunk/xqf/src/pref.c 2008-11-23 16:55:17 UTC (rev 831)
@@ -492,6 +492,18 @@
defproto : "70",
};
+static const char* iourt_masterprotocols[] = {
+ "auto",
+ "68 - v1.35",
+ NULL
+};
+
+static struct q3_common_prefs_s iourt_prefs =
+{
+ protocols: iourt_masterprotocols,
+ defproto : "68",
+};
+
static struct q3_common_prefs_s* get_pref_widgets_for_game(enum server_type type);
static void game_file_dialog(enum server_type type);
@@ -3126,6 +3138,7 @@
case WARSOW_SERVER: return &warsow_prefs;
case TREMULOUS_SERVER: return &tremulous_prefs;
case OPENARENA_SERVER: return &openarena_prefs;
+ case IOURT_SERVER: return &iourt_prefs;
default: xqf_error("need to define preferences"); return NULL;
}
}
@@ -4691,6 +4704,7 @@
new_genprefs[WARSOW_SERVER].add_options_to_notebook = add_q3_options_to_notebook;
new_genprefs[TREMULOUS_SERVER].add_options_to_notebook = add_q3_options_to_notebook;
new_genprefs[OPENARENA_SERVER].add_options_to_notebook = add_q3_options_to_notebook;
+ new_genprefs[IOURT_SERVER].add_options_to_notebook = add_q3_options_to_notebook;
for (i = 0; i < GAMES_TOTAL; i++) {
new_genprefs[i].pref_dir = g_strdup (games[i].dir);
Modified: trunk/xqf/src/qstat.cfg
===================================================================
--- trunk/xqf/src/qstat.cfg 2008-09-19 15:14:37 UTC (rev 830)
+++ trunk/xqf/src/qstat.cfg 2008-11-23 16:55:17 UTC (rev 831)
@@ -265,3 +265,19 @@
master query = empty full
master for gametype = OPENARENAS
end
+
+gametype IOURTS new extend Q3S
+ name = ioUrbanTerror
+ template var = IOURT
+ game rule = gamename
+end
+
+gametype IOURTM new extend Q3M
+ name = ioUrbanTerror Master
+ template var = IOURTMASTER
+ default port = 27950
+ master packet = \377\377\377\377getservers %s %s
+ master protocol = 68
+ master query = empty full
+ master for gametype = IOURTS
+end
Modified: trunk/xqf/src/source.c
===================================================================
--- trunk/xqf/src/source.c 2008-09-19 15:14:37 UTC (rev 830)
+++ trunk/xqf/src/source.c 2008-11-23 16:55:17 UTC (rev 831)
@@ -1057,7 +1057,10 @@
"ADD Q2S master://master.planetgloom.com gloom",
"ADD Q3S master://master3.idsoftware.com id",
- "ADD Q3S master://master.urbanterror.net Urban Terror",
+/* removed, because it's added as IOURT_Master and all q3ut4 servers are also in IDs Q3 Master by default
+ * "ADD Q3S master://master.urbanterror.net Urban Terror",
+ */
+
// "ADD Q3S master://q3master.splatterworld.de Germany",
// "ADD Q3S master://q3.golsyd.net.au Australia",
"DELETE Q3S master://q3master.barrysworld.com:27950 BarrysWorld", // doesn't work (26.09.2004)
@@ -1165,6 +1168,7 @@
"ADD OPENARENAS master://dpmaster.deathmask.net dpmaster.deathmask.net",
"ADD OTTDS master://master.openttd.org OpenTTD",
+ "ADD IOURTS master://master.urbanterror.net ioUrbanTerror",
"ADD QS lan://255.255.255.255 LAN",
"ADD QWS lan://255.255.255.255 LAN",
Added: trunk/xqf/src/xpm/iourt.xpm
===================================================================
--- trunk/xqf/src/xpm/iourt.xpm (rev 0)
+++ trunk/xqf/src/xpm/iourt.xpm 2008-11-23 16:55:17 UTC (rev 831)
@@ -0,0 +1,195 @@
+/* XPM */
+static char * iourt_xpm[] = {
+"17 17 175 2",
+" c None",
+". c #353F4B",
+"+ c #212D40",
+"@ c #3B4D6A",
+"# c #A3A3A3",
+"$ c #A0A0A0",
+"% c #848484",
+"& c #1D4481",
+"* c #113B7D",
+"= c #204682",
+"- c #1F4683",
+"; c #294C86",
+"> c #999B9C",
+", c #000000",
+"' c #426393",
+") c #456493",
+"! c #456393",
+"~ c #446191",
+"{ c #446392",
+"] c #446393",
+"^ c #436392",
+"/ c #446293",
+"( c #436193",
+"_ c #6981A2",
+": c #A6A6A6",
+"< c #778295",
+"[ c #0C3279",
+"} c #00286F",
+"| c #002970",
+"1 c #002870",
+"2 c #3D5B8D",
+"3 c #002873",
+"4 c #00246E",
+"5 c #00296F",
+"6 c #00286E",
+"7 c #163B7B",
+"8 c #A2A2A2",
+"9 c #A6A4A1",
+"0 c #0E3074",
+"a c #00296B",
+"b c #002A6B",
+"c c #00296D",
+"d c #062D6F",
+"e c #A5A29E",
+"f c #B6B4B0",
+"g c #7B8699",
+"h c #0B3171",
+"i c #00296A",
+"j c #00286C",
+"k c #21437C",
+"l c #A4A4A4",
+"m c #A8A7A5",
+"n c #05296D",
+"o c #002665",
+"p c #00266A",
+"q c #002864",
+"r c #284579",
+"s c #9D9D9C",
+"t c #A9A9A9",
+"u c #9C9C9A",
+"v c #072C6B",
+"w c #002767",
+"x c #002667",
+"y c #1D3E74",
+"z c #9C9C9D",
+"A c #BBBBBB",
+"B c #B6B6B7",
+"C c #A6A7A9",
+"D c #354F77",
+"E c #002562",
+"F c #002160",
+"G c #7B8596",
+"H c #7E8793",
+"I c #002761",
+"J c #00215E",
+"K c #334D7D",
+"L c #A1A09D",
+"M c #A4A5A5",
+"N c #A8A8A8",
+"O c #ABABAB",
+"P c #495C7F",
+"Q c #00225C",
+"R c #0D2E66",
+"S c #A5A29F",
+"T c #9C9C9C",
+"U c #122E64",
+"V c #00245B",
+"W c #556889",
+"X c #9E9D9B",
+"Y c #A7A7A7",
+"Z c #9A9A9A",
+"` c #B7B7B7",
+" . c #B6B6B6",
+".. c #A1A1A1",
+"+. c #A5A5A5",
+"@. c #667389",
+"#. c #001D56",
+"$. c #3E5476",
+"%. c #9D9D9D",
+"&. c #929394",
+"*. c #022859",
+"=. c #5E728C",
+"-. c #9E9D9C",
+";. c #AAAAAA",
+">. c #A4A3A3",
+",. c #9B9B9B",
+"'. c #D5D5D5",
+"). c #9F9F9F",
+"!. c #828793",
+"~. c #00174F",
+"{. c #4C5E7F",
+"]. c #A0A5A7",
+"^. c #A1A1A0",
+"/. c #697685",
+"(. c #788195",
+"_. c #A5A6A7",
+":. c #8F97A3",
+"<. c #979799",
+"[. c #19325A",
+"}. c #9E9E9E",
+"|. c #9E9D9F",
+"1. c #092855",
+"2. c #B1AFAA",
+"3. c #A3A4A7",
+"4. c #8B929E",
+"5. c #032050",
+"6. c #001D50",
+"7. c #9DA0A8",
+"8. c #8E959E",
+"9. c #657182",
+"0. c #011D50",
+"a. c #102B55",
+"b. c #ACAAA6",
+"c. c #011D4C",
+"d. c #041E4C",
+"e. c #294061",
+"f. c #6A7484",
+"g. c #001B48",
+"h. c #001A4B",
+"i. c #011B4C",
+"j. c #545E74",
+"k. c #001A4A",
+"l. c #001E4A",
+"m. c #102751",
+"n. c #B8B8B8",
+"o. c #7F8693",
+"p. c #7F8792",
+"q. c #112951",
+"r. c #001845",
+"s. c #001944",
+"t. c #001641",
+"u. c #001A45",
+"v. c #001C44",
+"w. c #001544",
+"x. c #001A44",
+"y. c #0E244B",
+"z. c #A3A3A5",
+"A. c #85878D",
+"B. c #1E3252",
+"C. c #001841",
+"D. c #001940",
+"E. c #001A41",
+"F. c #001642",
+"G. c #001741",
+"H. c #001941",
+"I. c #001740",
+"J. c #0E2346",
+"K. c #061A3C",
+"L. c #03173C",
+"M. c #081D3F",
+"N. c #091D40",
+"O. c #091E40",
+"P. c #091C40",
+"Q. c #091C3F",
+"R. c #182647",
+". + @ ",
+"# $ % & * = - ; ",
+"> , , ' ) ! ~ { ] ^ ) / / ( _ ",
+": < [ } | } 1 2 3 4 | 5 6 | 7 ",
+"8 9 0 a b c d e f g h i j a k ",
+"l m n o p q r s t u v w x y z : ",
+"A B C D E F G l # H I J K L M N : ",
+"O : $ P Q R S O T U V W X Y : Z ` ",
+" ...+.@.#.$.%.t &.*.=.-.;.>.,. ",
+"'.).: !.~.{.].^./.(._.:.$ <.[. ",
+" }.Y |.1.2.3.4.5.6.7.8.9.0.a. ",
+" Z ;.b.c.d.e.f.g.h.i.j.k.l.m. ",
+" n.o.p.q.r.s.t.u.v.v.w.x.x.y. ",
+" }.z.A.B.C.D.E.F.G.H.C.I.C.J. ",
+" K.L.M.N.O.N.N.O.P.N.O.Q.R. ",
+" ",
+" "};
Modified: trunk/xqf/src/xqf.h
===================================================================
--- trunk/xqf/src/xqf.h 2008-09-19 15:14:37 UTC (rev 830)
+++ trunk/xqf/src/xqf.h 2008-11-23 16:55:17 UTC (rev 831)
@@ -138,6 +138,7 @@
TREMULOUS_SERVER,
OPENARENA_SERVER,
OTTD_SERVER,
+ IOURT_SERVER,
GPS_SERVER,
UNKNOWN_SERVER
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-09-14 13:48:01
|
Revision: 829
http://xqf.svn.sourceforge.net/xqf/?rev=829&view=rev
Author: l-n
Date: 2008-09-14 13:48:12 +0000 (Sun, 14 Sep 2008)
Log Message:
-----------
add openarena icon
Modified Paths:
--------------
trunk/xqf/src/games.c
trunk/xqf/src/games.xml
trunk/xqf/src/pixmaps.c
Added Paths:
-----------
trunk/xqf/src/xpm/openarena.xpm
Modified: trunk/xqf/src/games.c
===================================================================
--- trunk/xqf/src/games.c 2008-09-13 18:17:31 UTC (rev 828)
+++ trunk/xqf/src/games.c 2008-09-14 13:48:12 UTC (rev 829)
@@ -977,14 +977,14 @@
{
type : OPENARENA_SERVER,
flags : GAME_CONNECT | GAME_PASSWORD | GAME_RCON | GAME_QUAKE3_MASTERPROTOCOL | GAME_Q3COLORS,
- name : "Open Arena",
+ name : "OpenArena",
default_port : 27960,
default_master_port : 27950,
id : "OPENARENAS",
qstat_str : "OPENARENAS",
qstat_option : "-openarenas",
qstat_master_option : "-openarenam",
- icon : "quake3.xpm",
+ icon : "openarena.xpm",
parse_player : q3_parse_player,
parse_server : quake_parse_server,
analyze_serverinfo : q3_analyze_serverinfo,
Modified: trunk/xqf/src/games.xml
===================================================================
--- trunk/xqf/src/games.xml 2008-09-13 18:17:31 UTC (rev 828)
+++ trunk/xqf/src/games.xml 2008-09-14 13:48:12 UTC (rev 829)
@@ -746,7 +746,7 @@
<game>
<base>Q3_SERVER</base>
<type>OPENARENA_SERVER</type>
- <name>Open Arena</name>
+ <name>OpenArena</name>
<id>OPENARENAS</id>
<qstat_str>OPENARENAS</qstat_str>
<qstat_option>-openarenas</qstat_option>
Modified: trunk/xqf/src/pixmaps.c
===================================================================
--- trunk/xqf/src/pixmaps.c 2008-09-13 18:17:31 UTC (rev 828)
+++ trunk/xqf/src/pixmaps.c 2008-09-14 13:48:12 UTC (rev 829)
@@ -82,6 +82,7 @@
#include "xpm/doom3.xpm"
#include "xpm/etqw.xpm"
#include "xpm/openttd.xpm"
+#include "xpm/openarena.xpm"
#include "xpm/green-plus.xpm"
#include "xpm/red-minus.xpm"
Added: trunk/xqf/src/xpm/openarena.xpm
===================================================================
--- trunk/xqf/src/xpm/openarena.xpm (rev 0)
+++ trunk/xqf/src/xpm/openarena.xpm 2008-09-14 13:48:12 UTC (rev 829)
@@ -0,0 +1,28 @@
+/* XPM */
+static char *openarena_xpm[] = {
+/* columns rows colors chars-per-pixel */
+"16 16 6 1",
+" c #003D8E",
+". c #0420AC",
+"X c #003DE4",
+"o c #0082F6",
+"O c #A2FEFE",
+"+ c None",
+/* pixels */
+"++++++++++++++++",
+"++++++++++++++++",
+"++++++++++++++++",
+"+++ X. X .X ++++",
+"+oX++++O++++Xo++",
+"o+++++o+o+++++o+",
+"+oX+++X+X+++Xo++",
+"+++Xoo+++ooX++++",
+"+++++o+o+o++++++",
+"+++++X+X+X++++++",
+"+++++ +++ ++++++",
+"++++X+++++X+++++",
+"++++++++++++++++",
+"++++++++++++++++",
+"++++++++++++++++",
+"++++++++++++++++"
+};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-09-13 18:17:21
|
Revision: 828
http://xqf.svn.sourceforge.net/xqf/?rev=828&view=rev
Author: l-n
Date: 2008-09-13 18:17:31 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
add OpenArena as separate gamadd OpenArena as separate gamee
Modified Paths:
--------------
trunk/xqf/ChangeLog
trunk/xqf/src/game.c
trunk/xqf/src/games.c
trunk/xqf/src/games.xml
trunk/xqf/src/pref.c
trunk/xqf/src/qstat.cfg
trunk/xqf/src/source.c
trunk/xqf/src/xqf.h
Modified: trunk/xqf/ChangeLog
===================================================================
--- trunk/xqf/ChangeLog 2008-09-13 18:17:00 UTC (rev 827)
+++ trunk/xqf/ChangeLog 2008-09-13 18:17:31 UTC (rev 828)
@@ -1,3 +1,6 @@
+Sep 13, 2008: Ludwig Nussel <l-...@us...>
+- add OpenArena as separate game
+
Jan 13, 2008: Ludwig Nussel <l-...@us...>
- add master for OpenArena (#1869975)
- add support for OpenTTD (#1254682)
Modified: trunk/xqf/src/game.c
===================================================================
--- trunk/xqf/src/game.c 2008-09-13 18:17:00 UTC (rev 827)
+++ trunk/xqf/src/game.c 2008-09-13 18:17:31 UTC (rev 828)
@@ -169,6 +169,7 @@
static struct quake_private etqw_private;
static struct quake_private warsow_private;
static struct quake_private tremulous_private;
+static struct quake_private openarena_private;
#include "games.c"
Modified: trunk/xqf/src/games.c
===================================================================
--- trunk/xqf/src/games.c 2008-09-13 18:17:00 UTC (rev 827)
+++ trunk/xqf/src/games.c 2008-09-13 18:17:31 UTC (rev 828)
@@ -47,7 +47,9 @@
static char* stringlist045[] = { "warsow", NULL };
static char* stringlist046[] = { "base", NULL };
static char* stringlist047[] = { "tremulous", NULL };
-static char* stringlist048[] = { "openttd", NULL };
+static char* stringlist048[] = { "baseq3", NULL };
+static char* stringlist049[] = { "openarena", NULL };
+static char* stringlist050[] = { "openttd", NULL };
struct game games[] = {
{
type : Q1_SERVER,
@@ -973,6 +975,38 @@
command : stringlist047,
},
{
+ type : OPENARENA_SERVER,
+ flags : GAME_CONNECT | GAME_PASSWORD | GAME_RCON | GAME_QUAKE3_MASTERPROTOCOL | GAME_Q3COLORS,
+ name : "Open Arena",
+ default_port : 27960,
+ default_master_port : 27950,
+ id : "OPENARENAS",
+ qstat_str : "OPENARENAS",
+ qstat_option : "-openarenas",
+ qstat_master_option : "-openarenam",
+ icon : "quake3.xpm",
+ parse_player : q3_parse_player,
+ parse_server : quake_parse_server,
+ analyze_serverinfo : q3_analyze_serverinfo,
+ config_is_valid : config_is_valid_generic,
+ exec_client : q3_exec,
+ custom_cfgs : quake_custom_cfgs,
+ save_info : quake_save_info,
+ init_maps : q3_init_maps,
+ has_map : quake_has_map,
+ get_mapshot : q3_get_mapshot,
+ arch_identifier : "version",
+ identify_cpu : identify_cpu,
+ identify_os : identify_os,
+ cmd_or_dir_changed : tremulous_cmd_or_dir_changed,
+ prefs_load : q3_prefs_load_common,
+ update_prefs : tremulous_update_prefs,
+ default_home : "~/.openarena",
+ pd : &openarena_private,
+ main_mod : stringlist048,
+ command : stringlist049,
+ },
+ {
type : OTTD_SERVER,
flags : GAME_CONNECT,
name : "OpenTTD",
@@ -991,7 +1025,7 @@
custom_cfgs : quake_custom_cfgs,
save_info : quake_save_info,
default_home : "~/.openttd",
- command : stringlist048,
+ command : stringlist050,
},
{
type : GPS_SERVER,
Modified: trunk/xqf/src/games.xml
===================================================================
--- trunk/xqf/src/games.xml 2008-09-13 18:17:00 UTC (rev 827)
+++ trunk/xqf/src/games.xml 2008-09-13 18:17:31 UTC (rev 828)
@@ -744,6 +744,24 @@
<pd>tremulous_private</pd>
</game>
<game>
+ <base>Q3_SERVER</base>
+ <type>OPENARENA_SERVER</type>
+ <name>Open Arena</name>
+ <id>OPENARENAS</id>
+ <qstat_str>OPENARENAS</qstat_str>
+ <qstat_option>-openarenas</qstat_option>
+ <qstat_master_option>-openarenam</qstat_master_option>
+ <icon>openarena.xpm</icon>
+ <config_is_valid>config_is_valid_generic</config_is_valid>
+ <command>openarena</command>
+ <default_home>~/.openarena</default_home>
+ <cmd_or_dir_changed>tremulous_cmd_or_dir_changed</cmd_or_dir_changed>
+ <prefs_load>q3_prefs_load_common</prefs_load>
+ <update_prefs>tremulous_update_prefs</update_prefs>
+ <main_mod>baseq3</main_mod>
+ <pd>openarena_private</pd>
+ </game>
+ <game>
<type>OTTD_SERVER</type>
<flags>GAME_CONNECT</flags>
<name>OpenTTD</name>
Modified: trunk/xqf/src/pref.c
===================================================================
--- trunk/xqf/src/pref.c 2008-09-13 18:17:00 UTC (rev 827)
+++ trunk/xqf/src/pref.c 2008-09-13 18:17:31 UTC (rev 828)
@@ -480,7 +480,18 @@
defproto : "69",
};
+static const char* openarena_masterprotocols[] = {
+ "auto",
+ "70 - v0.8.0",
+ NULL
+};
+static struct q3_common_prefs_s openarena_prefs =
+{
+ protocols: openarena_masterprotocols,
+ defproto : "70",
+};
+
static struct q3_common_prefs_s* get_pref_widgets_for_game(enum server_type type);
static void game_file_dialog(enum server_type type);
@@ -3114,6 +3125,7 @@
case NEXUIZ_SERVER: return &nexuiz_prefs;
case WARSOW_SERVER: return &warsow_prefs;
case TREMULOUS_SERVER: return &tremulous_prefs;
+ case OPENARENA_SERVER: return &openarena_prefs;
default: xqf_error("need to define preferences"); return NULL;
}
}
@@ -4678,6 +4690,7 @@
new_genprefs[NEXUIZ_SERVER].add_options_to_notebook = add_q3_options_to_notebook;
new_genprefs[WARSOW_SERVER].add_options_to_notebook = add_q3_options_to_notebook;
new_genprefs[TREMULOUS_SERVER].add_options_to_notebook = add_q3_options_to_notebook;
+ new_genprefs[OPENARENA_SERVER].add_options_to_notebook = add_q3_options_to_notebook;
for (i = 0; i < GAMES_TOTAL; i++) {
new_genprefs[i].pref_dir = g_strdup (games[i].dir);
Modified: trunk/xqf/src/qstat.cfg
===================================================================
--- trunk/xqf/src/qstat.cfg 2008-09-13 18:17:00 UTC (rev 827)
+++ trunk/xqf/src/qstat.cfg 2008-09-13 18:17:31 UTC (rev 828)
@@ -250,3 +250,18 @@
master for gametype = PREYS
end
+gametype OPENARENAS new extend Q3S
+ name = OpenArena
+ template var = OPENARENA
+ game rule = gamename
+end
+
+gametype OPENARENAM new extend Q3M
+ name = OpenArena Master
+ template var = OPENARENAMASTER
+ default port = 27950
+ master packet = \377\377\377\377getservers %s %s
+ master protocol = 70
+ master query = empty full
+ master for gametype = OPENARENAS
+end
Modified: trunk/xqf/src/source.c
===================================================================
--- trunk/xqf/src/source.c 2008-09-13 18:17:00 UTC (rev 827)
+++ trunk/xqf/src/source.c 2008-09-13 18:17:31 UTC (rev 828)
@@ -1162,6 +1162,8 @@
"ADD TREMULOUS master://master.tremulous.net:30710 tremulous.net",
+ "ADD OPENARENAS master://dpmaster.deathmask.net dpmaster.deathmask.net",
+
"ADD OTTDS master://master.openttd.org OpenTTD",
"ADD QS lan://255.255.255.255 LAN",
Modified: trunk/xqf/src/xqf.h
===================================================================
--- trunk/xqf/src/xqf.h 2008-09-13 18:17:00 UTC (rev 827)
+++ trunk/xqf/src/xqf.h 2008-09-13 18:17:31 UTC (rev 828)
@@ -136,6 +136,7 @@
NEXUIZ_SERVER,
WARSOW_SERVER,
TREMULOUS_SERVER,
+ OPENARENA_SERVER,
OTTD_SERVER,
GPS_SERVER,
UNKNOWN_SERVER
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-09-13 18:16:49
|
Revision: 827
http://xqf.svn.sourceforge.net/xqf/?rev=827&view=rev
Author: l-n
Date: 2008-09-13 18:17:00 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
fix installation of flags with build outside source dir
Modified Paths:
--------------
trunk/xqf/pixmaps/flags/Makefile.am
Modified: trunk/xqf/pixmaps/flags/Makefile.am
===================================================================
--- trunk/xqf/pixmaps/flags/Makefile.am 2008-09-13 18:16:41 UTC (rev 826)
+++ trunk/xqf/pixmaps/flags/Makefile.am 2008-09-13 18:17:00 UTC (rev 827)
@@ -1,4 +1,4 @@
EXTRA_DIST = $(flag_DATA)
flagdir = $(pkgdatadir)/default/flags
-flag_DATA = $(wildcard *.png)
+flag_DATA = $(wildcard $(srcdir)/*.png)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-09-13 18:16:30
|
Revision: 826
http://xqf.svn.sourceforge.net/xqf/?rev=826&view=rev
Author: l-n
Date: 2008-09-13 18:16:41 +0000 (Sat, 13 Sep 2008)
Log Message:
-----------
fix crash with 24bit images
Modified Paths:
--------------
trunk/xqf/src/tga/memtopixmap.c
Modified: trunk/xqf/src/tga/memtopixmap.c
===================================================================
--- trunk/xqf/src/tga/memtopixmap.c 2008-01-24 20:52:43 UTC (rev 825)
+++ trunk/xqf/src/tga/memtopixmap.c 2008-09-13 18:16:41 UTC (rev 826)
@@ -214,6 +214,13 @@
printf("%d(%d)x%d %d\n", w, rs, h, c);
pos = rgbbuf = g_new0(guchar, h*w*3);
+
+ if(c != 3 && c != 4)
+ {
+ fprintf(stderr, "color depth %d not supported\n", c);
+ return;
+ }
+
buf = gdk_pixbuf_get_pixels (pixbuf);
for(y=0; y < h; ++y)
{
@@ -222,7 +229,8 @@
*pos++ = *buf++;
*pos++ = *buf++;
*pos++ = *buf++;
- buf++;
+ if(c == 4)
+ buf++;
}
if(x*c<rs)
{
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-01-24 20:52:47
|
Revision: 825
http://xqf.svn.sourceforge.net/xqf/?rev=825&view=rev
Author: l-n
Date: 2008-01-24 12:52:43 -0800 (Thu, 24 Jan 2008)
Log Message:
-----------
cvs -> svn
Modified Paths:
--------------
trunk/xqf/mktarsnapshot
Modified: trunk/xqf/mktarsnapshot
===================================================================
--- trunk/xqf/mktarsnapshot 2008-01-23 21:36:41 UTC (rev 824)
+++ trunk/xqf/mktarsnapshot 2008-01-24 20:52:43 UTC (rev 825)
@@ -4,7 +4,6 @@
d=xqf-${VERSION}_$DATE
set -e
set -x
-mkdir $d
-cvs export -d $d -r HEAD xqf
+svn export . $d
tar --force-local --owner=root --group=root -cjf $d.tar.bz2 $d
/bin/rm -r $d
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-01-13 21:52:47
|
Revision: 824
http://xqf.svn.sourceforge.net/xqf/?rev=824&view=rev
Author: l-n
Date: 2008-01-13 13:52:53 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
re-add binary files
Added Paths:
-----------
trunk/xqf/pixmaps/splash.png
trunk/xqf/pixmaps/trayicon/around_frame_1.png
trunk/xqf/pixmaps/trayicon/around_frame_2.png
trunk/xqf/pixmaps/trayicon/around_frame_3.png
trunk/xqf/pixmaps/trayicon/around_frame_4.png
trunk/xqf/pixmaps/trayicon/frame_basic.png
trunk/xqf/pixmaps/trayicon/red_frame_4_4.png
trunk/xqf/pixmaps/xqf_22x22.png
trunk/xqf/pixmaps/xqf_32x32.png
trunk/xqf/pixmaps/xqf_48x48.png
trunk/xqf/pixmaps/xqf_48x48_2.png
trunk/xqf/src/xpm/lan.png
trunk/xqf/src/xpm/xqflogo.png
Added: trunk/xqf/pixmaps/splash.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/pixmaps/splash.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/xqf/pixmaps/trayicon/around_frame_1.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/pixmaps/trayicon/around_frame_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/xqf/pixmaps/trayicon/around_frame_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/pixmaps/trayicon/around_frame_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/xqf/pixmaps/trayicon/around_frame_3.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/pixmaps/trayicon/around_frame_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/xqf/pixmaps/trayicon/around_frame_4.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/pixmaps/trayicon/around_frame_4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/xqf/pixmaps/trayicon/frame_basic.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/pixmaps/trayicon/frame_basic.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/xqf/pixmaps/trayicon/red_frame_4_4.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/pixmaps/trayicon/red_frame_4_4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/xqf/pixmaps/xqf_22x22.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/pixmaps/xqf_22x22.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/xqf/pixmaps/xqf_32x32.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/pixmaps/xqf_32x32.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/xqf/pixmaps/xqf_48x48.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/pixmaps/xqf_48x48.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/xqf/pixmaps/xqf_48x48_2.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/pixmaps/xqf_48x48_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/xqf/src/xpm/lan.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/src/xpm/lan.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: trunk/xqf/src/xpm/xqflogo.png
===================================================================
(Binary files differ)
Property changes on: trunk/xqf/src/xpm/xqflogo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-01-13 21:51:57
|
Revision: 823
http://xqf.svn.sourceforge.net/xqf/?rev=823&view=rev
Author: l-n
Date: 2008-01-13 13:52:01 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
remove binary files
Removed Paths:
-------------
trunk/xqf/pixmaps/splash.png
trunk/xqf/pixmaps/trayicon/around_frame_1.png
trunk/xqf/pixmaps/trayicon/around_frame_2.png
trunk/xqf/pixmaps/trayicon/around_frame_3.png
trunk/xqf/pixmaps/trayicon/around_frame_4.png
trunk/xqf/pixmaps/trayicon/frame_basic.png
trunk/xqf/pixmaps/trayicon/red_frame_4_4.png
trunk/xqf/pixmaps/xqf_22x22.png
trunk/xqf/pixmaps/xqf_32x32.png
trunk/xqf/pixmaps/xqf_48x48.png
trunk/xqf/pixmaps/xqf_48x48_2.png
trunk/xqf/src/xpm/lan.png
trunk/xqf/src/xpm/xqflogo.png
Deleted: trunk/xqf/pixmaps/splash.png
===================================================================
(Binary files differ)
Deleted: trunk/xqf/pixmaps/trayicon/around_frame_1.png
===================================================================
(Binary files differ)
Deleted: trunk/xqf/pixmaps/trayicon/around_frame_2.png
===================================================================
(Binary files differ)
Deleted: trunk/xqf/pixmaps/trayicon/around_frame_3.png
===================================================================
(Binary files differ)
Deleted: trunk/xqf/pixmaps/trayicon/around_frame_4.png
===================================================================
(Binary files differ)
Deleted: trunk/xqf/pixmaps/trayicon/frame_basic.png
===================================================================
(Binary files differ)
Deleted: trunk/xqf/pixmaps/trayicon/red_frame_4_4.png
===================================================================
(Binary files differ)
Deleted: trunk/xqf/pixmaps/xqf_22x22.png
===================================================================
(Binary files differ)
Deleted: trunk/xqf/pixmaps/xqf_32x32.png
===================================================================
(Binary files differ)
Deleted: trunk/xqf/pixmaps/xqf_48x48.png
===================================================================
(Binary files differ)
Deleted: trunk/xqf/pixmaps/xqf_48x48_2.png
===================================================================
(Binary files differ)
Deleted: trunk/xqf/src/xpm/lan.png
===================================================================
(Binary files differ)
Deleted: trunk/xqf/src/xpm/xqflogo.png
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-01-13 21:49:44
|
Revision: 822
http://xqf.svn.sourceforge.net/xqf/?rev=822&view=rev
Author: l-n
Date: 2008-01-13 13:49:50 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
set binary mime type
Property Changed:
----------------
trunk/xqf/pixmaps/splash.png
trunk/xqf/pixmaps/trayicon/around_frame_1.png
trunk/xqf/pixmaps/trayicon/around_frame_2.png
trunk/xqf/pixmaps/trayicon/around_frame_3.png
trunk/xqf/pixmaps/trayicon/around_frame_4.png
trunk/xqf/pixmaps/trayicon/frame_basic.png
trunk/xqf/pixmaps/trayicon/red_frame_4_4.png
trunk/xqf/pixmaps/xqf_22x22.png
trunk/xqf/pixmaps/xqf_32x32.png
trunk/xqf/pixmaps/xqf_48x48.png
trunk/xqf/pixmaps/xqf_48x48_2.png
trunk/xqf/src/xpm/lan.png
trunk/xqf/src/xpm/xqflogo.png
Property changes on: trunk/xqf/pixmaps/splash.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/xqf/pixmaps/trayicon/around_frame_1.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/xqf/pixmaps/trayicon/around_frame_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/xqf/pixmaps/trayicon/around_frame_3.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/xqf/pixmaps/trayicon/around_frame_4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/xqf/pixmaps/trayicon/frame_basic.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/xqf/pixmaps/trayicon/red_frame_4_4.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/xqf/pixmaps/xqf_22x22.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/xqf/pixmaps/xqf_32x32.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/xqf/pixmaps/xqf_48x48.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/xqf/pixmaps/xqf_48x48_2.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/xqf/src/xpm/lan.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Property changes on: trunk/xqf/src/xpm/xqflogo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-01-13 21:31:52
|
Revision: 820
http://xqf.svn.sourceforge.net/xqf/?rev=820&view=rev
Author: l-n
Date: 2008-01-13 13:31:57 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
update qstat.cfg
Modified Paths:
--------------
trunk/xqf/src/qstat.cfg
Modified: trunk/xqf/src/qstat.cfg
===================================================================
--- trunk/xqf/src/qstat.cfg 2008-01-13 19:43:30 UTC (rev 819)
+++ trunk/xqf/src/qstat.cfg 2008-01-13 21:31:57 UTC (rev 820)
@@ -90,6 +90,7 @@
status2 packet = \377\377\377\377\002getstatus xxx
end
+# Config for Call of Duty
gametype CODS new extend Q3S
name = Call of Duty
default port = 28960
@@ -106,6 +107,40 @@
master query = full empty
end
+# Config for Call of Duty 2
+gametype COD2S new extend Q3S
+ name = Call of Duty 2
+ default port = 28960
+ template var = CALLOFDUTY2
+ game rule = gamename
+end
+
+gametype COD2M new extend Q3M
+ name = Call of Duty 2 Master
+ default port = 20710
+ template var = COD2MASTER
+ master protocol = 118
+ master for gametype = COD2S
+ master query = full empty
+end
+
+# Config for Call of Duty 4
+gametype COD4S new extend Q3S
+ name = Call of Duty 4
+ default port = 28960
+ template var = CALLOFDUTY4
+ game rule = gamename
+end
+
+gametype COD4M new extend Q3M
+ name = Call of Duty 4 Master
+ default port = 20810
+ template var = COD4MASTER
+ master protocol = 2
+ master for gametype = COD4S
+ master query = full empty
+end
+
# enemy territory
gametype WOETS new extend Q3S
name = Enemy Territory
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-01-13 19:43:25
|
Revision: 819
http://xqf.svn.sourceforge.net/xqf/?rev=819&view=rev
Author: l-n
Date: 2008-01-13 11:43:30 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
remove trails of CVS
Modified Paths:
--------------
trunk/xqf/vc
Modified: trunk/xqf/vc
===================================================================
--- trunk/xqf/vc 2008-01-13 19:43:26 UTC (rev 818)
+++ trunk/xqf/vc 2008-01-13 19:43:30 UTC (rev 819)
@@ -27,12 +27,14 @@
export LANG=en_US.UTF-8
export TZ=UTC
-if [ -r mail ]; then
- mailaddr=`cat mail`
+if [ -r .sflogin ]; then
+ mailaddr=`cat .sflogin`
else
- SFLOGIN=`cat CVS/Root |sed 's/.*:\(.*\)@.*/\1/'`
REALNAME=`getent passwd|awk -v UID=$UID -F : '$3==UID{FS=",";$0=$5;print $1;exit 0}'`
- mailaddr="$REALNAME <$SF...@us...>"
+ mailaddr="$REALNAME <$US...@us...>"
+ echo "please add your name and email to the file '.sflogin', e.g."
+ echo "echo '$mailaddr' > .sflogin"
+ exit 1
fi;
EDITOR=${EDITOR:-vim}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-01-13 19:43:21
|
Revision: 818
http://xqf.svn.sourceforge.net/xqf/?rev=818&view=rev
Author: l-n
Date: 2008-01-13 11:43:26 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
add changelog entry for openttd
Modified Paths:
--------------
trunk/xqf/ChangeLog
Modified: trunk/xqf/ChangeLog
===================================================================
--- trunk/xqf/ChangeLog 2008-01-13 19:39:13 UTC (rev 817)
+++ trunk/xqf/ChangeLog 2008-01-13 19:43:26 UTC (rev 818)
@@ -1,5 +1,6 @@
Jan 13, 2008: Ludwig Nussel <l-...@us...>
- add master for OpenArena (#1869975)
+- add support for OpenTTD (#1254682)
Jan 11, 2008: Ludwig Nussel <l-...@us...>
- fix busy loop when client exits
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-01-13 19:39:08
|
Revision: 817
http://xqf.svn.sourceforge.net/xqf/?rev=817&view=rev
Author: l-n
Date: 2008-01-13 11:39:13 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
ottd support
Modified Paths:
--------------
trunk/xqf/src/game.c
trunk/xqf/src/games.c
trunk/xqf/src/games.xml
trunk/xqf/src/pixmaps.c
trunk/xqf/src/source.c
trunk/xqf/src/xqf.h
Added Paths:
-----------
trunk/xqf/src/xpm/openttd.xpm
Modified: trunk/xqf/src/game.c
===================================================================
--- trunk/xqf/src/game.c 2008-01-13 19:19:57 UTC (rev 816)
+++ trunk/xqf/src/game.c 2008-01-13 19:39:13 UTC (rev 817)
@@ -67,6 +67,7 @@
static struct player *un_parse_player(char *tokens[], int num, struct server *s);
static struct player *descent3_parse_player(char *tokens[], int num, struct server *s);
static struct player *savage_parse_player (char *token[], int n, struct server *s);
+static struct player *ottd_parse_player(char *tokens[], int num, struct server *s);
static void quake_parse_server (char *tokens[], int num, struct server *s);
@@ -80,6 +81,7 @@
static void bf1942_analyze_serverinfo (struct server *s);
static void descent3_analyze_serverinfo (struct server *s);
static void savage_analyze_serverinfo (struct server *s);
+static void ottd_analyze_serverinfo (struct server *s);
static int quake_config_is_valid (struct server *s);
static int config_is_valid_generic (struct server *s);
@@ -103,6 +105,7 @@
static int savage_exec (const struct condef *con, int forkit);
static int netpanzer_exec (const struct condef *con, int forkit);
static int descent3_exec (const struct condef *con, int forkit);
+static int ottd_exec (const struct condef *con, int forkit);
/*
static GList *q1_custom_cfgs (struct game* this, char *dir, char *game);
@@ -587,6 +590,11 @@
return q2_parse_player(token, n, s);
}
+static struct player *ottd_parse_player (char *token[], int n, struct server *s)
+{
+ return q2_parse_player(token, n, s);
+}
+
static void quake_parse_server (char *token[], int n, struct server *server) {
/*
This does both Quake (?) and Unreal servers
@@ -1685,6 +1693,25 @@
}
}
+static void ottd_analyze_serverinfo (struct server *s) {
+ char **info_ptr;
+
+ /* Clear out the flags */
+ s->flags = 0;
+
+ if ((games[s->type].flags & GAME_SPECTATE) != 0)
+ s->flags |= SERVER_SPECTATE;
+
+ for (info_ptr = s->info; info_ptr && *info_ptr; info_ptr += 2) {
+ if (!strcmp(*info_ptr, "password") && strcmp(info_ptr[1],"0") )
+ {
+ s->flags |= SERVER_PASSWORD;
+ if (games[s->type].flags & GAME_SPECTATE)
+ s->flags |= SERVER_SP_PASSWORD;
+ }
+ }
+}
+
static int quake_config_is_valid (struct server *s) {
struct stat stat_buf;
char *cfgdir;
@@ -2975,6 +3002,33 @@
}
+// OTTD: only supports -n
+static int ottd_exec(const struct condef *con, int forkit) {
+ char *argv[32];
+ int argi = 0;
+ char *cmd;
+ struct game *g = &games[con->s->type];
+ int retval;
+
+ cmd = strdup_strip (g->cmd);
+
+ argv[argi++] = strtok (cmd, delim);
+ while ((argv[argi] = strtok (NULL, delim)) != NULL)
+ argi++;
+
+ if (con->server) {
+ argv[argi++] = "-n";
+ argv[argi++] = con->server;
+ }
+
+ argv[argi] = NULL;
+
+ retval = client_launch_exec (forkit, g->real_dir, argv, con->s);
+
+ g_free (cmd);
+ return retval;
+}
+
static char *dir_custom_cfg_filter (const char *dir, const char *str) {
static const char *cfgext[] = { ".cfg", ".scr", ".rc", NULL };
const char **ext;
Modified: trunk/xqf/src/games.c
===================================================================
--- trunk/xqf/src/games.c 2008-01-13 19:19:57 UTC (rev 816)
+++ trunk/xqf/src/games.c 2008-01-13 19:39:13 UTC (rev 817)
@@ -47,6 +47,7 @@
static char* stringlist045[] = { "warsow", NULL };
static char* stringlist046[] = { "base", NULL };
static char* stringlist047[] = { "tremulous", NULL };
+static char* stringlist048[] = { "openttd", NULL };
struct game games[] = {
{
type : Q1_SERVER,
@@ -972,6 +973,27 @@
command : stringlist047,
},
{
+ type : OTTD_SERVER,
+ flags : GAME_CONNECT,
+ name : "OpenTTD",
+ default_port : 3979,
+ default_master_port : 3978,
+ id : "OTTDS",
+ qstat_str : "OTTDS",
+ qstat_option : "-ottds",
+ qstat_master_option : "-ottdm",
+ icon : "openttd.xpm",
+ parse_player : ottd_parse_player,
+ parse_server : quake_parse_server,
+ analyze_serverinfo : ottd_analyze_serverinfo,
+ config_is_valid : config_is_valid_generic,
+ exec_client : ottd_exec,
+ custom_cfgs : quake_custom_cfgs,
+ save_info : quake_save_info,
+ default_home : "~/.openttd",
+ command : stringlist048,
+ },
+ {
type : GPS_SERVER,
flags : GAME_CONNECT,
name : "Generic Gamespy",
Modified: trunk/xqf/src/games.xml
===================================================================
--- trunk/xqf/src/games.xml 2008-01-13 19:19:57 UTC (rev 816)
+++ trunk/xqf/src/games.xml 2008-01-13 19:39:13 UTC (rev 817)
@@ -744,6 +744,25 @@
<pd>tremulous_private</pd>
</game>
<game>
+ <type>OTTD_SERVER</type>
+ <flags>GAME_CONNECT</flags>
+ <name>OpenTTD</name>
+ <default_port>3979</default_port>
+ <default_master_port>3978</default_master_port>
+ <id>OTTDS</id>
+ <qstat_str>OTTDS</qstat_str>
+ <qstat_option>-ottds</qstat_option>
+ <qstat_master_option>-ottdm</qstat_master_option>
+ <icon>openttd.xpm</icon>
+ <parse_player>ottd_parse_player</parse_player>
+ <analyze_serverinfo>ottd_analyze_serverinfo</analyze_serverinfo>
+ <config_is_valid>config_is_valid_generic</config_is_valid>
+ <exec_client>ottd_exec</exec_client>
+ <custom_cfgs>quake_custom_cfgs</custom_cfgs>
+ <command>openttd</command>
+ <default_home>~/.openttd</default_home>
+ </game>
+ <game>
<type>GPS_SERVER</type>
<name>Generic Gamespy</name>
<flags>GAME_CONNECT</flags>
Modified: trunk/xqf/src/pixmaps.c
===================================================================
--- trunk/xqf/src/pixmaps.c 2008-01-13 19:19:57 UTC (rev 816)
+++ trunk/xqf/src/pixmaps.c 2008-01-13 19:39:13 UTC (rev 817)
@@ -81,6 +81,7 @@
#include "xpm/jk3.xpm"
#include "xpm/doom3.xpm"
#include "xpm/etqw.xpm"
+#include "xpm/openttd.xpm"
#include "xpm/green-plus.xpm"
#include "xpm/red-minus.xpm"
Modified: trunk/xqf/src/source.c
===================================================================
--- trunk/xqf/src/source.c 2008-01-13 19:19:57 UTC (rev 816)
+++ trunk/xqf/src/source.c 2008-01-13 19:39:13 UTC (rev 817)
@@ -1162,6 +1162,8 @@
"ADD TREMULOUS master://master.tremulous.net:30710 tremulous.net",
+ "ADD OTTDS master://master.openttd.org OpenTTD",
+
"ADD QS lan://255.255.255.255 LAN",
"ADD QWS lan://255.255.255.255 LAN",
"ADD Q2S lan://255.255.255.255 LAN",
Added: trunk/xqf/src/xpm/openttd.xpm
===================================================================
--- trunk/xqf/src/xpm/openttd.xpm (rev 0)
+++ trunk/xqf/src/xpm/openttd.xpm 2008-01-13 19:39:13 UTC (rev 817)
@@ -0,0 +1,36 @@
+/* XPM */
+static char * openttd_xpm[] = {
+"16 16 17 1",
+" c None",
+". c #4D3835",
+"+ c #6E5029",
+"@ c #52602A",
+"# c #866747",
+"$ c #539B34",
+"% c #A1805B",
+"& c #F47006",
+"* c #DB873F",
+"= c #5DD036",
+"- c #F79236",
+"; c #CBA47F",
+"> c #F4A757",
+", c #C1B3A4",
+"' c #DECDB9",
+") c #E2E5E3",
+"! c #F2FFFF",
+" . ",
+" %# ",
+" %>># ",
+" %>%;># ",
+" %>%)'%># ",
+" #>,)')!>>+ ",
+" #>>,),;,;--+ ",
+" #>>-*)!)%-&-&+ ",
+" +---%*;)!;&&&. ",
+" $@&&,'%;''&&@$ ",
+" $=@&;))))-&@=$ ",
+" $=+&&;'&&@=$ ",
+" ==+&**&@=$ ",
+" ==+&&+=$ ",
+" $ ++ $ ",
+" "};
Modified: trunk/xqf/src/xqf.h
===================================================================
--- trunk/xqf/src/xqf.h 2008-01-13 19:19:57 UTC (rev 816)
+++ trunk/xqf/src/xqf.h 2008-01-13 19:39:13 UTC (rev 817)
@@ -136,6 +136,7 @@
NEXUIZ_SERVER,
WARSOW_SERVER,
TREMULOUS_SERVER,
+ OTTD_SERVER,
GPS_SERVER,
UNKNOWN_SERVER
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <l-...@us...> - 2008-01-13 19:19:58
|
Revision: 816
http://xqf.svn.sourceforge.net/xqf/?rev=816&view=rev
Author: l-n
Date: 2008-01-13 11:19:57 -0800 (Sun, 13 Jan 2008)
Log Message:
-----------
add master for OpenArena (#1869975)
Modified Paths:
--------------
trunk/xqf/ChangeLog
trunk/xqf/src/source.c
Modified: trunk/xqf/ChangeLog
===================================================================
--- trunk/xqf/ChangeLog 2008-01-11 23:19:36 UTC (rev 815)
+++ trunk/xqf/ChangeLog 2008-01-13 19:19:57 UTC (rev 816)
@@ -1,4 +1,7 @@
-Jan 11, 2008: Ludwig Nussel <@users.sourceforge.net>
+Jan 13, 2008: Ludwig Nussel <l-...@us...>
+- add master for OpenArena (#1869975)
+
+Jan 11, 2008: Ludwig Nussel <l-...@us...>
- fix busy loop when client exits
Nov 04, 2007: Ludwig Nussel <l-...@us...>
Modified: trunk/xqf/src/source.c
===================================================================
--- trunk/xqf/src/source.c 2008-01-11 23:19:36 UTC (rev 815)
+++ trunk/xqf/src/source.c 2008-01-13 19:19:57 UTC (rev 816)
@@ -1062,6 +1062,7 @@
// "ADD Q3S master://q3.golsyd.net.au Australia",
"DELETE Q3S master://q3master.barrysworld.com:27950 BarrysWorld", // doesn't work (26.09.2004)
"ADD Q3S http://www.gameaholic.com/servers/qspy-quake3 Gameaholic.com",
+ "ADD Q3S master://dpmaster.deathmask.net dpmaster.deathmask.net",
"ADD Q4S master://q4master.idsoftware.com id",
@@ -1183,6 +1184,7 @@
"ADD SFS lan://255.255.255.255 LAN",
"ADD DM3S lan://255.255.255.255 LAN",
"ADD ETQWS lan://255.255.255.255 LAN",
+ "ADD OTTDS lan://255.255.255.255 LAN",
NULL
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|