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...> - 2012-04-12 22:01:27
|
Update of /cvsroot/jake2/jake2/src/jake2/sound/lwjgl In directory vz-cvs-3.sog:/tmp/cvs-serv9975/src/jake2/sound/lwjgl Modified Files: PlaySound.java Log Message: formatted Index: PlaySound.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sound/lwjgl/PlaySound.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PlaySound.java 8 May 2005 13:37:46 -0000 1.2 --- PlaySound.java 12 Apr 2012 22:01:24 -0000 1.3 *************** *** 7,28 **** */ /* ! Copyright (C) 1997-2001 Id Software, Inc. ! This program is free software; you can redistribute it and/or ! modify it under the terms of the GNU General Public License ! as published by the Free Software Foundation; either version 2 ! of the License, or (at your option) any later version. ! This program is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! See the GNU General Public License for more details. ! You should have received a copy of the GNU General Public License ! along with this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! */ package jake2.sound.lwjgl; --- 7,28 ---- */ /* ! Copyright (C) 1997-2001 Id Software, Inc. ! This program is free software; you can redistribute it and/or ! modify it under the terms of the GNU General Public License ! as published by the Free Software Foundation; either version 2 ! of the License, or (at your option) any later version. ! This program is distributed in the hope that it will be useful, ! but WITHOUT ANY WARRANTY; without even the implied warranty of ! MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ! See the GNU General Public License for more details. ! You should have received a copy of the GNU General Public License ! along with this program; if not, write to the Free Software ! Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ! */ package jake2.sound.lwjgl; *************** *** 36,66 **** */ public class PlaySound { ! ! final static int MAX_PLAYSOUNDS = 128; ! ! // list with sentinel ! private static PlaySound freeList; ! private static PlaySound playableList; ! ! private static PlaySound[] backbuffer = new PlaySound[MAX_PLAYSOUNDS]; ! static { ! for (int i = 0; i < backbuffer.length; i++) { ! backbuffer[i] = new PlaySound(); } ! // init the sentinels ! freeList = new PlaySound(); ! playableList = new PlaySound(); ! // reset the lists ! reset(); ! } ! // sound attributes int type; ! int entnum; ! int entchannel; int bufferId; float volume; float attenuation; ! float[] origin = {0,0,0}; // begin time in ms --- 36,66 ---- */ public class PlaySound { ! ! final static int MAX_PLAYSOUNDS = 128; ! ! // list with sentinel ! private static PlaySound freeList; ! private static PlaySound playableList; ! ! private static PlaySound[] backbuffer = new PlaySound[MAX_PLAYSOUNDS]; ! static { ! for (int i = 0; i < backbuffer.length; i++) { ! backbuffer[i] = new PlaySound(); } ! // init the sentinels ! freeList = new PlaySound(); ! playableList = new PlaySound(); ! // reset the lists ! reset(); ! } ! // sound attributes int type; ! int entnum; ! int entchannel; int bufferId; float volume; float attenuation; ! float[] origin = { 0, 0, 0 }; // begin time in ms *************** *** 74,80 **** this.clear(); } ! private void clear() { ! type = bufferId = entnum = entchannel = -1; // volume = attenuation = beginTime = 0; attenuation = beginTime = 0; --- 74,80 ---- this.clear(); } ! private void clear() { ! type = bufferId = entnum = entchannel = -1; // volume = attenuation = beginTime = 0; attenuation = beginTime = 0; *************** *** 86,96 **** freeList.next = freeList.prev = freeList; playableList.next = playableList.prev = playableList; ! // concat the the freeList PlaySound ps; ! for (int i = 0; i < backbuffer.length; i++) { ! ps = backbuffer[i]; ! ps.clear(); ! ps.prev = freeList; ps.next = freeList.next; ps.prev.next = ps; --- 86,96 ---- freeList.next = freeList.prev = freeList; playableList.next = playableList.prev = playableList; ! // concat the the freeList PlaySound ps; ! for (int i = 0; i < backbuffer.length; i++) { ! ps = backbuffer[i]; ! ps.clear(); ! ps.prev = freeList; ps.next = freeList.next; ps.prev.next = ps; *************** *** 98,102 **** } } ! static PlaySound nextPlayableSound() { PlaySound ps = null; --- 98,102 ---- } } ! static PlaySound nextPlayableSound() { PlaySound ps = null; *************** *** 109,118 **** } } ! private static PlaySound get() { PlaySound ps = freeList.next; if (ps == freeList) return null; ! ps.prev.next = ps.next; ps.next.prev = ps.prev; --- 109,118 ---- } } ! private static PlaySound get() { PlaySound ps = freeList.next; if (ps == freeList) return null; ! ps.prev.next = ps.next; ps.next.prev = ps.prev; *************** *** 121,128 **** private static void add(PlaySound ps) { ! PlaySound sort = playableList.next; ! ! for (; sort != playableList && sort.beginTime < ps.beginTime; sort = sort.next); ps.next = sort; ps.prev = sort.prev; --- 121,129 ---- private static void add(PlaySound ps) { ! PlaySound sort = playableList.next; ! ! for (; sort != playableList && sort.beginTime < ps.beginTime; sort = sort.next) ! ; ps.next = sort; ps.prev = sort.prev; *************** *** 140,144 **** freeList.next = ps; } ! static void allocate(float[] origin, int entnum, int entchannel, int bufferId, float volume, float attenuation, float timeoffset) { --- 141,145 ---- freeList.next = ps; } ! static void allocate(float[] origin, int entnum, int entchannel, int bufferId, float volume, float attenuation, float timeoffset) { *************** *** 161,165 **** ps.volume = volume; ps.attenuation = attenuation; ! ps.beginTime = Globals.cl.time + (long)(timeoffset * 1000); PlaySound.add(ps); } else { --- 162,166 ---- ps.volume = volume; ps.attenuation = attenuation; ! ps.beginTime = Globals.cl.time + (long) (timeoffset * 1000); PlaySound.add(ps); } else { |
From: Carsten W. <ca...@us...> - 2012-04-12 20:31:26
|
Update of /cvsroot/jake2/jake2/webstart In directory vz-cvs-3.sog:/tmp/cvs-serv3137/webstart Modified Files: jake2_online.jnlp jake2_lwjgl.jnlp jake2_jogl11.jnlp jake2_jsr231.jnlp Log Message: use lwjgl version 2.8.3 with bug fixes for Mac OS X Index: jake2_online.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_online.jnlp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** jake2_online.jnlp 18 Nov 2011 16:27:56 -0000 1.8 --- jake2_online.jnlp 12 Apr 2012 20:31:23 -0000 1.9 *************** *** 21,30 **** <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/webstart/2.8.2/extension.jnlp" /> ! <!-- <property name="sun.java2d.noddraw" value="true"/> <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp" /> <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> ! --> </resources> --- 21,30 ---- <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/webstart/2.8.3/extension.jnlp" /> ! <!-- <property name="sun.java2d.noddraw" value="true"/> <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp" /> <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> ! --> </resources> Index: jake2_jogl11.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11.jnlp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** jake2_jogl11.jnlp 18 Nov 2011 16:35:36 -0000 1.18 --- jake2_jogl11.jnlp 12 Apr 2012 20:31:23 -0000 1.19 *************** *** 21,26 **** <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/webstart/2.8.2/extension.jnlp" /> ! <!-- <property name="sun.java2d.noddraw" value="true"/> <extension name="jogl" href="https://jogl.dev.java.net/webstart/jogl-1-1.jnlp"/> --- 21,26 ---- <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/webstart/2.8.3/extension.jnlp" /> ! <!-- <property name="sun.java2d.noddraw" value="true"/> <extension name="jogl" href="https://jogl.dev.java.net/webstart/jogl-1-1.jnlp"/> Index: jake2_lwjgl.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_lwjgl.jnlp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** jake2_lwjgl.jnlp 18 Nov 2011 16:27:56 -0000 1.16 --- jake2_lwjgl.jnlp 12 Apr 2012 20:31:23 -0000 1.17 *************** *** 21,25 **** <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/webstart/2.8.2/extension.jnlp" /> </resources> --- 21,25 ---- <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/webstart/2.8.3/extension.jnlp" /> </resources> Index: jake2_jsr231.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jsr231.jnlp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** jake2_jsr231.jnlp 18 Nov 2011 16:27:56 -0000 1.4 --- jake2_jsr231.jnlp 12 Apr 2012 20:31:23 -0000 1.5 *************** *** 21,30 **** <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/webstart/2.8.2/extension.jnlp" /> ! <!-- ! <property name="sun.java2d.noddraw" value="true"/> <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp" /> <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> ! --> </resources> --- 21,30 ---- <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/webstart/2.8.3/extension.jnlp" /> ! <!-- ! <property name="sun.java2d.noddraw" value="true"/> <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp" /> <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> ! --> </resources> |
From: Carsten W. <ca...@us...> - 2012-04-12 20:18:05
|
Update of /cvsroot/jake2/jake2 In directory vz-cvs-3.sog:/tmp/cvs-serv32526 Modified Files: .classpath Log Message: use standard JRE and exclude Jake2Applet.java Index: .classpath =================================================================== RCS file: /cvsroot/jake2/jake2/.classpath,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** .classpath 8 Jul 2011 09:34:31 -0000 1.11 --- .classpath 12 Apr 2012 20:18:03 -0000 1.12 *************** *** 1,5 **** <?xml version="1.0" encoding="UTF-8"?> <classpath> ! <classpathentry kind="src" path="src"/> <classpathentry kind="src" path="test"/> <classpathentry kind="lib" path="lib/joal/joal.jar"/> --- 1,5 ---- <?xml version="1.0" encoding="UTF-8"?> <classpath> ! <classpathentry excluding="jake2/Jake2Applet.java" kind="src" path="src"/> <classpathentry kind="src" path="test"/> <classpathentry kind="lib" path="lib/joal/joal.jar"/> *************** *** 10,14 **** <classpathentry kind="lib" path="lib/lwjgl/lwjgl.jar"/> <classpathentry kind="lib" path="resources"/> ! <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6"/> <classpathentry kind="lib" path="lib/jl1.0.1.jar"/> <classpathentry kind="output" path="build"/> --- 10,14 ---- <classpathentry kind="lib" path="lib/lwjgl/lwjgl.jar"/> <classpathentry kind="lib" path="resources"/> ! <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="lib" path="lib/jl1.0.1.jar"/> <classpathentry kind="output" path="build"/> |
From: Carsten W. <ca...@us...> - 2011-11-18 16:38:13
|
Update of /cvsroot/jake2/jake2 In directory vz-cvs-3.sog:/tmp/cvs-serv5550 Modified Files: build.xml Log Message: copy new lib/jl1.0.1.jar to dist/lib for jar signing Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.40 retrieving revision 1.41 diff -C2 -d -r1.40 -r1.41 *** build.xml 26 Jul 2011 08:27:34 -0000 1.40 --- build.xml 18 Nov 2011 16:38:11 -0000 1.41 *************** *** 72,75 **** --- 72,78 ---- <target name="copy"> <copy todir="${dist}/lib"> + <fileset dir="lib"> + <include name="*.jar"/> + </fileset> <fileset dir="lib/jogl"> <include name="*.jar"/> *************** *** 313,315 **** </delete> </target> ! </project> \ No newline at end of file --- 316,318 ---- </delete> </target> ! </project> |
From: Carsten W. <ca...@us...> - 2011-11-18 16:35:39
|
Update of /cvsroot/jake2/jake2/webstart In directory vz-cvs-3.sog:/tmp/cvs-serv5146 Modified Files: jake2_jogl11.jnlp Log Message: switch all webstart files to lwjgl 2.8.2 because of jar signing erros Index: jake2_jogl11.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11.jnlp,v retrieving revision 1.17 retrieving revision 1.18 diff -C2 -d -r1.17 -r1.18 *** jake2_jogl11.jnlp 8 Jul 2011 09:45:28 -0000 1.17 --- jake2_jogl11.jnlp 18 Nov 2011 16:35:36 -0000 1.18 *************** *** 21,27 **** <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <property name="sun.java2d.noddraw" value="true"/> ! <extension name="jogl" href="https://jogl.dev.java.net/webstart/jogl-1-1.jnlp"/> ! <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> </resources> --- 21,30 ---- <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/webstart/2.8.2/extension.jnlp" /> ! <!-- ! <property name="sun.java2d.noddraw" value="true"/> ! <extension name="jogl" href="https://jogl.dev.java.net/webstart/jogl-1-1.jnlp"/> ! <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> ! --> </resources> *************** *** 29,40 **** <argument>+set</argument> <argument>vid_ref</argument> ! <argument>fastjogl</argument> <argument>+set</argument> <argument>s_impl</argument> ! <argument>joal</argument> <argument>+set</argument> <argument>adr0</argument> <argument>jake2.in-chemnitz.de</argument> </application-desc> - </jnlp> --- 32,42 ---- <argument>+set</argument> <argument>vid_ref</argument> ! <argument>lwjgl</argument> <!-- <argument>fastjogl</argument> --> <argument>+set</argument> <argument>s_impl</argument> ! <argument>lwjgl</argument> <!-- <argument>joal</argument> --> <argument>+set</argument> <argument>adr0</argument> <argument>jake2.in-chemnitz.de</argument> </application-desc> </jnlp> |
From: Carsten W. <ca...@us...> - 2011-11-18 16:27:59
|
Update of /cvsroot/jake2/jake2/webstart In directory vz-cvs-3.sog:/tmp/cvs-serv1943 Modified Files: jake2_jsr231.jnlp jake2_lwjgl.jnlp jake2_online.jnlp Log Message: switch all webstart files to lwjgl 2.8.2 because of jar signing erros Index: jake2_online.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_online.jnlp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** jake2_online.jnlp 8 Jul 2011 09:45:28 -0000 1.7 --- jake2_online.jnlp 18 Nov 2011 16:27:56 -0000 1.8 *************** *** 21,27 **** <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <property name="sun.java2d.noddraw" value="true"/> ! <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp" /> ! <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> </resources> --- 21,30 ---- <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/webstart/2.8.2/extension.jnlp" /> ! <!-- ! <property name="sun.java2d.noddraw" value="true"/> ! <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp" /> ! <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> ! --> </resources> *************** *** 29,36 **** <argument>+set</argument> <argument>vid_ref</argument> ! <argument>jsr231</argument> <argument>+set</argument> <argument>s_impl</argument> ! <argument>joal</argument> <argument>+set</argument> <argument>adr0</argument> --- 32,39 ---- <argument>+set</argument> <argument>vid_ref</argument> ! <argument>lwjgl</argument> <!-- <argument>jsr231</argument> --> <argument>+set</argument> <argument>s_impl</argument> ! <argument>lwjgl</argument> <!-- <argument>joal</argument> --> <argument>+set</argument> <argument>adr0</argument> *************** *** 42,45 **** <argument>88.198.147.212</argument> </application-desc> - </jnlp> --- 45,47 ---- Index: jake2_lwjgl.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_lwjgl.jnlp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** jake2_lwjgl.jnlp 8 Jul 2011 09:45:28 -0000 1.15 --- jake2_lwjgl.jnlp 18 Nov 2011 16:27:56 -0000 1.16 *************** *** 20,38 **** <j2se version="1.4+" max-heap-size="100M"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> - <jar href="http://jake2.in-chemnitz.de/downloads/lib/lwjgl.jar"/> - <jar href="http://jake2.in-chemnitz.de/downloads/lib/lwjgl_util.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! </resources> ! ! <resources os="Linux"> ! <nativelib href="http://jake2.in-chemnitz.de/downloads/lib/linux/lwjgl-native.jar"/> ! </resources> ! ! <resources os="Windows"> ! <nativelib href="http://jake2.in-chemnitz.de/downloads/lib/windows/lwjgl-native.jar"/> ! </resources> ! ! <resources os="Mac OS X"> ! <nativelib href="http://jake2.in-chemnitz.de/downloads/lib/osx/lwjgl-native.jar"/> </resources> --- 20,25 ---- <j2se version="1.4+" max-heap-size="100M"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/webstart/2.8.2/extension.jnlp" /> </resources> Index: jake2_jsr231.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jsr231.jnlp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** jake2_jsr231.jnlp 8 Jul 2011 09:45:28 -0000 1.3 --- jake2_jsr231.jnlp 18 Nov 2011 16:27:56 -0000 1.4 *************** *** 21,27 **** <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <property name="sun.java2d.noddraw" value="true"/> ! <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp" /> ! <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> </resources> --- 21,30 ---- <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> ! <extension name="lwjgl" href="http://lwjgl.org/webstart/2.8.2/extension.jnlp" /> ! <!-- ! <property name="sun.java2d.noddraw" value="true"/> ! <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp" /> ! <extension name="joal" href="http://download.java.net/media/joal/webstart/joal.jnlp" /> ! --> </resources> *************** *** 29,40 **** <argument>+set</argument> <argument>vid_ref</argument> ! <argument>jsr231</argument> <argument>+set</argument> <argument>s_impl</argument> ! <argument>joal</argument> <argument>+set</argument> <argument>adr0</argument> <argument>jake2.in-chemnitz.de</argument> </application-desc> - </jnlp> --- 32,42 ---- <argument>+set</argument> <argument>vid_ref</argument> ! <argument>lwjgl</argument> <!-- <argument>jsr231</argument> --> <argument>+set</argument> <argument>s_impl</argument> ! <argument>lwjgl</argument> <!-- <argument>joal</argument> --> <argument>+set</argument> <argument>adr0</argument> <argument>jake2.in-chemnitz.de</argument> </application-desc> </jnlp> |
From: Rene S. <sa...@us...> - 2011-07-26 08:27:37
|
Update of /cvsroot/jake2/jake2 In directory vz-cvs-3.sog:/tmp/cvs-serv5430 Modified Files: build.xml Log Message: build path fixed Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** build.xml 2 Mar 2008 20:21:09 -0000 1.39 --- build.xml 26 Jul 2011 08:27:34 -0000 1.40 *************** *** 28,31 **** --- 28,32 ---- <pathelement location="lib/lwjgl/lwjgl_util.jar"/> <pathelement location="${java.home}/lib/plugin.jar"/> + <pathelement location="lib/jl1.0.1.jar"/> </path> |
From: Rene S. <sa...@us...> - 2011-07-08 16:01:48
|
Update of /cvsroot/jake2/jake2/src/jake2 In directory vz-cvs-3.sog:/tmp/cvs-serv16106/src/jake2 Modified Files: Globals.java Log Message: 3rd Person Camera support Index: Globals.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/Globals.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Globals.java 8 Jul 2011 14:33:13 -0000 1.8 --- Globals.java 8 Jul 2011 16:01:46 -0000 1.9 *************** *** 101,104 **** --- 101,109 ---- public static cvar_t in_joystick; + public static cvar_t cl_3rd; //third person view + public static cvar_t cl_3rd_angle; //third person view + public static cvar_t cl_3rd_dist; //third person view + + public static cvar_t cl_map; // CDawg hud map, sfranzyshen public static cvar_t cl_map_zoom; // CDawg hud map, sfranzyshen |
From: Rene S. <sa...@us...> - 2011-07-08 14:33:15
|
Update of /cvsroot/jake2/jake2/src/jake2/render/fast In directory vz-cvs-3.sog:/tmp/cvs-serv3549/src/jake2/render/fast Modified Files: Main.java Log Message: eagle eye patch Index: Main.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/fast/Main.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Main.java 7 Jul 2011 21:19:14 -0000 1.7 --- Main.java 8 Jul 2011 14:33:12 -0000 1.8 *************** *** 729,738 **** // float screenaspect = (float) r_newrefdef.width / r_newrefdef.height; ! gl.glMatrixMode(GL_PROJECTION); ! gl.glLoadIdentity(); ! MYgluPerspective(r_newrefdef.fov_y, screenaspect, 4, 4096); ! ! gl.glCullFace(GL_FRONT); ! gl.glMatrixMode(GL_MODELVIEW); gl.glLoadIdentity(); --- 729,748 ---- // float screenaspect = (float) r_newrefdef.width / r_newrefdef.height; ! ! ! gl.glMatrixMode(GL_PROJECTION); ! gl.glLoadIdentity(); ! //MYgluPerspective(r_newrefdef.fov_y, screenaspect, 4, 4096); ! ! // CDawg ! ! if (r_newrefdef.map_view != 0) ! MYgluPerspective (r_newrefdef.fov_y, screenaspect, r_newrefdef.map_zoom-100, r_newrefdef.map_zoom+400); ! else ! MYgluPerspective (r_newrefdef.fov_y, screenaspect, 4, 4096*4); ! // CDawg ! ! gl.glCullFace(GL_FRONT); ! gl.glMatrixMode(GL_MODELVIEW); gl.glLoadIdentity(); |
From: Rene S. <sa...@us...> - 2011-07-08 09:45:31
|
Update of /cvsroot/jake2/jake2/webstart In directory vz-cvs-3.sog:/tmp/cvs-serv18329/webstart Modified Files: jake2_online.jnlp jake2_lwjgl.jnlp jake2_jogl11.jnlp jake2_jsr231.jnlp Log Message: cdaudio mp3 player support Index: jake2_online.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_online.jnlp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** jake2_online.jnlp 17 Mar 2007 17:52:38 -0000 1.6 --- jake2_online.jnlp 8 Jul 2011 09:45:28 -0000 1.7 *************** *** 20,23 **** --- 20,24 ---- <j2se version="1.4+" max-heap-size="100M"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> + <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> <property name="sun.java2d.noddraw" value="true"/> <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp" /> Index: jake2_jogl11.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jogl11.jnlp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** jake2_jogl11.jnlp 17 Mar 2007 17:14:44 -0000 1.16 --- jake2_jogl11.jnlp 8 Jul 2011 09:45:28 -0000 1.17 *************** *** 20,23 **** --- 20,24 ---- <j2se version="1.4+" max-heap-size="100M"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> + <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> <property name="sun.java2d.noddraw" value="true"/> <extension name="jogl" href="https://jogl.dev.java.net/webstart/jogl-1-1.jnlp"/> Index: jake2_lwjgl.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_lwjgl.jnlp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** jake2_lwjgl.jnlp 17 Mar 2007 17:14:44 -0000 1.14 --- jake2_lwjgl.jnlp 8 Jul 2011 09:45:28 -0000 1.15 *************** *** 22,25 **** --- 22,26 ---- <jar href="http://jake2.in-chemnitz.de/downloads/lib/lwjgl.jar"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/lwjgl_util.jar"/> + <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> </resources> Index: jake2_jsr231.jnlp =================================================================== RCS file: /cvsroot/jake2/jake2/webstart/jake2_jsr231.jnlp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** jake2_jsr231.jnlp 17 Mar 2007 17:14:44 -0000 1.2 --- jake2_jsr231.jnlp 8 Jul 2011 09:45:28 -0000 1.3 *************** *** 20,23 **** --- 20,24 ---- <j2se version="1.4+" max-heap-size="100M"/> <jar href="http://jake2.in-chemnitz.de/downloads/lib/jake2.jar"/> + <jar href="http://jake2.in-chemnitz.de/downloads/lib/jl1.0.1.jar"/> <property name="sun.java2d.noddraw" value="true"/> <extension name="jogl" href="http://download.java.net/media/jogl/builds/archive/jsr-231-webstart-current/jogl.jnlp" /> |
From: Rene S. <sa...@us...> - 2011-07-08 09:45:15
|
Update of /cvsroot/jake2/jake2/scripts In directory vz-cvs-3.sog:/tmp/cvs-serv18298/scripts Modified Files: Jake2.sh Jake2.bat Jake2_lwjgl.bat Jake2_mac.sh Jake2_mac_lwjgl.sh Jake2_lwjgl.sh Log Message: cdaudio mp3 player support Index: Jake2_mac_lwjgl.sh =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Jake2_mac_lwjgl.sh,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Jake2_mac_lwjgl.sh 29 Oct 2006 14:49:21 -0000 1.4 --- Jake2_mac_lwjgl.sh 8 Jul 2011 09:45:13 -0000 1.5 *************** *** 3,7 **** export LD_LIBRARY_PATH=lib/osx/lwjgl export DYLD_LIBRARY_PATH=lib/osx/lwjgl ! CP=lib/jake2.jar:lib/lwjgl.jar:lib/lwjgl_util.jar exec java -Xmx100M -Djava.library.path=lib/osx/lwjgl -cp $CP jake2.Jake2 --- 3,7 ---- export LD_LIBRARY_PATH=lib/osx/lwjgl export DYLD_LIBRARY_PATH=lib/osx/lwjgl ! CP=lib/jake2.jar:lib/lwjgl.jar:lib/lwjgl_util.jar:lib/jl1.0.1.jar exec java -Xmx100M -Djava.library.path=lib/osx/lwjgl -cp $CP jake2.Jake2 Index: Jake2.sh =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Jake2.sh,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Jake2.sh 25 Oct 2006 21:13:11 -0000 1.8 --- Jake2.sh 8 Jul 2011 09:45:13 -0000 1.9 *************** *** 4,8 **** export LD_LIBRARY_PATH=lib/linux ! CP=lib/jake2.jar:lib/jogl.jar:lib/joal.jar:lib/gluegen-rt.jar exec java -Xmx100M -Djava.library.path=lib/linux -cp $CP jake2.Jake2 --- 4,8 ---- export LD_LIBRARY_PATH=lib/linux ! CP=lib/jake2.jar:lib/jogl.jar:lib/joal.jar:lib/gluegen-rt.jar:lib/jl1.0.1.jar exec java -Xmx100M -Djava.library.path=lib/linux -cp $CP jake2.Jake2 Index: Jake2_lwjgl.bat =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Jake2_lwjgl.bat,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** Jake2_lwjgl.bat 29 Oct 2006 14:49:21 -0000 1.4 --- Jake2_lwjgl.bat 8 Jul 2011 09:45:13 -0000 1.5 *************** *** 1,4 **** @echo off SET PATH=lib\windows;%PATH% ! SET CP=lib/jake2.jar;lib/lwjgl.jar;lib/lwjgl_util.jar start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows/lwjgl -cp %CP% jake2.Jake2 \ No newline at end of file --- 1,4 ---- @echo off SET PATH=lib\windows;%PATH% ! SET CP=lib/jake2.jar;lib/lwjgl.jar;lib/lwjgl_util.jar;lib/jl1.0.1.jar start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows/lwjgl -cp %CP% jake2.Jake2 \ No newline at end of file Index: Jake2.bat =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Jake2.bat,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** Jake2.bat 25 Oct 2006 21:13:11 -0000 1.8 --- Jake2.bat 8 Jul 2011 09:45:13 -0000 1.9 *************** *** 1,4 **** @echo off SET PATH=lib\windows;%PATH% ! SET CP=lib/jake2.jar;lib/jogl.jar;lib/joal.jar;lib/gluegen-rt.jar start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2 \ No newline at end of file --- 1,4 ---- @echo off SET PATH=lib\windows;%PATH% ! SET CP=lib/jake2.jar;lib/jogl.jar;lib/joal.jar;lib/gluegen-rt.jar;lib/jl1.0.1.jar start javaw -Xmx100M -Dsun.java2d.noddraw=true -Djava.library.path=lib/windows -cp %CP% jake2.Jake2 \ No newline at end of file Index: Jake2_mac.sh =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Jake2_mac.sh,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** Jake2_mac.sh 25 Oct 2006 21:13:11 -0000 1.5 --- Jake2_mac.sh 8 Jul 2011 09:45:13 -0000 1.6 *************** *** 3,7 **** export LD_LIBRARY_PATH=lib/osx export DYLD_LIBRARY_PATH=lib/osx ! CP=lib/jake2.jar:lib/jogl.jar:lib/joal.jar:lib/gluegen-rt.jar exec java -Xmx100M -Djava.library.path=lib/osx -cp $CP jake2.Jake2 --- 3,7 ---- export LD_LIBRARY_PATH=lib/osx export DYLD_LIBRARY_PATH=lib/osx ! CP=lib/jake2.jar:lib/jogl.jar:lib/joal.jar:lib/gluegen-rt.jar;lib/jl1.0.1.jar exec java -Xmx100M -Djava.library.path=lib/osx -cp $CP jake2.Jake2 Index: Jake2_lwjgl.sh =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Jake2_lwjgl.sh,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Jake2_lwjgl.sh 28 Jun 2005 07:01:09 -0000 1.3 --- Jake2_lwjgl.sh 8 Jul 2011 09:45:13 -0000 1.4 *************** *** 4,8 **** export LD_LIBRARY_PATH=lib/linux/lwjgl ! CP=lib/jake2.jar:lib/lwjgl.jar:lib/lwjgl_util.jar exec java -Xmx100M -Djava.library.path=lib/linux/lwjgl -cp $CP jake2.Jake2 --- 4,8 ---- export LD_LIBRARY_PATH=lib/linux/lwjgl ! CP=lib/jake2.jar:lib/lwjgl.jar:lib/lwjgl_util.jar:lib/jl1.0.1.jar exec java -Xmx100M -Djava.library.path=lib/linux/lwjgl -cp $CP jake2.Jake2 |
From: Rene S. <sa...@us...> - 2011-07-08 09:34:33
|
Update of /cvsroot/jake2/jake2 In directory vz-cvs-3.sog:/tmp/cvs-serv17422 Modified Files: .classpath Log Message: cdaudio mp3 player support Index: .classpath =================================================================== RCS file: /cvsroot/jake2/jake2/.classpath,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** .classpath 2 Mar 2008 08:31:23 -0000 1.10 --- .classpath 8 Jul 2011 09:34:31 -0000 1.11 *************** *** 11,14 **** --- 11,15 ---- <classpathentry kind="lib" path="resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/jdk1.6"/> + <classpathentry kind="lib" path="lib/jl1.0.1.jar"/> <classpathentry kind="output" path="build"/> </classpath> |
From: Rene S. <sa...@us...> - 2011-07-08 09:29:45
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory vz-cvs-3.sog:/tmp/cvs-serv16010/src/jake2/client Modified Files: CL_parse.java CL_view.java SCR.java CL.java Log Message: cdaudio mp3 player support Index: SCR.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/SCR.java,v retrieving revision 1.21 retrieving revision 1.22 diff -C2 -d -r1.21 -r1.22 *** SCR.java 2 Mar 2008 14:56:22 -0000 1.21 --- SCR.java 8 Jul 2011 09:29:42 -0000 1.22 *************** *** 574,577 **** --- 574,579 ---- cl.sound_prepped = false; // don't play ambients + CDAudio.Stop (); + if (cls.disable_screen != 0) return; *************** *** 1815,1819 **** // make sure CD isn't playing music ! //CDAudio.Stop(); cl.cinematicframe = 0; --- 1817,1821 ---- // make sure CD isn't playing music ! CDAudio.Stop(); cl.cinematicframe = 0; Index: CL_view.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_view.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** CL_view.java 2 Mar 2008 14:56:22 -0000 1.5 --- CL_view.java 8 Jul 2011 09:29:42 -0000 1.6 *************** *** 30,34 **** import jake2.qcommon.Com; import jake2.sys.Sys; ! import java.util.StringTokenizer; --- 30,35 ---- import jake2.qcommon.Com; import jake2.sys.Sys; ! import jake2.qcommon.CDAudio; ! import jake2.util.Lib; import java.util.StringTokenizer; *************** *** 161,164 **** --- 162,169 ---- Globals.cl.refresh_prepped = true; Globals.cl.force_refdef = true; // make sure we have a valid refdef + + // start the cd track + CDAudio.Play(Lib.atoi(Globals.cl.configstrings[Defines.CS_CDTRACK]), true); + } Index: CL_parse.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** CL_parse.java 16 Apr 2007 21:58:06 -0000 1.24 --- CL_parse.java 8 Jul 2011 09:29:42 -0000 1.25 *************** *** 513,516 **** --- 513,520 ---- CL_fx.SetLightstyle(i - Defines.CS_LIGHTS); + } else if (i == Defines.CS_CDTRACK) { + if (Globals.cl.refresh_prepped) + CDAudio.Play(Lib.atoi(Globals.cl.configstrings[Defines.CS_CDTRACK]), true); + } else if (i >= Defines.CS_MODELS && i < Defines.CS_MODELS + Defines.MAX_MODELS) { if (Globals.cl.refresh_prepped) { Index: CL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** CL.java 7 Jul 2011 21:19:15 -0000 1.31 --- CL.java 8 Jul 2011 09:29:42 -0000 1.32 *************** *** 1581,1585 **** S.Update(Globals.cl.refdef.vieworg, Globals.cl.v_forward, Globals.cl.v_right, Globals.cl.v_up); ! // advance local effects for next frame CL_fx.RunDLights(); --- 1581,1587 ---- S.Update(Globals.cl.refdef.vieworg, Globals.cl.v_forward, Globals.cl.v_right, Globals.cl.v_up); ! ! CDAudio.Update(); //sfranzyshen ! // advance local effects for next frame CL_fx.RunDLights(); *************** *** 1614,1618 **** WriteConfiguration(); ! S.Shutdown(); IN.Shutdown(); --- 1616,1621 ---- WriteConfiguration(); ! ! CDAudio.Shutdown(); S.Shutdown(); IN.Shutdown(); *************** *** 1644,1647 **** --- 1647,1651 ---- //Globals.cls.disable_screen = 1.0f; // don't draw yet + CDAudio.Init(); InitLocal(); IN.Init(); |
From: Rene S. <sa...@us...> - 2011-07-08 08:59:27
|
Update of /cvsroot/jake2/jake2/lib In directory vz-cvs-3.sog:/tmp/cvs-serv10210/lib Added Files: jl1.0.1.jar Log Message: mp3 player support --- NEW FILE: jl1.0.1.jar --- (This appears to be a binary file; contents omitted.) |
From: Rene S. <sa...@us...> - 2011-07-07 21:19:17
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory vz-cvs-3.sog:/tmp/cvs-serv20407/src/jake2/client Modified Files: CL.java Log Message: support for gl_showtris und gl_modeltris Index: CL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** CL.java 14 May 2007 23:38:15 -0000 1.30 --- CL.java 7 Jul 2011 21:19:15 -0000 1.31 *************** *** 30,33 **** --- 30,34 ---- import jake2.game.*; import jake2.qcommon.*; + import jake2.render.fast.Main; import jake2.server.SV_MAIN; import jake2.sound.S; *************** *** 1532,1535 **** --- 1533,1579 ---- } + boolean changed = false; + + if (Main.r_worldmodel != null) + { + if (numleafs != Main.r_worldmodel.numleafs) + { + numleafs = Main.r_worldmodel.numleafs; + changed = true; + } + } + if (x != Globals.cl.frame.playerstate.pmove.origin[0]) + { + x = Globals.cl.frame.playerstate.pmove.origin[0]; + changed = true; + } + + if (y != Globals.cl.frame.playerstate.pmove.origin[1]) + { + y = Globals.cl.frame.playerstate.pmove.origin[1]; + changed = true; + } + + if (z != Globals.cl.frame.playerstate.pmove.origin[2]) + { + z = Globals.cl.frame.playerstate.pmove.origin[2]; + changed = true; + } + + if (viewcluster != Main.r_viewcluster) + { + viewcluster = Main.r_viewcluster; + changed = true; + } + + if (changed) + { + String tmp = " x=" + x + ", y=" + y + + ", z=" + z + ", leaf=" + viewcluster + "/" + + numleafs +"\n"; + + Com.DPrintf(tmp); + } + SCR.UpdateScreen(); *************** *** 1554,1557 **** --- 1598,1605 ---- } + static int numleafs = 0; + static short x,y,z; + static int viewcluster; + /** * Shutdown |
From: Rene S. <sa...@us...> - 2011-07-07 21:10:20
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory vz-cvs-3.sog:/tmp/cvs-serv19748/src/jake2/client Modified Files: Key.java Menu.java Console.java console_t.java Log Message: clipboard support for console Index: Menu.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** Menu.java 13 Dec 2009 11:20:46 -0000 1.24 --- Menu.java 7 Jul 2011 21:10:18 -0000 1.25 *************** *** 4464,4469 **** * * support pasting from the clipboard */ ! if ((Character.toUpperCase(key) == 'V' && keydown[K_CTRL]) ! || (((key == K_INS) || (key == K_KP_INS)) && keydown[K_SHIFT])) { String cbd; --- 4464,4470 ---- * * support pasting from the clipboard */ ! ! if ( key == K_CTRLV && keydown[K_CTRL] || (((key == K_INS) || (key == K_KP_INS)) && keydown[K_SHIFT])) { // sfranzyshen ! String cbd; Index: Key.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/Key.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Key.java 18 Dec 2005 22:10:12 -0000 1.12 --- Key.java 7 Jul 2011 21:10:18 -0000 1.13 *************** *** 30,33 **** --- 30,34 ---- import jake2.game.Cmd; import jake2.qcommon.*; + import jake2.sys.Sys; import jake2.util.Lib; *************** *** 47,50 **** --- 48,53 ---- public static final int K_ESCAPE = 27; public static final int K_SPACE = 32; + public static final int K_CTRLV = 22; + // normal keys should be passed as lowercased ascii *************** *** 210,213 **** --- 213,218 ---- consolekeys[i] = true; consolekeys[K_ENTER] = true; + consolekeys[K_CTRLV] = true; + consolekeys[K_KP_ENTER] = true; consolekeys[K_TAB] = true; *************** *** 231,234 **** --- 236,240 ---- consolekeys[K_SHIFT] = true; consolekeys[K_INS] = true; + consolekeys[K_DEL] = true; // sfranzyshen consolekeys[K_KP_INS] = true; consolekeys[K_KP_DEL] = true; *************** *** 237,240 **** --- 243,249 ---- consolekeys[K_KP_MINUS] = true; consolekeys[K_KP_5] = true; + consolekeys[K_MWHEELUP] = true; // sfranzyshen + consolekeys[K_MWHEELDOWN] = true; // sfranzyshen + consolekeys[K_CTRL] = true; // sfranzyshen consolekeys['`'] = false; *************** *** 283,286 **** --- 292,296 ---- Globals.key_lines[Globals.edit_line][1] = 0; // clear any typing Globals.key_linepos = 1; + Globals.con.backedit = 0; // sfranzyshen } *************** *** 474,477 **** --- 484,492 ---- public static void Message(int key) { + // sfranzyshen -- start + StringBuffer buffer = new StringBuffer(); + buffer.append(Globals.chat_buffer); + int offset = buffer.length() - Globals.chat_backedit; + if (key == K_ENTER || key == K_KP_ENTER) { if (Globals.chat_team) *************** *** 479,520 **** else Cbuf.AddText("say \""); ! Cbuf.AddText(Globals.chat_buffer); Cbuf.AddText("\"\n"); ! Globals.cls.key_dest = Defines.key_game; Globals.chat_buffer = ""; return; } ! if (key == K_ESCAPE) { Globals.cls.key_dest = Defines.key_game; Globals.chat_buffer = ""; return; } - - if (key < 32 || key > 127) - return; // non printable - if (key == K_BACKSPACE) { ! if (Globals.chat_buffer.length() > 2) { ! Globals.chat_buffer = Globals.chat_buffer.substring(0, Globals.chat_buffer.length() - 2); } ! else ! Globals.chat_buffer = ""; return; } ! ! if (Globals.chat_buffer.length() > Defines.MAXCMDLINE) ! return; // all full ! ! Globals.chat_buffer += (char) key; ! } ! /** * Interactive line editing and console scrollback. */ public static void Console(int key) { ! switch (key) { case K_KP_SLASH : --- 494,592 ---- else Cbuf.AddText("say \""); ! Cbuf.AddText(Globals.chat_buffer); Cbuf.AddText("\"\n"); ! Globals.cls.key_dest = Defines.key_game; Globals.chat_buffer = ""; + Globals.chat_backedit = 0; return; } ! ! if (key == K_ESCAPE) { Globals.cls.key_dest = Defines.key_game; Globals.chat_buffer = ""; + Globals.chat_backedit = 0; + return; + } + if (key == K_END || key == K_KP_END) { + Globals.chat_backedit = 0; + return; + } + if (key == K_HOME || key == K_KP_HOME) { + Globals.chat_backedit = Globals.chat_buffer.length(); return; } if (key == K_BACKSPACE) { ! if (buffer.length() > 0) { // we have a buffer to edit ! if (Globals.chat_backedit > 0) { // we are somewhere mid line ! if (offset == 0) { // we are at the start of the line ! return; ! } ! buffer.deleteCharAt(offset-1); ! } ! else { // we are at the end of line ! buffer.deleteCharAt(buffer.length()-1); ! } } ! Globals.chat_buffer = buffer.toString(); return; } ! ! if (key == K_DEL || key == K_KP_DEL) { ! if (buffer.length() > 0 && Globals.chat_backedit > 0) { // we have a buffer & we are somewhere mid line ! buffer.deleteCharAt(offset); ! Globals.chat_backedit--; ! if (Globals.chat_backedit < 0) { ! Globals.chat_backedit = 0; ! } ! } ! Globals.chat_buffer = buffer.toString(); ! return; ! } ! ! if (key == K_LEFTARROW) { ! if (buffer.length() > 0 && offset > 0) { //we have a buffer & we are not at the start of line ! Globals.chat_backedit++; ! if (Globals.chat_backedit > buffer.length()) { ! Globals.chat_backedit = buffer.length(); ! } ! } ! Globals.chat_buffer = buffer.toString(); ! return; ! } ! ! if (key == K_RIGHTARROW) { ! if (buffer.length() > 0 && Globals.chat_backedit > 0) { // we have a buffer & we are not at the end of line ! Globals.chat_backedit--; ! if (Globals.chat_backedit < 0) { ! Globals.chat_backedit = 0; ! } ! } ! Globals.chat_buffer = buffer.toString(); ! return; ! } ! ! if (key < 32 || key > 127) ! return; // non printable ! ! if (Globals.chat_backedit > 0) { ! buffer.insert(offset, (char) key); ! //Globals.chat_backedit++; ! } ! else { ! buffer.append((char) key); ! } ! Globals.chat_buffer = buffer.toString(); ! // sfranzyshen -- stop ! } ! /** * Interactive line editing and console scrollback. */ public static void Console(int key) { ! int i; ! switch (key) { case K_KP_SLASH : *************** *** 561,568 **** --- 633,673 ---- break; } + // sfranzyshen -start + if ((key == K_CTRLV && keydown[K_CTRL] ) || ((( key == K_INS ) || ( key == K_KP_INS )) && keydown[K_SHIFT] )) { + String cbd; + + if (( cbd = Sys.GetClipboardData()) != null) { + int x; + + x = cbd.length(); + + if ( x + Globals.key_linepos >= MAXCMDLINE ) + x = MAXCMDLINE - Globals.key_linepos; + + if ( x > 0 ) + { + if (Globals.con.backedit > 0) { + for (i = Globals.key_linepos - Globals.con.backedit; i < Globals.key_linepos; i++) + Globals.key_lines[Globals.edit_line][i + x] = Globals.key_lines[Globals.edit_line][i]; + + for (i = Globals.key_linepos - Globals.con.backedit; i < Globals.key_linepos - Globals.con.backedit + x; i++) + Globals.key_lines[Globals.edit_line][i] = (byte) cbd.charAt(i - (Globals.key_linepos - Globals.con.backedit)); + con.backedit += x; + } else { + for (i = Globals.key_linepos; i < Globals.key_linepos + x; i++) + Globals.key_lines[Globals.edit_line][i] = (byte) cbd.charAt(i - Globals.key_linepos); + } + Globals.key_linepos += x; + } + } + return; + } + // sfranzyshen -stop + if (key == 'l') { if (Globals.keydown[K_CTRL]) { Cbuf.AddText("clear\n"); + Globals.con.backedit = 0; // sfranzyshen return; } *************** *** 587,590 **** --- 692,697 ---- Globals.key_lines[Globals.edit_line][0] = ']'; Globals.key_linepos = 1; + Globals.con.backedit = 0; // sfranzyshen + if (Globals.cls.state == Defines.ca_disconnected) SCR.UpdateScreen(); // force an update, because the command may take some time *************** *** 595,606 **** // command completion CompleteCommand(); return; } ! if ((key == K_BACKSPACE) || (key == K_LEFTARROW) || (key == K_KP_LEFTARROW) || ((key == 'h') && (Globals.keydown[K_CTRL]))) { if (Globals.key_linepos > 1) Globals.key_linepos--; return; } if ((key == K_UPARROW) || (key == K_KP_UPARROW) || ((key == 'p') && Globals.keydown[K_CTRL])) { --- 702,768 ---- // command completion CompleteCommand(); + Globals.con.backedit = 0; // sfranzyshen return; } ! // sfranzyshen - start ! if (key == K_BACKSPACE) ! { if (Globals.key_linepos > 1) + { + if (Globals.con.backedit > 0 && Globals.con.backedit < Globals.key_linepos) + { + if (Globals.key_linepos - Globals.con.backedit <= 1) + return; + + for (i = Globals.key_linepos - Globals.con.backedit - 1; i < Globals.key_linepos; i++) + Globals.key_lines[Globals.edit_line][i] = Globals.key_lines[Globals.edit_line][i+1]; + + if (Globals.key_linepos > 1) + Globals.key_linepos--; + } + else + { + Globals.key_linepos--; + } + } + return; + } + + if (key == K_DEL || key == K_KP_DEL) + { + if (Globals.key_linepos > 1 && Globals.con.backedit > 0) + { + for (i = Globals.key_linepos - Globals.con.backedit; i < Globals.key_linepos; i++) + Globals.key_lines[Globals.edit_line][i] = Globals.key_lines[Globals.edit_line][i+1]; + + Globals.con.backedit--; Globals.key_linepos--; + } return; } + + if (key == K_LEFTARROW || key == K_KP_LEFTARROW) + { + if (Globals.key_linepos>1) + { + Globals.con.backedit++; + if (Globals.con.backedit > Globals.key_linepos -1) Globals.con.backedit = Globals.key_linepos-1; + } + return; + } + + if (key == K_RIGHTARROW || key == K_KP_RIGHTARROW) + { + if (Globals.key_linepos > 1) + { + Globals.con.backedit--; + if (Globals.con.backedit<0) Globals.con.backedit = 0; + } + return; + } + // sfranzyshen - stop + + if ((key == K_UPARROW) || (key == K_KP_UPARROW) || ((key == 'p') && Globals.keydown[K_CTRL])) { *************** *** 614,617 **** --- 776,780 ---- System.arraycopy(Globals.key_lines[history_line], 0, Globals.key_lines[Globals.edit_line], 0, Globals.key_lines[Globals.edit_line].length); Globals.key_linepos = Lib.strlen(Globals.key_lines[Globals.edit_line]); + Globals.con.backedit = 0; // sfranzyshen return; } *************** *** 632,645 **** System.arraycopy(Globals.key_lines[history_line], 0, Globals.key_lines[Globals.edit_line], 0, Globals.key_lines[Globals.edit_line].length); Globals.key_linepos = Lib.strlen(Globals.key_lines[Globals.edit_line]); } return; } ! if (key == K_PGUP || key == K_KP_PGUP) { Globals.con.display -= 2; return; } ! if (key == K_PGDN || key == K_KP_PGDN) { Globals.con.display += 2; if (Globals.con.display > Globals.con.current) --- 795,809 ---- System.arraycopy(Globals.key_lines[history_line], 0, Globals.key_lines[Globals.edit_line], 0, Globals.key_lines[Globals.edit_line].length); Globals.key_linepos = Lib.strlen(Globals.key_lines[Globals.edit_line]); + Globals.con.backedit = 0; // sfranzyshen } return; } ! if (key == K_MWHEELUP || key == K_PGUP || key == K_KP_PGUP) { Globals.con.display -= 2; return; } ! if (key == K_MWHEELDOWN || key == K_PGDN || key == K_KP_PGDN) { Globals.con.display += 2; if (Globals.con.display > Globals.con.current) *************** *** 648,669 **** } if (key == K_HOME || key == K_KP_HOME) { ! Globals.con.display = Globals.con.current - Globals.con.totallines + 10; return; } if (key == K_END || key == K_KP_END) { ! Globals.con.display = Globals.con.current; return; } if (key < 32 || key > 127) return; // non printable if (Globals.key_linepos < Defines.MAXCMDLINE - 1) { ! Globals.key_lines[Globals.edit_line][Globals.key_linepos] = (byte) key; ! Globals.key_linepos++; ! Globals.key_lines[Globals.edit_line][Globals.key_linepos] = 0; } } --- 812,849 ---- } + // sfranzyshen - start if (key == K_HOME || key == K_KP_HOME) { ! //Globals.con.display = Globals.con.current - Globals.con.totallines + 10; ! Globals.con.backedit = Globals.key_linepos -1; return; } if (key == K_END || key == K_KP_END) { ! //Globals.con.display = Globals.con.current; ! Globals.con.backedit = 0; return; } + // sfranzyshen - stop + + if (key < 32 || key > 127) return; // non printable + // sfranzyshen -start if (Globals.key_linepos < Defines.MAXCMDLINE - 1) { ! if (Globals.con.backedit > 0) { //insert character... ! for (i = Globals.key_linepos; i > Globals.key_linepos - Globals.con.backedit; i--) ! Globals.key_lines[Globals.edit_line][i] = Globals.key_lines[Globals.edit_line][i -1]; ! Globals.key_lines[Globals.edit_line][i] = (byte) key; ! Globals.key_linepos++; ! Globals.key_lines[Globals.edit_line][Globals.key_linepos] = 0; ! } else { ! Globals.key_lines[Globals.edit_line][Globals.key_linepos++] = (byte) key; ! Globals.key_lines[Globals.edit_line][Globals.key_linepos] = 0; ! } } + // sfranzyshen -stop + } Index: console_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/console_t.java,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** console_t.java 7 Jul 2004 19:58:52 -0000 1.1.1.1 --- console_t.java 7 Jul 2011 21:10:18 -0000 1.2 *************** *** 42,45 **** --- 42,47 ---- int linewidth; // characters across screen int totallines; // total lines in console scrollback + + int backedit; // sfranzyshen float cursorspeed; Index: Console.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/Console.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Console.java 2 Mar 2008 16:43:18 -0000 1.9 --- Console.java 7 Jul 2011 21:10:18 -0000 1.10 *************** *** 149,152 **** --- 149,153 ---- public static void Init() { Globals.con.linewidth = -1; + Globals.con.backedit = 0; CheckResize(); *************** *** 183,186 **** --- 184,188 ---- width = 38; Globals.con.linewidth = width; + Globals.con.backedit = 0; // sfranzyshen Globals.con.totallines = Defines.CON_TEXTSIZE / Globals.con.linewidth; *************** *** 189,192 **** --- 191,195 ---- int oldwidth = Globals.con.linewidth; Globals.con.linewidth = width; + Globals.con.backedit = 0; // sfranzyshen int oldtotallines = Globals.con.totallines; Globals.con.totallines = Defines.CON_TEXTSIZE *************** *** 409,412 **** --- 412,416 ---- if (cls.key_dest == key_menu) return; + if (cls.key_dest != key_console && cls.state == ca_active) return; // don't draw anything (always draw if not active) *************** *** 415,422 **** // add the cursor frame ! text[key_linepos] = (byte) (10 + ((int) (cls.realtime >> 8) & 1)); // fill out remainder with spaces ! for (i = key_linepos + 1; i < con.linewidth; i++) text[i] = ' '; --- 419,426 ---- // add the cursor frame ! //text[key_linepos] = (byte) (10 + ((int) (cls.realtime >> 8) & 1)); //sfranzyshen // fill out remainder with spaces ! for (i = key_linepos ; i < con.linewidth; i++) // sfranzyshen text[i] = ' '; *************** *** 428,434 **** // y = con.vislines-16; ! for (i = 0; i < con.linewidth; i++) ! re.DrawChar((i + 1) << 3, con.vislines - 22, text[i]); ! // remove cursor key_lines[edit_line][key_linepos] = 0; --- 432,446 ---- // y = con.vislines-16; ! // sfranzyshen --start ! for (i = 0; i < con.linewidth; i++) { ! //old:re.DrawChar((i + 1) << 3, con.vislines - 22, text[i]); ! if (con.backedit == key_linepos-i && (((int)(Globals.cls.realtime >> 8)&1) !=0)) ! re.DrawChar ((i + 1) << 3, con.vislines - 22, (char)11); ! else ! re.DrawChar ((i + 1) << 3, con.vislines - 22, text[i]); ! } ! // sfranzyshen - stop ! ! // remove cursor key_lines[edit_line][key_linepos] = 0; *************** *** 481,492 **** s = chat_buffer; if (chat_bufferlen > (viddef.getWidth() >> 3) - (skip + 1)) ! s = s.substring(chat_bufferlen ! - ((viddef.getWidth() >> 3) - (skip + 1))); for (x = 0; x < s.length(); x++) { ! re.DrawChar((x + skip) << 3, v, s.charAt(x)); } ! re.DrawChar((x + skip) << 3, v, ! (int) (10 + ((cls.realtime >> 8) & 1))); v += 8; } --- 493,514 ---- s = chat_buffer; if (chat_bufferlen > (viddef.getWidth() >> 3) - (skip + 1)) ! //s = s.substring(chat_bufferlen ! // - ((viddef.getWidth() >> 3) - (skip + 1))); ! ! // sfranzyshen -start ! s = s.substring(chat_bufferlen - ((viddef.getWidth() >> 3) - (skip + 1))); for (x = 0; x < s.length(); x++) { ! if (chat_backedit > 0 && chat_backedit == chat_buffer.length() -x && ((int)(cls.realtime>>8)&1) !=0) { ! re.DrawChar((x + skip) << 3, v, (char)11); ! } else { ! re.DrawChar((x + skip) << 3, v, s.charAt(x)); ! } } ! ! if (chat_backedit == 0) ! re.DrawChar((x + skip) << 3, v, (int) (10 + ((cls.realtime >> 8) & 1))); ! // sfranzyshen -stop ! v += 8; } |
From: Rene S. <sa...@us...> - 2011-07-07 21:09:58
|
Update of /cvsroot/jake2/jake2/src/jake2 In directory vz-cvs-3.sog:/tmp/cvs-serv19701/src/jake2 Modified Files: Globals.java Log Message: clipboard support for console Index: Globals.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/Globals.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Globals.java 2 Mar 2008 20:21:12 -0000 1.6 --- Globals.java 7 Jul 2011 21:09:56 -0000 1.7 *************** *** 373,376 **** --- 373,377 ---- public static int sys_frame_time; public static int chat_bufferlen = 0; + public static int chat_backedit; // sfranzyshen public static int gun_frame; public static model_t gun_model; |
From: Rene S. <sa...@us...> - 2011-07-07 21:09:47
|
Update of /cvsroot/jake2/jake2/src/jake2 In directory vz-cvs-3.sog:/tmp/cvs-serv19686/src/jake2 Modified Files: Defines.java Log Message: clipboard support for console Index: Defines.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/Defines.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** Defines.java 1 Jan 2006 15:05:47 -0000 1.9 --- Defines.java 7 Jul 2011 21:09:45 -0000 1.10 *************** *** 1321,1324 **** --- 1321,1335 ---- public final static int K_RIGHTARROW = 131; + + // sfranzyshen - start + // mouse buttons & wheel generate virtual keys + public static final int K_MOUSE1 = 200; + public static final int K_MOUSE2 = 201; + public static final int K_MOUSE3 = 202; + public static final int K_MWHEELDOWN = 239; + public static final int K_MWHEELUP = 240; + // sfranzyshen - stop + + public final static int QMF_LEFT_JUSTIFY = 0x00000001; public final static int QMF_GRAYED = 0x00000002; |
From: Rene S. <sa...@us...> - 2011-07-07 21:09:07
|
Update of /cvsroot/jake2/jake2/src/jake2/sys In directory vz-cvs-3.sog:/tmp/cvs-serv19651/src/jake2/sys Modified Files: Sys.java Log Message: clipboard support for console Index: Sys.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/sys/Sys.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Sys.java 2 Mar 2008 20:21:15 -0000 1.12 --- Sys.java 7 Jul 2011 21:09:05 -0000 1.13 *************** *** 35,38 **** --- 35,41 ---- import java.util.regex.Pattern; import java.util.regex.PatternSyntaxException; + import java.awt.datatransfer.*; // sfranzyshen + import java.awt.Toolkit; // sfranzyshen + import java.io.*; // sfranzyshen /** *************** *** 233,240 **** } ! public static String GetClipboardData() { ! // TODO: implement GetClipboardData ! return null; ! } public static void ConsoleOutput(String msg) { --- 236,257 ---- } ! // sfranzyshen -start ! // public static String GetClipboardData() { ! public static String GetClipboardData() { ! Transferable t = Toolkit.getDefaultToolkit().getSystemClipboard() ! .getContents(null); ! ! try { ! if (t != null && t.isDataFlavorSupported(DataFlavor.stringFlavor)) { ! String text = (String) t ! .getTransferData(DataFlavor.stringFlavor); ! return text; ! } ! } catch (UnsupportedFlavorException e) { ! } catch (IOException e) { ! } ! return null; ! } ! public static void ConsoleOutput(String msg) { |
From: Rene S. <sa...@us...> - 2011-07-07 21:07:12
|
Update of /cvsroot/jake2/jake2/src/jake2/server In directory vz-cvs-3.sog:/tmp/cvs-serv19490/src/jake2/server Modified Files: SV_CCMDS.java Log Message: jvm_memory command added Index: SV_CCMDS.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/server/SV_CCMDS.java,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** SV_CCMDS.java 7 Jun 2007 10:31:10 -0000 1.16 --- SV_CCMDS.java 7 Jul 2011 21:07:09 -0000 1.17 *************** *** 583,586 **** --- 583,596 ---- } } + + + /** Print the memory used by the java vm. */ + public static void VM_Mem_f() + { + Com.Printf("vm memory:" + + (Runtime.getRuntime().totalMemory() - + Runtime.getRuntime().freeMemory()) + "\n" ); + } + /* ================== *************** *** 1109,1112 **** --- 1119,1134 ---- } }); + + Cmd.AddCommand("jvm_memory", new xcommand_t() { + public void execute() { + VM_Mem_f(); + } + }); + + // Cmd.AddCommand("spawnbot", new xcommand_t() { + // public void execute() { + // AdvancedBot.SP_Oak(); + // } + // }); } } |
From: Holger Z. <hz...@us...> - 2011-07-06 08:56:32
|
Update of /cvsroot/jake2/CVSROOT In directory vz-cvs-3.sog:/tmp/cvs-serv17763 Modified Files: avail Log Message: update permissions Index: avail =================================================================== RCS file: /cvsroot/jake2/CVSROOT/avail,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** avail 25 Feb 2008 19:26:30 -0000 1.3 --- avail 6 Jul 2011 08:56:29 -0000 1.4 *************** *** 1,4 **** unavail ! avail|hzi ! avail|cawe, salomo, kbrussel|jake2 avail|dsanders1234|jake2/src/jake2/render/lwjgl, jake2/src/jake2/sound/lwjgl --- 1,4 ---- unavail ! avail|hzi, salomo, cawe ! avail|kbrussel|jake2 avail|dsanders1234|jake2/src/jake2/render/lwjgl, jake2/src/jake2/sound/lwjgl |
From: Rene S. <sa...@us...> - 2009-12-13 19:18:11
|
Update of /cvsroot/jake2/jake2/src/jake2/game/monsters In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv7503/src/jake2/game/monsters Modified Files: M_Boss31.java M_Boss2.java Log Message: unused variables Index: M_Boss2.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Boss2.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** M_Boss2.java 13 Dec 2009 11:21:18 -0000 1.5 --- M_Boss2.java 13 Dec 2009 19:18:04 -0000 1.6 *************** *** 569,573 **** } - enemy_infront = GameUtil.infront(self, self.enemy); enemy_range = GameUtil.range(self, self.enemy); Math3D.VectorSubtract(self.enemy.s.origin, self.s.origin, temp); --- 569,572 ---- Index: M_Boss31.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Boss31.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** M_Boss31.java 13 Dec 2009 11:21:18 -0000 1.5 --- M_Boss31.java 13 Dec 2009 19:18:03 -0000 1.6 *************** *** 795,799 **** } - enemy_infront = GameUtil.infront(self, self.enemy); enemy_range = GameUtil.range(self, self.enemy); Math3D.VectorSubtract(self.enemy.s.origin, self.s.origin, temp); --- 795,798 ---- |
From: Rene S. <sa...@us...> - 2009-12-13 11:21:27
|
Update of /cvsroot/jake2/jake2/src/jake2/game/monsters In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25741/src/jake2/game/monsters Modified Files: M_Soldier.java M_Boss32.java M_Boss31.java M_Boss2.java Log Message: unused variables Index: M_Soldier.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Soldier.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** M_Soldier.java 20 Nov 2005 22:18:33 -0000 1.4 --- M_Soldier.java 13 Dec 2009 11:21:18 -0000 1.5 *************** *** 1332,1336 **** || self.monsterinfo.currentmove == soldier_move_start_run) { self.monsterinfo.currentmove = soldier_move_run; - int a = 2; } else { self.monsterinfo.currentmove = soldier_move_start_run; --- 1332,1335 ---- Index: M_Boss2.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Boss2.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** M_Boss2.java 20 Nov 2005 22:18:33 -0000 1.4 --- M_Boss2.java 13 Dec 2009 11:21:18 -0000 1.5 *************** *** 548,552 **** float chance; trace_t tr; ! boolean enemy_infront; int enemy_range; float enemy_yaw; --- 548,552 ---- float chance; trace_t tr; ! int enemy_range; float enemy_yaw; Index: M_Boss31.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Boss31.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** M_Boss31.java 20 Nov 2005 22:18:33 -0000 1.4 --- M_Boss31.java 13 Dec 2009 11:21:18 -0000 1.5 *************** *** 774,778 **** float chance; trace_t tr; ! boolean enemy_infront; int enemy_range; float enemy_yaw; --- 774,778 ---- float chance; trace_t tr; ! int enemy_range; float enemy_yaw; Index: M_Boss32.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/game/monsters/M_Boss32.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** M_Boss32.java 20 Nov 2005 22:18:33 -0000 1.4 --- M_Boss32.java 13 Dec 2009 11:21:18 -0000 1.5 *************** *** 1757,1761 **** float chance; trace_t tr; ! boolean enemy_infront; int enemy_range; float enemy_yaw; --- 1757,1761 ---- float chance; trace_t tr; ! int enemy_range; float enemy_yaw; *************** *** 1778,1782 **** } - enemy_infront = GameUtil.infront(self, self.enemy); enemy_range = GameUtil.range(self, self.enemy); Math3D.VectorSubtract(self.enemy.s.origin, self.s.origin, temp); --- 1778,1781 ---- |
From: Rene S. <sa...@us...> - 2009-12-13 11:20:54
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25671/src/jake2/client Modified Files: Menu.java Log Message: unused variables Index: Menu.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/Menu.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** Menu.java 2 Mar 2008 14:56:22 -0000 1.23 --- Menu.java 13 Dec 2009 11:20:46 -0000 1.24 *************** *** 4872,4877 **** public static void SpinControl_Draw(menulist_s s) { - //char buffer[100]; - String buffer; if (s.name != null) { --- 4872,4875 ---- |
From: Rene S. <sa...@us...> - 2009-12-13 11:20:24
|
Update of /cvsroot/jake2/jake2/src/jake2 In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv25609/src/jake2 Modified Files: CompatibilityApplet.java Log Message: unused imports Index: CompatibilityApplet.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/CompatibilityApplet.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** CompatibilityApplet.java 2 Mar 2008 20:21:12 -0000 1.1 --- CompatibilityApplet.java 13 Dec 2009 11:20:15 -0000 1.2 *************** *** 32,41 **** package jake2; - import java.applet.*; - import java.awt.Canvas; import java.awt.Color; import java.awt.Font; import java.awt.FontMetrics; - import java.awt.Frame; import java.awt.Graphics; import java.awt.Graphics2D; --- 32,38 ---- |