From 2f2869e9278bcbf51e2f8e9d66f289a40237e21a Mon Sep 17 00:00:00 2001 From: Carsten Weisse Date: Tue, 24 Oct 2006 22:15:53 +0000 Subject: merge r_0_9_5 into HEAD --- .settings/org.eclipse.core.resources.prefs | 3 ++ README | 8 ++--- README_DE | 8 ++--- build.xml | 4 ++- resources/mirrors | 8 ++--- scripts/Jake2.bat | 2 +- scripts/Jake2_dedicated.bat | 3 ++ scripts/Jake2_dedicated.sh | 7 ++++ scripts/Jake2_lwjgl.bat | 2 +- src/jake2/client/Menu.java | 4 +-- webstart/jake2_jogl11ATI.jnlp | 56 ------------------------------ 11 files changed, 31 insertions(+), 74 deletions(-) create mode 100644 .settings/org.eclipse.core.resources.prefs create mode 100644 scripts/Jake2_dedicated.bat create mode 100644 scripts/Jake2_dedicated.sh delete mode 100644 webstart/jake2_jogl11ATI.jnlp diff --git a/.settings/org.eclipse.core.resources.prefs b/.settings/org.eclipse.core.resources.prefs new file mode 100644 index 0000000..75e425c --- /dev/null +++ b/.settings/org.eclipse.core.resources.prefs @@ -0,0 +1,3 @@ +#Wed Oct 25 00:11:03 CEST 2006 +eclipse.preferences.version=1 +encoding/=ISO-8859-1 diff --git a/README b/README index fa22de5..a746bf6 100644 --- a/README +++ b/README @@ -6,13 +6,14 @@ distributed under the terms of the GPL (see LICENSE). The port was done completely in Java. No native libraries are used for the game functionality. We use the jogl Java OpenGL bindings for graphics rendering -and Java OpenAL (joal) for sound. The 0.9.4 release comes with an lwjgl driver +and Java OpenAL (joal) for sound. Since 0.9.4 release, Jake2 comes with an lwjgl driver as an alternative for the jogl/joal combination. Jake2 is still under development. Send bug reports and feedback to jake2@bytonic.de. -Currently Jake2 supports Linux, Windows2000/XP and Mac OS X. +Currently Jake2 supports Linux, Windows2000/XP and Mac OS X. The Jake2 dedicated +server runs on every Java supported plattform. requirements: 400 MHz CPU @@ -24,7 +25,7 @@ Installation ------------ from binary distribution: -- run the installer with "java -jar Jake2-0.9.4-install.jar" +- run the installer with "java -jar Jake2-0.9.5-install.jar" - follow the instructions - change to the installation directory - run the game with Jake2.sh or Jake2.bat @@ -61,7 +62,6 @@ izpack Installer http://www.izforge.com/ the source distribution comes with: ant build tool http://ant.apache.org xerces XML library http://xml.apache.org -proguard obfuscator http://proguard.sourceforge.net Use for bug reports and feedback. diff --git a/README_DE b/README_DE index 29aca1e..e6fcc12 100644 --- a/README_DE +++ b/README_DE @@ -15,9 +15,8 @@ ausschliesslich mit Java realisiert. Jake2 befindet sich noch im Entwicklungsstadium. Die Kontaktaddresse für Bugreports und Rückmeldungen ist jake2@bytonic.de. -Jake2 wird von uns unter Linux und Windows2000/XP getestet. Wir haben Feedback, -dass Jake2 mit den richtigen plattformspezifischen jogl Bibliotheken auch auf -Mac OS X läuft. +Jake2 läuft unter Linux, Windows2000/XP sowie Mac OS X. Als reiner Server ohne +grafische Oberfläche läuft Jake2 auf jeder Plattform mit JRE1.4. Mindestanforderungen: 400 MHz CPU @@ -29,7 +28,7 @@ Installation ------------ ausgehend von der Binärdistribution: -- Installationsprogramm mit "java -jar Jake2-0.9.4-install.jar" starten +- Installationsprogramm mit "java -jar Jake2-0.9.5-install.jar" starten - den Anweisungen folgen - ins Installationsverzeichnis wechseln - Jake2 mit "jake2.sh" oder "jake2.bat" aus dem Installationsverzeichnis starten @@ -67,7 +66,6 @@ izpack Installer http://www.izforge.com/ the source distribution comes with: ant build tool http://ant.apache.org xerces XML library http://xml.apache.org -proguard obfuscator http://proguard.sourceforge.net für Bugreports und Rückmeldungen. diff --git a/build.xml b/build.xml index 4c9f293..1e3c799 100644 --- a/build.xml +++ b/build.xml @@ -204,6 +204,7 @@ + @@ -220,7 +221,8 @@ - + + diff --git a/resources/mirrors b/resources/mirrors index c079dff..285b47c 100644 --- a/resources/mirrors +++ b/resources/mirrors @@ -1,12 +1,12 @@ -HTTP xmission -http://mirrors.xmission.com/idsoftware/quake2/q2-314-demo-x86.exe -HTTP SE fragzone -http://ftp.fz.port80.se/spel/quake2/q2-314-demo-x86.exe FTP DE ftp.fu-berlin.de ftp://ftp.fu-berlin.de/pc/msdos/games/idgames/idstuff/quake2/q2-314-demo-x86.exe +FTP DE ftp.cs.tu-berlin.de +ftp://ftp.cs.tu-berlin.de/pub/msdos/mirrors/ftp.idsoftware.com/quake2/q2-314-demo-x86.exe FTP UK ftp.demon.co.uk ftp://ftp.demon.co.uk/pub/mirrors/idsoftware/quake2/q2-314-demo-x86.exe FTP SE ftp.fragzone.se ftp://ftp.fragzone.se/pub/spel/quake2/q2-314-demo-x86.exe FTP US ftp.idsoftware.com ftp://ftp.idsoftware.com/idstuff/quake2/q2-314-demo-x86.exe +FTP US ftp.gamers.org +ftp://ftp.gamers.org/pub/games/idgames2/idstuff/quake2/q2-314-demo-x86.exe \ No newline at end of file diff --git a/scripts/Jake2.bat b/scripts/Jake2.bat index ed0bd82..8a225dc 100644 --- a/scripts/Jake2.bat +++ b/scripts/Jake2.bat @@ -1,4 +1,4 @@ @echo off SET PATH=lib\windows;%PATH% SET CP=lib/jake2.jar;lib/jogl.jar;lib/windows/joal.jar -java -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2 \ No newline at end of file +start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2 \ No newline at end of file diff --git a/scripts/Jake2_dedicated.bat b/scripts/Jake2_dedicated.bat new file mode 100644 index 0000000..fcd612d --- /dev/null +++ b/scripts/Jake2_dedicated.bat @@ -0,0 +1,3 @@ +@echo off +SET CP=lib/jake2.jar +java -Xmx64M -cp %CP% jake2.Jake2 +set dedicated 1 \ No newline at end of file diff --git a/scripts/Jake2_dedicated.sh b/scripts/Jake2_dedicated.sh new file mode 100644 index 0000000..fa91d99 --- /dev/null +++ b/scripts/Jake2_dedicated.sh @@ -0,0 +1,7 @@ +#!/bin/bash + +cd `dirname $0` + +CP=lib/jake2.jar + +exec java -Xmx64M -cp $CP jake2.Jake2 diff --git a/scripts/Jake2_lwjgl.bat b/scripts/Jake2_lwjgl.bat index 1a17719..2a594f8 100644 --- a/scripts/Jake2_lwjgl.bat +++ b/scripts/Jake2_lwjgl.bat @@ -1,4 +1,4 @@ @echo off SET PATH=lib\windows;%PATH% SET CP=lib/jake2.jar;lib/lwjgl.jar;lib/lwjgl_util.jar -java -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2 \ No newline at end of file +start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2 \ No newline at end of file diff --git a/src/jake2/client/Menu.java b/src/jake2/client/Menu.java index 3364d2e..68b49b7 100644 --- a/src/jake2/client/Menu.java +++ b/src/jake2/client/Menu.java @@ -2,7 +2,7 @@ * Menu.java * Copyright (C) 2004 * - * $Id: Menu.java,v 1.20 2005-12-03 19:47:36 salomo Exp $ + * $Id: Menu.java,v 1.21 2006-10-24 22:15:53 cawe Exp $ */ /* Copyright (C) 1997-2001 Id Software, Inc. @@ -1713,7 +1713,7 @@ public final class Menu extends Key { static String idcredits[] = { "+QUAKE II BY ID SOFTWARE", "", "+PROGRAMMING", "John Carmack", "John Cash", "Brian Hook", "", - "+JAVA PORT BY BYTONIC", "CWEI", "HOZ", "RST", "", "+ART", + "+JAVA PORT BY BYTONIC", "Carsten Weisse", "Holger Zickner", "Rene Stoeckel", "", "+ART", "Adrian Carmack", "Kevin Cloud", "Paul Steed", "", "+LEVEL DESIGN", "Tim Willits", "American McGee", "Christian Antkow", "Paul Jaquays", "Brandon James", "", "+BIZ", "Todd Hollenshead", diff --git a/webstart/jake2_jogl11ATI.jnlp b/webstart/jake2_jogl11ATI.jnlp deleted file mode 100644 index 86e968e..0000000 --- a/webstart/jake2_jogl11ATI.jnlp +++ /dev/null @@ -1,56 +0,0 @@ - - - - - Jake2 - Bytonic Software - - Java port of the Quake2 game engine - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +set - vid_ref - fastjogl - +set - s_impl - joal - +set - adr0 - 213.187.87.100 - - - -- cgit v1.2.3