Menu
▾
▴
jake2-commits — Jake2 cvs commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(52) |
Aug
(34) |
Sep
(99) |
Oct
(110) |
Nov
(21) |
Dec
(69) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(117) |
Feb
(90) |
Mar
(1) |
Apr
(22) |
May
(96) |
Jun
(25) |
Jul
(22) |
Aug
|
Sep
|
Oct
(18) |
Nov
(43) |
Dec
(71) |
| 2006 |
Jan
(20) |
Feb
(10) |
Mar
|
Apr
(4) |
May
(2) |
Jun
|
Jul
|
Aug
(3) |
Sep
|
Oct
(60) |
Nov
(63) |
Dec
(35) |
| 2007 |
Jan
(18) |
Feb
(40) |
Mar
(14) |
Apr
(18) |
May
(33) |
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(1) |
Dec
|
| 2008 |
Jan
|
Feb
(1) |
Mar
(25) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(5) |
| 2011 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(15) |
Aug
|
Sep
|
Oct
|
Nov
(3) |
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
(3) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Carsten W. <ca...@us...> - 2004-11-07 19:30:23
|
Update of /cvsroot/jake2/jake2/src/jake2/util In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3627/src/jake2/util Modified Files: Lib.java Log Message: string conversion funktions Index: Lib.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/util/Lib.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Lib.java 7 Oct 2004 14:12:59 -0000 1.8 --- Lib.java 7 Nov 2004 19:30:12 -0000 1.9 *************** *** 263,266 **** --- 263,279 ---- } + public static String CtoJava(String old) { + int index = old.indexOf('\0'); + if (index == 0) return ""; + return (index > 0) ? old.substring(0, index) : old; + } + + public static String CtoJava(byte[] old, int offset, int maxLenght) { + int i; + for (i = offset; old[i] != 0 && i < maxLenght; i++); + return new String(old, offset, i - offset); + } + + /* * java.nio.* Buffer util functions |
|
From: Rene S. <sa...@us...> - 2004-11-06 20:58:43
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11724/src/jake2/server Modified Files: SV_INIT.java Log Message: multiplayer server now works Index: SV_INIT.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_INIT.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** SV_INIT.java 22 Sep 2004 19:22:12 -0000 1.9 --- SV_INIT.java 6 Nov 2004 20:58:11 -0000 1.10 *************** *** 360,366 **** //svs.clients = Z_Malloc(sizeof(client_t) * maxclients.value); svs.clients = new client_t[(int) SV_MAIN.maxclients.value]; ! for (int n = 0; n < svs.clients.length; n++) svs.clients[n] = new client_t(); ! svs.num_client_entities = ((int) SV_MAIN.maxclients.value) * Defines.UPDATE_BACKUP * 64; //ok. --- 360,367 ---- //svs.clients = Z_Malloc(sizeof(client_t) * maxclients.value); svs.clients = new client_t[(int) SV_MAIN.maxclients.value]; ! for (int n = 0; n < svs.clients.length; n++) { svs.clients[n] = new client_t(); ! svs.clients[n].serverindex = n; ! } svs.num_client_entities = ((int) SV_MAIN.maxclients.value) * Defines.UPDATE_BACKUP * 64; //ok. |
|
From: Holger Z. <hz...@us...> - 2004-11-03 20:15:13
|
Update of /cvsroot/jake2/jake2/src/jake2/sound In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30792/src/jake2/sound Modified Files: WaveLoader.java Log Message: use native order sample format Index: WaveLoader.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/WaveLoader.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WaveLoader.java 29 Oct 2004 16:38:36 -0000 1.2 --- WaveLoader.java 3 Nov 2004 20:15:02 -0000 1.3 *************** *** 29,36 **** import jake2.qcommon.Com; import jake2.qcommon.FS; - import jake2.sys.Sys; import java.io.ByteArrayInputStream; import java.io.IOException; import javax.sound.sampled.*; --- 29,36 ---- import jake2.qcommon.Com; import jake2.qcommon.FS; import java.io.ByteArrayInputStream; import java.io.IOException; + import java.nio.ByteOrder; import javax.sound.sampled.*; *************** *** 41,45 **** public class WaveLoader { ! private static final AudioFormat sampleFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, 22050, 16, 1, 2, 22050, false); /* --- 41,53 ---- public class WaveLoader { ! private static AudioFormat sampleFormat; ! static { ! if (ByteOrder.nativeOrder() == ByteOrder.LITTLE_ENDIAN) { ! sampleFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, 22050, 16, 1, 2, 22050, false); ! } else { ! sampleFormat = new AudioFormat(AudioFormat.Encoding.PCM_SIGNED, 22050, 16, 1, 2, 22050, true); ! } ! ! } /* |
|
From: Holger Z. <hz...@us...> - 2004-11-03 16:16:30
|
Update of /cvsroot/jake2/jake2/webstart In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11512/webstart Modified Files: jake2_jogl11.jnlp jake2_jogl11ATI.jnlp jake2.jnlp Log Message: own webstart jar for openal Index: jake2.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2.jnlp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** jake2.jnlp 31 Oct 2004 19:43:50 -0000 1.4 --- jake2.jnlp 3 Nov 2004 16:16:16 -0000 1.5 *************** *** 28,32 **** <jar href="http://jake2.sourceforge.net/lib/patch.jar"/> <jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/> ! <jar href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/jogl-native.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> --- 28,32 ---- <jar href="http://jake2.sourceforge.net/lib/patch.jar"/> <jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/> ! <jar href="http://jake2.sourceforge.net/lib/linux/openal.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/jogl-native.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> Index: jake2_jogl11ATI.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11ATI.jnlp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** jake2_jogl11ATI.jnlp 3 Nov 2004 15:25:29 -0000 1.3 --- jake2_jogl11ATI.jnlp 3 Nov 2004 16:16:16 -0000 1.4 *************** *** 29,33 **** <jar href="http://jake2.sourceforge.net/lib/patch.jar"/> <jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/> ! <jar href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> </resources> --- 29,33 ---- <jar href="http://jake2.sourceforge.net/lib/patch.jar"/> <jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/> ! <jar href="http://jake2.sourceforge.net/lib/linux/openal.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> </resources> Index: jake2_jogl11.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11.jnlp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** jake2_jogl11.jnlp 3 Nov 2004 15:25:28 -0000 1.3 --- jake2_jogl11.jnlp 3 Nov 2004 16:16:16 -0000 1.4 *************** *** 29,33 **** <jar href="http://jake2.sourceforge.net/lib/patch.jar"/> <jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/> ! <jar href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> </resources> --- 29,33 ---- <jar href="http://jake2.sourceforge.net/lib/patch.jar"/> <jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/> ! <jar href="http://jake2.sourceforge.net/lib/linux/openal.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> </resources> |
|
From: Holger Z. <hz...@us...> - 2004-11-03 16:16:29
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11512 Modified Files: build.xml Log Message: own webstart jar for openal Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** build.xml 3 Nov 2004 15:28:39 -0000 1.16 --- build.xml 3 Nov 2004 16:16:15 -0000 1.17 *************** *** 225,228 **** --- 225,230 ---- <jar destfile="webstart/lib/linux/joal-native.jar" basedir="${dist}/lib/linux"> <include name="libjoal.so"/> + </jar> + <jar destfile="webstart/lib/linux/openal.jar" basedir="${dist}/lib/linux"> <include name="libopenal.so"/> </jar> |
|
From: Holger Z. <hz...@us...> - 2004-11-03 15:46:40
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5039 Modified Files: README README_DE Log Message: README updates Index: README =================================================================== RCS file: /cvsroot/jake2/jake2/README,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** README 31 Oct 2004 19:38:27 -0000 1.5 --- README 3 Nov 2004 15:46:21 -0000 1.6 *************** *** 32,37 **** - unpack jake2src-version.tar.gz or jake2-version.zip - set JAVA_HOME environment variable to Your J2SDK1.4 installation ! - run "build.sh bindist" or "build.bat bindist" to build the binary ! distribution installation of Quake2 data: --- 32,36 ---- - unpack jake2src-version.tar.gz or jake2-version.zip - set JAVA_HOME environment variable to Your J2SDK1.4 installation ! - run "build.sh installer" or "build.bat installer" to build the installer installation of Quake2 data: Index: README_DE =================================================================== RCS file: /cvsroot/jake2/jake2/README_DE,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** README_DE 31 Oct 2004 19:38:27 -0000 1.5 --- README_DE 3 Nov 2004 15:46:31 -0000 1.6 *************** *** 36,40 **** - jake2src-version.tar.gz oder jake2src-version.zip entpacken - JAVA_HOME Umgebungsvariable auf J2SDK1.4 Installationsverzeichnis setzen ! - "build.sh bindist" oder "build.bat bindist" erzeugt die Binärdistribution Quake2 Leveldaten installieren: --- 36,40 ---- - jake2src-version.tar.gz oder jake2src-version.zip entpacken - JAVA_HOME Umgebungsvariable auf J2SDK1.4 Installationsverzeichnis setzen ! - "build.sh installer" oder "build.bat installer" erzeugt den Installer Quake2 Leveldaten installieren: |
|
From: Holger Z. <hz...@us...> - 2004-11-03 15:28:53
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1341 Modified Files: build.xml Log Message: add joal for OS X to webstart configuration Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** build.xml 3 Nov 2004 15:25:28 -0000 1.15 --- build.xml 3 Nov 2004 15:28:39 -0000 1.16 *************** *** 86,90 **** <include name="*"/> </fileset> ! </copy> <copy todir="${dist}"> <fileset dir="scripts"> --- 86,95 ---- <include name="*"/> </fileset> ! </copy> ! <copy todir="${dist}/lib/osx"> ! <fileset dir="lib/joal/osx"> ! <include name="*"/> ! </fileset> ! </copy> <copy todir="${dist}"> <fileset dir="scripts"> |
|
From: Holger Z. <hz...@us...> - 2004-11-03 15:25:38
|
Update of /cvsroot/jake2/jake2/webstart In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv462/webstart Modified Files: jake2_jogl11.jnlp jake2_jogl11ATI.jnlp Log Message: add joal for OS X to webstart configuration Index: jake2_jogl11ATI.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11ATI.jnlp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jake2_jogl11ATI.jnlp 31 Oct 2004 19:43:50 -0000 1.2 --- jake2_jogl11ATI.jnlp 3 Nov 2004 15:25:29 -0000 1.3 *************** *** 38,42 **** <nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/> </resources> ! <application-desc main-class="jake2.Jake2"/> --- 38,48 ---- <nativelib href="http://jake2.sourceforge.net/lib/windows/joal-native.jar"/> </resources> ! ! <resources os="Mac OS X"> ! <j2se version="1.4+" max-heap-size="128M"/> ! <jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/> ! <nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/> ! </resources> ! <application-desc main-class="jake2.Jake2"/> Index: jake2_jogl11.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11.jnlp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jake2_jogl11.jnlp 31 Oct 2004 19:43:50 -0000 1.2 --- jake2_jogl11.jnlp 3 Nov 2004 15:25:28 -0000 1.3 *************** *** 39,42 **** --- 39,48 ---- </resources> + <resources os="Mac OS X"> + <j2se version="1.4+" max-heap-size="128M"/> + <jar href="http://jake2.sourceforge.net/lib/osx/joal.jar"/> + <nativelib href="http://jake2.sourceforge.net/lib/osx/joal-native.jar"/> + </resources> + <application-desc main-class="jake2.Jake2"/> |
|
From: Holger Z. <hz...@us...> - 2004-11-03 15:25:38
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv462 Modified Files: build.xml Log Message: add joal for OS X to webstart configuration Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** build.xml 31 Oct 2004 19:39:48 -0000 1.14 --- build.xml 3 Nov 2004 15:25:28 -0000 1.15 *************** *** 30,37 **** <echo message="command line arguments for build.sh or build.bat"/> <echo message=""/> ! <echo message="bindist build only binary distribution"/> <echo message="srcdist build only source distribution"/> ! <echo message="all build source and binary distribution"/> ! <echo message="clean delete classfiles keep jake2*.tar.gz and jake2*.zip"/> <echo message="distclean delete all generated files"/> <echo message="jar build only dist/lib/jake2.jar"/> --- 30,38 ---- <echo message="command line arguments for build.sh or build.bat"/> <echo message=""/> ! <echo message="installer build installer"/> ! <echo message="bindist build .tar.gz and .zip binary distribution"/> <echo message="srcdist build only source distribution"/> ! <echo message="all build everything"/> ! <echo message="clean delete classfiles keep distribution files"/> <echo message="distclean delete all generated files"/> <echo message="jar build only dist/lib/jake2.jar"/> *************** *** 135,139 **** <!-- everything --> ! <target name="all" depends="bindist,srcdist"> </target> --- 136,140 ---- <!-- everything --> ! <target name="all" depends="installer,bindist,srcdist"> </target> *************** *** 221,224 **** --- 222,228 ---- <include name="libopenal.so"/> </jar> + <jar destfile="webstart/lib/osx/joal-native.jar" basedir="${dist}/lib/osx"> + <include name="libjoal.jnilib"/> + </jar> <jar destfile="webstart/lib/windows/jogl-native.jar" basedir="${dist}/lib/windows"> <include name="jogl*.dll"/> |
|
From: Holger Z. <hz...@us...> - 2004-11-03 15:25:12
|
Update of /cvsroot/jake2/jake2/lib/joal/osx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32746/lib/joal/osx Added Files: libjoal.jnilib joal.jar Log Message: joal for Mac OS X --- NEW FILE: joal.jar --- (This appears to be a binary file; contents omitted.) --- NEW FILE: libjoal.jnilib --- (This appears to be a binary file; contents omitted.) |
|
From: Holger Z. <hz...@us...> - 2004-11-03 15:25:03
|
Update of /cvsroot/jake2/jake2/lib/joal/osx In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32700/lib/joal/osx Log Message: Directory /cvsroot/jake2/jake2/lib/joal/osx added to the repository |
|
From: Holger Z. <hz...@us...> - 2004-11-03 14:33:16
|
Update of /cvsroot/jake2/jake2/src/jake2/sound In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20175/src/jake2/sound Modified Files: S.java Log Message: catch NoClassDefFoundError if no joal libs available Index: S.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/S.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** S.java 9 Jul 2004 06:50:48 -0000 1.2 --- S.java 3 Nov 2004 14:33:06 -0000 1.3 *************** *** 49,53 **** Class.forName("jake2.sound.jsound.JSoundImpl"); } ! catch (ClassNotFoundException e) { } }; --- 49,53 ---- Class.forName("jake2.sound.jsound.JSoundImpl"); } ! catch (Throwable e) { } }; |
|
From: Holger Z. <hz...@us...> - 2004-11-03 12:17:32
|
Update of /cvsroot/jake2/jake2/src/jake2/sound/joal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25039/src/jake2/sound/joal Modified Files: JOALSoundImpl.java Log Message: catch UnsatisfiedLinkErrors if no joal libs available Index: JOALSoundImpl.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JOALSoundImpl.java 31 Oct 2004 19:47:52 -0000 1.9 --- JOALSoundImpl.java 3 Nov 2004 12:17:17 -0000 1.10 *************** *** 76,80 **** unpack(); } else if (os.startsWith("Windows")) { ! System.loadLibrary("OpenAL32"); } --- 76,82 ---- unpack(); } else if (os.startsWith("Windows")) { ! try { ! System.loadLibrary("OpenAL32"); ! } catch (Throwable e) {} } *************** *** 87,91 **** Com.Printf(e.getMessage() + '\n'); return false; ! } catch (Exception e) { Com.DPrintf(e.getMessage() + '\n'); return false; --- 89,93 ---- Com.Printf(e.getMessage() + '\n'); return false; ! } catch (Throwable e) { Com.DPrintf(e.getMessage() + '\n'); return false; |
|
From: Holger Z. <hz...@us...> - 2004-11-03 10:17:52
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5706 Modified Files: ChangeLog Log Message: Index: ChangeLog =================================================================== RCS file: /cvsroot/jake2/jake2/ChangeLog,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** ChangeLog 31 Oct 2004 19:38:27 -0000 1.5 --- ChangeLog 3 Nov 2004 10:17:36 -0000 1.6 *************** *** 1,7 **** --- 1,9 ---- 0.9.4 + - webstart version - standalone installer - online installation of Quake2 demo data files - multiplayer client functionality (with original Quake2 server) + - mouse wheel support - bugfixes |
|
From: Holger Z. <hz...@us...> - 2004-11-03 10:16:53
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5329/src/jake2/sys Modified Files: KBD.java Log Message: bugfix 1056765 allow use of character and modifier keys simultaneously Index: KBD.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/KBD.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** KBD.java 3 Nov 2004 08:53:27 -0000 1.4 --- KBD.java 3 Nov 2004 10:16:42 -0000 1.5 *************** *** 213,217 **** default: ! key = ev.getKeyChar(); if (key >= 'A' && key <= 'Z') key = key - 'A' + 'a'; --- 213,221 ---- default: ! if ((ev.getModifiers() & (InputEvent.ALT_MASK | InputEvent.CTRL_MASK)) != 0) { ! key = ev.getKeyCode(); ! } else { ! key = ev.getKeyChar(); ! } if (key >= 'A' && key <= 'Z') key = key - 'A' + 'a'; |
|
From: Holger Z. <hz...@us...> - 2004-11-03 08:53:37
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23920/src/jake2/qcommon Modified Files: Qcommon.java Log Message: mouse wheel support Index: Qcommon.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/Qcommon.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** Qcommon.java 28 Oct 2004 21:31:31 -0000 1.11 --- Qcommon.java 3 Nov 2004 08:53:27 -0000 1.12 *************** *** 78,88 **** Jake2.Q2Dialog.setStatus("loading config..."); ! Cbuf.AddText("exec default.cfg\n"); ! Cbuf.Execute(); ! Cvar.Set("vid_fullscreen", "0"); ! Cbuf.AddText("exec config.cfg\n"); ! ! Cbuf.AddEarlyCommands(true); ! Cbuf.Execute(); FS.setCDDir(); // use cddir from config.cfg --- 78,82 ---- Jake2.Q2Dialog.setStatus("loading config..."); ! reconfigure(); FS.setCDDir(); // use cddir from config.cfg *************** *** 242,245 **** --- 236,241 ---- static void reconfigure() { Cbuf.AddText("exec default.cfg\n"); + Cbuf.AddText("bind MWHEELUP weapnext\n"); + Cbuf.AddText("bind MWHEELDOWN weapprev\n"); Cbuf.Execute(); Cvar.Set("vid_fullscreen", "0"); |
|
From: Holger Z. <hz...@us...> - 2004-11-03 08:53:36
|
Update of /cvsroot/jake2/jake2/src/jake2/render In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23920/src/jake2/render Modified Files: JoglBase.java Log Message: mouse wheel support Index: JoglBase.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/JoglBase.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** JoglBase.java 31 Oct 2004 19:55:07 -0000 1.11 --- JoglBase.java 3 Nov 2004 08:53:27 -0000 1.12 *************** *** 232,235 **** --- 232,236 ---- canvas.addMouseListener(KBD.listener); canvas.addMouseMotionListener(KBD.listener); + canvas.addMouseWheelListener(KBD.listener); if (fullscreen) { |
|
From: Holger Z. <hz...@us...> - 2004-11-03 08:53:36
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23920/src/jake2/sys Modified Files: Jake2InputEvent.java InputListener.java KBD.java Log Message: mouse wheel support Index: InputListener.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/InputListener.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** InputListener.java 19 Jul 2004 19:22:57 -0000 1.2 --- InputListener.java 3 Nov 2004 08:53:27 -0000 1.3 *************** *** 32,36 **** * InputListener */ ! public final class InputListener implements KeyListener, MouseListener, MouseMotionListener, ComponentListener { // modifications of eventQueue must be thread safe! --- 32,37 ---- * InputListener */ ! public final class InputListener implements KeyListener, MouseListener, ! MouseMotionListener, ComponentListener, MouseWheelListener { // modifications of eventQueue must be thread safe! *************** *** 102,106 **** addEvent(new Jake2InputEvent(Jake2InputEvent.CreateNotify, e)); } ! } --- 103,110 ---- addEvent(new Jake2InputEvent(Jake2InputEvent.CreateNotify, e)); } ! ! public void mouseWheelMoved(MouseWheelEvent e) { ! addEvent(new Jake2InputEvent(Jake2InputEvent.WheelMoved, e)); ! } } Index: KBD.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/KBD.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** KBD.java 31 Oct 2004 13:56:17 -0000 1.3 --- KBD.java 3 Nov 2004 08:53:27 -0000 1.4 *************** *** 102,105 **** --- 102,116 ---- break; + case Jake2InputEvent.WheelMoved: + int dir = ((MouseWheelEvent)event.ev).getWheelRotation(); + if (dir > 0) { + Do_Key_Event(Key.K_MWHEELDOWN, true); + Do_Key_Event(Key.K_MWHEELDOWN, false); + } else { + Do_Key_Event(Key.K_MWHEELUP, true); + Do_Key_Event(Key.K_MWHEELUP, false); + } + break; + case Jake2InputEvent.CreateNotify : case Jake2InputEvent.ConfigureNotify : Index: Jake2InputEvent.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/Jake2InputEvent.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** Jake2InputEvent.java 7 Jul 2004 19:59:51 -0000 1.1.1.1 --- Jake2InputEvent.java 3 Nov 2004 08:53:27 -0000 1.2 *************** *** 39,42 **** --- 39,43 ---- static final int CreateNotify = 5; static final int ConfigureNotify = 6; + static final int WheelMoved = 7; int type; AWTEvent ev; |
|
From: Holger Z. <hz...@us...> - 2004-10-31 19:55:17
|
Update of /cvsroot/jake2/jake2/src/jake2/render In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5091/src/jake2/render Modified Files: JoglBase.java Log Message: manually swap buffer with jogl version 1.1 Index: JoglBase.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/JoglBase.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** JoglBase.java 28 Oct 2004 00:38:29 -0000 1.10 --- JoglBase.java 31 Oct 2004 19:55:07 -0000 1.11 *************** *** 96,99 **** --- 96,101 ---- protected static final int rserr_unknown = 3; + private boolean swap = false; + public DisplayMode[] getModeList() { DisplayMode[] modes = device.getDisplayModes(); *************** *** 207,213 **** canvas.setNoAutoRedrawMode(true); ! // TODO this and a new JOGL-release solves the flickering bug (Loading) ! // change also GLimp_EndFrame() ! // canvas.setAutoSwapBufferMode(false); canvas.addGLEventListener(this); --- 209,218 ---- canvas.setNoAutoRedrawMode(true); ! ! if (net.java.games.jogl.Version.getVersion().startsWith("1.1")) { ! swap=true; ! canvas.setAutoSwapBufferMode(false); ! } ! canvas.addGLEventListener(this); *************** *** 308,314 **** protected void GLimp_EndFrame() { gl.glFlush(); // swap buffer ! // TODO this and a new JOGL-release solves the flickering bug (Loading) ! // canvas.swapBuffers(); } protected void GLimp_BeginFrame(float camera_separation) { --- 313,319 ---- protected void GLimp_EndFrame() { gl.glFlush(); + // swap buffer ! if (swap) canvas.swapBuffers(); } protected void GLimp_BeginFrame(float camera_separation) { |
|
From: Holger Z. <hz...@us...> - 2004-10-31 19:48:03
|
Update of /cvsroot/jake2/jake2/src/jake2/sound/joal In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3369/src/jake2/sound/joal Modified Files: JOALSoundImpl.java Log Message: unpack libopenal.so on Linux Index: JOALSoundImpl.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/joal/JOALSoundImpl.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JOALSoundImpl.java 27 Oct 2004 16:51:32 -0000 1.8 --- JOALSoundImpl.java 31 Oct 2004 19:47:52 -0000 1.9 *************** *** 9,23 **** import jake2.Defines; import jake2.Globals; - import jake2.client.CL; - import jake2.client.CL_ents; import jake2.game.*; import jake2.qcommon.*; import jake2.sound.*; ! import jake2.util.*; ! import java.io.IOException; ! import java.io.RandomAccessFile; import java.nio.IntBuffer; - import java.util.*; import net.java.games.joal.*; --- 9,20 ---- import jake2.Defines; import jake2.Globals; import jake2.game.*; import jake2.qcommon.*; import jake2.sound.*; ! import jake2.util.Lib; ! import jake2.util.Vargs; ! import java.io.*; import java.nio.IntBuffer; import net.java.games.joal.*; *************** *** 47,50 **** --- 44,69 ---- } + /** + * unpack OpenAL shared library on Linux + */ + private void unpack() { + String path = System.getProperty("user.home") + "/.jake2/libopenal.so"; + File f = new File(path); + if (!f.exists()) { + try { + f.createNewFile(); + InputStream in = getClass().getResourceAsStream("/libopenal.so"); + OutputStream out = new FileOutputStream(f); + byte[] buf = new byte[8192]; + int len; + while ((len = in.read(buf)) > 0) { + out.write(buf, 0, len); + } + } catch (Exception e) { + f.delete(); + } + } + } + /* (non-Javadoc) * @see jake2.sound.SoundImpl#Init() *************** *** 55,59 **** String os = System.getProperty("os.name"); if (os.startsWith("Linux")) { ! System.loadLibrary("openal"); } else if (os.startsWith("Windows")) { System.loadLibrary("OpenAL32"); --- 74,78 ---- String os = System.getProperty("os.name"); if (os.startsWith("Linux")) { ! unpack(); } else if (os.startsWith("Windows")) { System.loadLibrary("OpenAL32"); |
|
From: Holger Z. <hz...@us...> - 2004-10-31 19:45:45
|
Update of /cvsroot/jake2/jake2/src/jake2/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3000/src/jake2/install Modified Files: Q2DataInstaller.java Log Message: merge changes from software20 branch Index: Q2DataInstaller.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/install/Q2DataInstaller.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Q2DataInstaller.java 24 Oct 2004 20:40:07 -0000 1.1 --- Q2DataInstaller.java 31 Oct 2004 19:45:28 -0000 1.2 *************** *** 8,18 **** package jake2.install; - import jake2.Globals; - import java.awt.*; ! import java.awt.event.*; import java.io.*; import java.util.Enumeration; - import java.util.Vector; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; --- 8,16 ---- package jake2.install; import java.awt.*; ! import java.awt.event.ActionEvent; ! import java.awt.event.ActionListener; import java.io.*; import java.util.Enumeration; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; *************** *** 37,56 **** int y = (mode.getHeight() - getHeight()) / 2; setLocation(x, y); ! dir = home + sep + "jake2" + sep + "baseq2"; ! jTextField1.setText(dir); ! } private void initComponents() {//GEN-BEGIN:initComponents - java.awt.GridBagConstraints gridBagConstraints; - - choosePanel = new javax.swing.JPanel(); - statusPanel = new JPanel(); - status = new JLabel("initializing Jake2..."); - jTextField1 = new javax.swing.JTextField(); - changeButton = new javax.swing.JButton(); - cancelButton = new javax.swing.JButton(); - exitButton = new javax.swing.JButton(); - okButton = new javax.swing.JButton(); - setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle("Jake2 - Bytonic Software"); --- 35,41 ---- int y = (mode.getHeight() - getHeight()) / 2; setLocation(x, y); ! } private void initComponents() {//GEN-BEGIN:initComponents setDefaultCloseOperation(javax.swing.WindowConstants.DO_NOTHING_ON_CLOSE); setTitle("Jake2 - Bytonic Software"); *************** *** 62,173 **** } }); - - choosePanel.setLayout(new java.awt.GridBagLayout()); - choosePanel.setMaximumSize(new java.awt.Dimension(400, 100)); - choosePanel.setMinimumSize(new java.awt.Dimension(400, 100)); - choosePanel.setPreferredSize(new java.awt.Dimension(400, 100)); - - - - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridwidth = 1; - gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5); - gridBagConstraints.weightx = 0; - gridBagConstraints.anchor = GridBagConstraints.SOUTHWEST; - choosePanel.add(new JLabel("baseq2 directory"),gridBagConstraints); - - gridBagConstraints.gridx = 1; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.fill = java.awt.GridBagConstraints.BOTH; - gridBagConstraints.insets = new java.awt.Insets(5, 2, 5, 2); - gridBagConstraints.weightx = 1; - choosePanel.add(jTextField1, gridBagConstraints); - - changeButton.setText("..."); - changeButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - changeButtonActionPerformed(evt); - } - }); - gridBagConstraints.gridx = 3; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridwidth = 1; - gridBagConstraints.weightx = 0; - gridBagConstraints.fill = java.awt.GridBagConstraints.NONE; - gridBagConstraints.insets = new java.awt.Insets(5, 2, 5, 5); - gridBagConstraints.anchor = java.awt.GridBagConstraints.EAST; - choosePanel.add(changeButton, gridBagConstraints); - - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 1; - gridBagConstraints.gridwidth = 4; - gridBagConstraints.weightx = 0; - gridBagConstraints.weighty = 1; - gridBagConstraints.fill = java.awt.GridBagConstraints.VERTICAL; - choosePanel.add(new JPanel(), gridBagConstraints); - - cancelButton.setText("Cancel"); - cancelButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - cancelButtonActionPerformed(evt); - } - }); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridwidth = 4; - gridBagConstraints.weighty = 0; - gridBagConstraints.insets = new java.awt.Insets(5, 5, 5, 5); - gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTH; - choosePanel.add(cancelButton, gridBagConstraints); - - exitButton.setText("Exit"); - exitButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - exitButtonActionPerformed(evt); - } - }); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridwidth = 1; - gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHWEST; - choosePanel.add(exitButton, gridBagConstraints); - - okButton.setText("OK"); - okButton.addActionListener(new java.awt.event.ActionListener() { - public void actionPerformed(java.awt.event.ActionEvent evt) { - okButtonActionPerformed(evt); - } - }); - gridBagConstraints.gridx = 2; - gridBagConstraints.gridy = 2; - gridBagConstraints.gridwidth = 2; - gridBagConstraints.anchor = java.awt.GridBagConstraints.SOUTHEAST; - choosePanel.add(okButton, gridBagConstraints); - Jake2Canvas c = new Jake2Canvas(); getContentPane().add(c, BorderLayout.CENTER); - - statusPanel.setLayout(new java.awt.GridBagLayout()); - statusPanel.setMaximumSize(new java.awt.Dimension(400, 100)); - statusPanel.setMinimumSize(new java.awt.Dimension(400, 100)); - statusPanel.setPreferredSize(new java.awt.Dimension(400, 100)); - gridBagConstraints = new java.awt.GridBagConstraints(); - gridBagConstraints.gridx = 0; - gridBagConstraints.gridy = 0; - gridBagConstraints.gridwidth = 1; - gridBagConstraints.fill = java.awt.GridBagConstraints.HORIZONTAL; - gridBagConstraints.insets = new java.awt.Insets(10, 10, 10, 10); - gridBagConstraints.weightx = 1.0; - statusPanel.add(status, gridBagConstraints); - getContentPane().add(statusPanel, java.awt.BorderLayout.SOUTH); progressPanel = new ProgressPanel(this); - installPanel = new InstallPanel(this); notFoundPanel = new NotFoundPanel(this); ! pack(); } --- 47,59 ---- } }); Jake2Canvas c = new Jake2Canvas(); getContentPane().add(c, BorderLayout.CENTER); progressPanel = new ProgressPanel(this); notFoundPanel = new NotFoundPanel(this); ! ! getContentPane().add(notFoundPanel, java.awt.BorderLayout.SOUTH); ! pack(); } *************** *** 189,209 **** } - private void changeButtonActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_changeButtonActionPerformed - JFileChooser chooser = new JFileChooser(); - chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); - chooser.setDialogType(JFileChooser.CUSTOM_DIALOG); - chooser.setMultiSelectionEnabled(false); - chooser.setDialogTitle("choose a valid baseq2 directory"); - chooser.showDialog(this, "OK"); - - dir = null; - try { - dir = chooser.getSelectedFile().getCanonicalPath(); - } catch (Exception e) {} - if (dir != null) jTextField1.setText(dir); - else dir = jTextField1.getText(); - - }//GEN-LAST:event_changeButtonActionPerformed - private void formWindowClosing(java.awt.event.WindowEvent evt) {//GEN-FIRST:event_formWindowClosing System.exit(1); --- 75,78 ---- *************** *** 211,252 **** }//GEN-LAST:event_formWindowClosing ! // Variables declaration - do not modify//GEN-BEGIN:variables ! private javax.swing.JButton changeButton; ! private javax.swing.JButton exitButton; ! private javax.swing.JButton cancelButton; ! private Jake2Canvas canvas; ! private javax.swing.JPanel choosePanel; ! private JPanel statusPanel; private ProgressPanel progressPanel; - private InstallPanel installPanel; private NotFoundPanel notFoundPanel; ! private JLabel status; ! private javax.swing.JTextField jTextField1; ! private javax.swing.JButton okButton; ! // End of variables declaration//GEN-END:variables ! ! private String dir; ! void showChooseDialog() { - getContentPane().remove(statusPanel); getContentPane().remove(progressPanel); - getContentPane().remove(installPanel); getContentPane().remove(notFoundPanel); - getContentPane().add(choosePanel, BorderLayout.SOUTH); validate(); repaint(); } ! ! void showStatus() { ! getContentPane().remove(choosePanel); ! getContentPane().remove(installPanel); ! getContentPane().add(statusPanel, BorderLayout.SOUTH); ! validate(); ! repaint(); ! } ! void showProgressPanel() { - getContentPane().remove(choosePanel); - getContentPane().remove(installPanel); getContentPane().remove(notFoundPanel); getContentPane().add(progressPanel, BorderLayout.SOUTH); --- 80,95 ---- }//GEN-LAST:event_formWindowClosing ! private ProgressPanel progressPanel; private NotFoundPanel notFoundPanel; ! void showChooseDialog() { getContentPane().remove(progressPanel); getContentPane().remove(notFoundPanel); validate(); repaint(); } ! void showProgressPanel() { getContentPane().remove(notFoundPanel); getContentPane().add(progressPanel, BorderLayout.SOUTH); *************** *** 255,280 **** } - void showInstallPanel() { - getContentPane().remove(choosePanel); - getContentPane().remove(statusPanel); - getContentPane().remove(notFoundPanel); - getContentPane().add(installPanel, BorderLayout.SOUTH); - validate(); - repaint(); - } - void showNotFoundPanel() { ! getContentPane().remove(choosePanel); ! getContentPane().remove(installPanel); ! getContentPane().remove(statusPanel); getContentPane().add(notFoundPanel, BorderLayout.SOUTH); validate(); repaint(); } ! ! void setStatus(String text) { ! status.setText(text); ! } ! void installQ2Data() { showNotFoundPanel(); --- 98,108 ---- } void showNotFoundPanel() { ! getContentPane().remove(progressPanel); getContentPane().add(notFoundPanel, BorderLayout.SOUTH); validate(); repaint(); } ! void installQ2Data() { showNotFoundPanel(); *************** *** 312,316 **** private Q2DataInstaller parent; ! private JCheckBox install; private JButton exit; private JButton ok; --- 140,145 ---- private Q2DataInstaller parent; ! private JTextField jTextField1; ! private JButton changeButton; private JButton exit; private JButton ok; *************** *** 330,335 **** setPreferredSize(d); ! message = new JLabel(" "); ! message.setForeground(Color.RED); constraints.gridx = 0; constraints.gridy = 0; --- 159,164 ---- setPreferredSize(d); ! message = new JLabel("install Quake2 demo data"); ! message.setForeground(Color.BLACK); constraints.gridx = 0; constraints.gridy = 0; *************** *** 338,378 **** constraints.anchor = GridBagConstraints.CENTER; add(message, constraints); - - constraints.gridx = 1; - constraints.gridy = 1; - constraints.gridwidth = 2; - constraints.weightx = 1; - constraints.fill = GridBagConstraints.HORIZONTAL; - constraints.insets = new Insets(0, 2, 0, 5); - constraints.anchor = GridBagConstraints.WEST; - - - constraints.gridx = 1; - constraints.gridy = 2; - JLabel label = new JLabel("install Quake2 demo data"); - label.addMouseListener(new MouseAdapter() { - public void mouseClicked(MouseEvent e) { - install.setSelected(!install.isSelected()); - } - }); - add(label, constraints); - - - install = new JCheckBox(); - install.setSelected(true); constraints.gridx = 0; constraints.gridy = 1; constraints.gridwidth = 1; constraints.weightx = 0; ! constraints.insets = new Insets(0, 5, 0, 2); ! constraints.fill = GridBagConstraints.NONE; ! constraints.anchor = GridBagConstraints.EAST; ! ! constraints.gridx = 0; ! constraints.gridy = 2; ! add(install, constraints); ! constraints.gridx = 0; constraints.gridy = 3; --- 167,205 ---- constraints.anchor = GridBagConstraints.CENTER; add(message, constraints); constraints.gridx = 0; constraints.gridy = 1; constraints.gridwidth = 1; + constraints.insets = new java.awt.Insets(5, 5, 5, 5); constraints.weightx = 0; ! constraints.anchor = GridBagConstraints.SOUTHWEST; ! add(new JLabel("Quake2 demo"),constraints); ! ! jTextField1 = new JTextField(); ! jTextField1.setText("../Quake2Demo/q2-314-demo-x86.exe"); ! constraints.gridx = 1; ! constraints.gridy = 1; ! constraints.gridwidth = 2; ! constraints.fill = java.awt.GridBagConstraints.BOTH; ! constraints.insets = new java.awt.Insets(5, 2, 5, 2); ! constraints.weightx = 1; ! add(jTextField1, constraints); ! changeButton = new JButton(); ! changeButton.setText("..."); ! changeButton.addActionListener(new java.awt.event.ActionListener() { ! public void actionPerformed(java.awt.event.ActionEvent evt) { ! changeButtonActionPerformed(); ! } ! }); ! constraints.gridx = 3; ! constraints.gridy = 1; ! constraints.gridwidth = 1; ! constraints.weightx = 0; ! constraints.fill = java.awt.GridBagConstraints.NONE; ! constraints.insets = new java.awt.Insets(5, 2, 5, 5); ! constraints.anchor = java.awt.GridBagConstraints.EAST; ! add(changeButton, constraints); ! constraints.gridx = 0; constraints.gridy = 3; *************** *** 391,395 **** constraints.gridx = 2; constraints.gridy = 3; ! constraints.gridwidth = 1; constraints.anchor = GridBagConstraints.SOUTHEAST; ok = new JButton("OK"); --- 218,222 ---- constraints.gridx = 2; constraints.gridy = 3; ! constraints.gridwidth = 2; constraints.anchor = GridBagConstraints.SOUTHEAST; ok = new JButton("OK"); *************** *** 402,579 **** private void ok() { - if (!install.isSelected()) System.exit(0); parent.progressPanel.destDir = parent.destdir; ! parent.progressPanel.mirror = "q2-314-demo-x86.exe"; ! parent.showProgressPanel(); ! new Thread(parent.progressPanel).start(); ! } ! } ! ! static class InstallPanel extends JPanel { ! ! private Vector mirrorNames = new Vector(); ! private Vector mirrorLinks = new Vector(); ! private Q2DataInstaller parent; ! private JComboBox mirrorBox; ! private JTextField destDir; ! private JButton cancel; ! private JButton exit; ! private JButton install; ! private JButton choose; ! ! public InstallPanel(Q2DataInstaller d) { ! initComponents(); ! String dir = Q2DataInstaller.home + Q2DataInstaller.sep + "jake2"; ! destDir.setText(dir); ! initMirrors(); ! parent = d; ! } ! ! private void initComponents() { ! GridBagConstraints constraints = new GridBagConstraints(); ! setLayout(new GridBagLayout()); ! Dimension d = new Dimension(400, 100); ! setMinimumSize(d); ! setMaximumSize(d); ! setPreferredSize(d); ! ! constraints.gridx = 0; ! constraints.gridy = 0; ! constraints.insets = new Insets(5, 5, 0, 5); ! constraints.anchor = GridBagConstraints.SOUTHWEST; ! add(new JLabel("download mirror"), constraints); ! ! constraints.gridx = 0; ! constraints.gridy = 1; ! constraints.insets = new Insets(5, 5, 5, 5); ! add(new JLabel("destination directory"), constraints); ! ! constraints.gridx = 1; ! constraints.gridy = 0; ! constraints.weightx = 1; ! constraints.gridwidth = 3; ! constraints.insets = new Insets(5, 5, 0, 5); ! constraints.fill = GridBagConstraints.HORIZONTAL; ! mirrorBox = new JComboBox(); ! add(mirrorBox, constraints); ! ! constraints.gridx = 1; ! constraints.gridy = 1; ! constraints.gridwidth = 2; ! constraints.fill = GridBagConstraints.BOTH; ! constraints.insets = new Insets(5, 5, 5, 5); ! destDir = new JTextField(); ! add(destDir, constraints); ! ! constraints.gridx = 3; ! constraints.gridy = 1; ! constraints.weightx = 0; ! constraints.gridwidth = 1; ! constraints.fill = GridBagConstraints.NONE; ! choose = new JButton("..."); ! choose.addActionListener(new ActionListener() { ! public void actionPerformed(ActionEvent e) { ! choose(); ! }}); ! add(choose, constraints); ! ! constraints.gridx = 0; ! constraints.gridy = 2; ! constraints.gridwidth = 1; ! constraints.weighty = 1; ! constraints.fill = GridBagConstraints.NONE; ! exit = new JButton("Exit"); ! exit.addActionListener(new ActionListener() { ! public void actionPerformed(ActionEvent e) { ! exit(); ! }}); ! add(exit, constraints); ! ! constraints.gridx = 0; ! constraints.gridy = 2; ! constraints.gridwidth = 4; ! constraints.anchor = GridBagConstraints.SOUTH; ! cancel = new JButton("Cancel"); ! cancel.addActionListener(new ActionListener() { ! public void actionPerformed(ActionEvent e) { ! cancel(); ! }}); ! add(cancel, constraints); ! ! constraints.gridx = 2; ! constraints.gridy = 2; ! constraints.gridwidth = 2; ! constraints.anchor = GridBagConstraints.SOUTHEAST; ! install = new JButton("Install"); ! install.addActionListener(new ActionListener() { ! public void actionPerformed(ActionEvent e) { ! install(); ! }}); ! add(install, constraints); ! } ! ! private void readMirrors() { ! InputStream in = getClass().getResourceAsStream("/mirrors"); ! BufferedReader r = new BufferedReader(new InputStreamReader(in)); ! try { ! int i = 0; ! while (true) { ! String name = r.readLine(); ! String value = r.readLine(); ! if (name == null || value == null) break; ! mirrorNames.add(name); ! mirrorLinks.add(value); ! } ! } catch (Exception e) {} ! finally { ! try { ! r.close(); ! } catch (Exception e1) {} ! try { ! in.close(); ! } catch (Exception e1) {} ! } ! } ! ! private void initMirrors() { ! readMirrors(); ! for (int i = 0; i < mirrorNames.size(); i++) { ! mirrorBox.addItem(mirrorNames.get(i)); } - int i = Globals.rnd.nextInt(mirrorNames.size()); - mirrorBox.setSelectedIndex(i); - } - - private void cancel() { - parent.showNotFoundPanel(); - } - - private void install() { - parent.progressPanel.destDir = destDir.getText(); - parent.progressPanel.mirror = (String)mirrorLinks.get(mirrorBox.getSelectedIndex()); - parent.showProgressPanel(); - new Thread(parent.progressPanel).start(); } ! private void exit() { ! System.exit(0); ! } ! ! private void choose() { ! JFileChooser chooser = new JFileChooser(); ! chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); ! chooser.setDialogType(JFileChooser.CUSTOM_DIALOG); ! chooser.setMultiSelectionEnabled(false); ! chooser.setDialogTitle("choose destination directory"); ! chooser.showDialog(this, "OK"); ! ! String dir = null; ! try { ! dir = chooser.getSelectedFile().getCanonicalPath(); ! } catch (Exception e) {} ! if (dir != null) destDir.setText(dir); } } ! static class ProgressPanel extends JPanel implements Runnable { --- 229,264 ---- private void ok() { parent.progressPanel.destDir = parent.destdir; ! parent.progressPanel.mirror = jTextField1.getText(); ! File f = new File(jTextField1.getText()); ! if (f.canRead()) { ! parent.showProgressPanel(); ! new Thread(parent.progressPanel).start(); ! } else { ! message.setText("could not read " + jTextField1.getText()); } } ! private void changeButtonActionPerformed() { ! JFileChooser chooser = new JFileChooser(); ! chooser.setCurrentDirectory(new File(".")); ! chooser.setFileSelectionMode(JFileChooser.FILES_ONLY); ! chooser.setDialogType(JFileChooser.CUSTOM_DIALOG); ! chooser.setMultiSelectionEnabled(false); ! chooser.setDialogTitle("select Quake2 demo file"); ! int ret = chooser.showDialog(this, "OK"); ! ! if (ret == JFileChooser.APPROVE_OPTION) { ! String dir = null; ! try { ! dir = chooser.getSelectedFile().getCanonicalPath(); ! } catch (Exception e) { ! } ! if (dir != null) ! jTextField1.setText(dir); ! } } } ! static class ProgressPanel extends JPanel implements Runnable { *************** *** 650,659 **** try { if (!dir.isDirectory() || !dir.canWrite()) { ! endInstall("can't write to " + destDir); return; } } catch (Exception e) { ! endInstall(e.getMessage()); return; } --- 335,344 ---- try { if (!dir.isDirectory() || !dir.canWrite()) { ! endInstall(false, "can't write to " + destDir); return; } } catch (Exception e) { ! endInstall(false, e.getMessage()); return; } *************** *** 662,670 **** installData(mirror); } catch (Exception e) { ! endInstall(e.getMessage()); return; } ! endInstall("installation successful"); } --- 347,355 ---- installData(mirror); } catch (Exception e) { ! endInstall(false, e.getMessage()); return; } ! endInstall(true, "installation successful"); } *************** *** 704,712 **** } ! void endInstall(String message) { ! parent.notFoundPanel.message.setText(message); ! parent.dir = destDir + "/baseq2"; ! parent.showChooseDialog(); ! parent.okButtonActionPerformed(null); } --- 389,400 ---- } ! void endInstall(boolean exit, String text) { ! parent.notFoundPanel.message.setText(text); ! parent.showNotFoundPanel(); ! ! if (exit) { ! parent.okButtonActionPerformed(null); ! System.exit(0); ! } } *************** *** 744,748 **** installer.installQ2Data(); - System.exit(0); } } --- 432,435 ---- |
|
From: Holger Z. <hz...@us...> - 2004-10-31 19:44:03
|
Update of /cvsroot/jake2/jake2/webstart In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2652/webstart Modified Files: jake2_jogl11.jnlp jake2_jogl11ATI.jnlp jake2.jnlp Log Message: include joal patch for webstart version Index: jake2.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2.jnlp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** jake2.jnlp 21 Sep 2004 13:30:09 -0000 1.3 --- jake2.jnlp 31 Oct 2004 19:43:50 -0000 1.4 *************** *** 26,30 **** --- 26,32 ---- <resources os="Linux"> <j2se version="1.4+" max-heap-size="128M"/> + <jar href="http://jake2.sourceforge.net/lib/patch.jar"/> <jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/> + <jar href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/jogl-native.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> Index: jake2_jogl11ATI.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11ATI.jnlp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** jake2_jogl11ATI.jnlp 21 Sep 2004 13:30:09 -0000 1.1 --- jake2_jogl11ATI.jnlp 31 Oct 2004 19:43:50 -0000 1.2 *************** *** 27,31 **** --- 27,33 ---- <resources os="Linux"> <j2se version="1.4+" max-heap-size="128M"/> + <jar href="http://jake2.sourceforge.net/lib/patch.jar"/> <jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/> + <jar href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> </resources> Index: jake2_jogl11.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11.jnlp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** jake2_jogl11.jnlp 21 Sep 2004 13:30:09 -0000 1.1 --- jake2_jogl11.jnlp 31 Oct 2004 19:43:50 -0000 1.2 *************** *** 27,31 **** --- 27,33 ---- <resources os="Linux"> <j2se version="1.4+" max-heap-size="128M"/> + <jar href="http://jake2.sourceforge.net/lib/patch.jar"/> <jar href="http://jake2.sourceforge.net/lib/linux/joal.jar"/> + <jar href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> <nativelib href="http://jake2.sourceforge.net/lib/linux/joal-native.jar"/> </resources> |
|
From: Holger Z. <hz...@us...> - 2004-10-31 19:40:49
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1919 Modified Files: install.xml Log Message: don't create shortcuts Index: install.xml =================================================================== RCS file: /cvsroot/jake2/jake2/install.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** install.xml 25 Oct 2004 15:15:26 -0000 1.2 --- install.xml 31 Oct 2004 19:40:40 -0000 1.3 *************** *** 33,37 **** <panel classname="PacksPanel"/> <panel classname="InstallPanel"/> ! <panel classname="ShortcutPanel"/> <panel classname="SimpleFinishPanel"/> </panels> --- 33,37 ---- <panel classname="PacksPanel"/> <panel classname="InstallPanel"/> ! <!-- panel classname="ShortcutPanel"/ --> <panel classname="SimpleFinishPanel"/> </panels> *************** *** 73,77 **** </packs> ! <native type="izpack" name="ShellLink.dll"/> </installation> --- 73,77 ---- </packs> ! <!-- native type="izpack" name="ShellLink.dll"/ --> </installation> |
|
From: Holger Z. <hz...@us...> - 2004-10-31 19:39:59
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1754 Modified Files: build.xml Log Message: include joal patch for webstart version Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** build.xml 24 Oct 2004 20:40:06 -0000 1.13 --- build.xml 31 Oct 2004 19:39:48 -0000 1.14 *************** *** 15,18 **** --- 15,19 ---- <property name="version" value="cvs"/> <property name="src" location="src"/> + <property name="patch" location="patch"/> <property name="test" location="test"/> <property name="build" location="build"/> *************** *** 114,118 **** <target name="jar" depends="compile,copyres"> <jar destfile="jake2.jar" basedir="${build}"> ! <include name="**"/> </jar> <proguard printseeds="on" printusage="off" outjar="${dist}/lib/jake2.jar" --- 115,121 ---- <target name="jar" depends="compile,copyres"> <jar destfile="jake2.jar" basedir="${build}"> ! <include name="jake2/**"/> ! <include name="*.png"/> ! <include name="mirrors"/> </jar> <proguard printseeds="on" printusage="off" outjar="${dist}/lib/jake2.jar" *************** *** 201,205 **** <!-- webstart --> ! <target name="webstart" depends="dist"> <mkdir dir="webstart/lib"/> <copy todir="webstart/lib"> --- 204,208 ---- <!-- webstart --> ! <target name="webstart" depends="dist,patch"> <mkdir dir="webstart/lib"/> <copy todir="webstart/lib"> *************** *** 207,210 **** --- 210,216 ---- <include name="**/*.jar"/> </fileset> + <fileset dir="."> + <include name="patch.jar"/> + </fileset> </copy> <jar destfile="webstart/lib/linux/jogl-native.jar" basedir="${dist}/lib/linux"> *************** *** 247,249 **** --- 253,267 ---- </delete> </target> + + <!-- patch --> + <target name="patch"> + <javac destdir="${build}" optimize="on" debug="off" source="1.4"> + <src path="${patch}"/> + <include name="**"/> + <classpath refid="build.class.path"/> + </javac> + <jar destfile="patch.jar" basedir="${build}"> + <include name="net/**"/> + </jar> + </target> </project> \ No newline at end of file |
|
From: Holger Z. <hz...@us...> - 2004-10-31 19:38:38
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1517 Modified Files: README ChangeLog README_DE Log Message: README updates Index: README =================================================================== RCS file: /cvsroot/jake2/jake2/README,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** README 8 Sep 2004 09:51:51 -0000 1.4 --- README 31 Oct 2004 19:38:27 -0000 1.5 *************** *** 24,31 **** from binary distribution: ! - unpack jake2-version.tar.gz or jake2-version.zip ! - copy the baseq2 directory from your full version of Quake2 or from the ! demo version to the Jake2 base directory, in fact You need only ! baseq2/pak0.pak - run the game with Jake2.sh or Jake2.bat --- 24,30 ---- from binary distribution: ! - run the installer with "java -jar Jake2-Install.jar" ! - follow the instructions ! - change to the installation directory - run the game with Jake2.sh or Jake2.bat *************** *** 37,44 **** installation of Quake2 data: ! - download ftp://ftp.idsoftware.com/idstuff/quake2/q2-314-demo-x86.exe (37 MB) ! - extract the directory Install\Data\baseq2 from q2-314-demo-x86.exe with unzip ! or Winzip ! - copy the baseq2 directory to the Jake2 directory If you want to have the latest experimental features you can grab the latest --- 36,42 ---- installation of Quake2 data: ! - if Jake2 does not detect the Quake2 files on startup you have the choice ! to select a baseq2 directory of a Quake2 installation (demo or full version) ! or to download and install the Quake2 demo files If you want to have the latest experimental features you can grab the latest *************** *** 49,52 **** --- 47,66 ---- - procced with the build from source instructions + 3rd party components + -------------------- + + Jake2 uses: + jogl OpenGL bindings https://jogl.dev.java.net + joal OpenAL bindings https://joal.dev.java.net + openal Audio library http://www.openal.org + 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 + + + have fun! Index: README_DE =================================================================== RCS file: /cvsroot/jake2/jake2/README_DE,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** README_DE 8 Sep 2004 09:51:51 -0000 1.4 --- README_DE 31 Oct 2004 19:38:27 -0000 1.5 *************** *** 16,21 **** Jake2 wird von uns unter Linux und Windows2000/XP getestet. Wir haben Feedback, ! dass Jake2 richtigen plattformspezifischen jogl Bibliotheken auch auf Mac OS X ! läuft. Mindestanforderungen: --- 16,21 ---- 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. Mindestanforderungen: *************** *** 28,35 **** ausgehend von der Binärdistribution: ! - jake2-version.tar.gz oder jake2-version.zip entpacken ! - baseq2 Verzeichnis des Quake2 Originals oder der Demoversion in das Jake2 ! Verzeichnis kopieren ! - mit Jake2.sh oder Jake2.bat starten ausgehend von Sourcedistribution: --- 28,35 ---- ausgehend von der Binärdistribution: ! - Installationsprogramm mit "java -jar Jake2-Install.jar" starten ! - den Anweisungen folgen ! - ins Installationsverzeichnis wechseln ! - Jake2 mit "jake2.sh" oder "jake2.bat" aus dem Installationsverzeichnis starten ausgehend von Sourcedistribution: *************** *** 39,47 **** Quake2 Leveldaten installieren: ! - ftp://ftp.idsoftware.com/idstuff/quake2/q2-314-demo-x86.exe (37 MB) ! herunterladen ! - Install\Data\baseq2\ aus q2-314-demo-x86.exe mit unzip oder Winzip ! extrahieren ! - baseq2 ins Jake2 Verzeichnis kopieren Zum Testen neuer und experimenteller Features kann der aktuelle Jake2 --- 39,46 ---- Quake2 Leveldaten installieren: ! - Wenn die Quake2 Leveldaten beim Start von Jake2 nicht gefunden werden, ! besteht die Möglichkeit ein baseq2 Verzeichnis einer bestehenden Quake2 ! Installation (Demo oder Vollversion) auszuwählen oder die Leveldaten der ! Demo herunterzuladen und zu installieren Zum Testen neuer und experimenteller Features kann der aktuelle Jake2 *************** *** 52,55 **** --- 51,70 ---- - dann gehts weiter wie oben für die Sourcedistribution beschrieben + externe Komponenten + ------------------- + + Jake2 benutzt: + jogl OpenGL bindings https://jogl.dev.java.net + joal OpenAL bindings https://joal.dev.java.net + openal Audio library http://www.openal.org + 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 + + + viel Spass! Index: ChangeLog =================================================================== RCS file: /cvsroot/jake2/jake2/ChangeLog,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ChangeLog 8 Sep 2004 20:41:20 -0000 1.4 --- ChangeLog 31 Oct 2004 19:38:27 -0000 1.5 *************** *** 1,2 **** --- 1,9 ---- + 0.9.4 + + - standalone installer + - online installation of Quake2 demo data files + - multiplayer client functionality (with original Quake2 server) + - bugfixes + 0.9.3 2004-09-09 |
2 messages has been excluded from this view by a project administrator.
