From: Holger Z. <hz...@us...> - 2005-05-26 16:57:15
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1272 Modified Files: build.xml ChangeLog install.xml README_DE README Log Message: merge last changes from 0.9.4 branch Index: README =================================================================== RCS file: /cvsroot/jake2/jake2/README,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** README 10 May 2005 11:01:22 -0000 1.7 --- README 26 May 2005 16:56:31 -0000 1.8 *************** *** 7,11 **** The port was done completely in Java. No native libraries are used for the game functionality. We use the jogl Java OpenGL bindings for graphics rendering ! and Java OpenAL (joal) for sound. The latest release comes with an lwjgl driver as an alternative for the jogl/joal combination. --- 7,11 ---- The port was done completely in Java. No native libraries are used for the game functionality. We use the jogl Java OpenGL bindings for graphics rendering ! and Java OpenAL (joal) for sound. The 0.9.4 release comes with an lwjgl driver as an alternative for the jogl/joal combination. *************** *** 24,31 **** 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 build from source: --- 24,33 ---- from binary distribution: ! - run the installer with "java -jar Jake2-0.9.4-install.jar" - follow the instructions - change to the installation directory - run the game with Jake2.sh or Jake2.bat + - to run Jake2 with the lwjgl OpenGL/OpenAL driver use Jake2_lwjgl.sh + or Jake2_lwjgl.bat build from source: *************** *** 44,48 **** - when askesd for password simply press the Enter key - "cvs -d:pserver:ano...@cv...:/cvsroot/jake2 co jake2" ! - procced with the build from source instructions 3rd party components --- 46,50 ---- - when askesd for password simply press the Enter key - "cvs -d:pserver:ano...@cv...:/cvsroot/jake2 co jake2" ! - proceed with the build from source instructions 3rd party components *************** *** 61,73 **** proguard obfuscator http://proguard.sourceforge.net ! have fun! bytonic Software ! Holger Zickner <ho...@by...> Carsten Weisse <cw...@by...> Rene Stoeckel <rs...@by...> ! Use <ja...@by...> for bug reports and feedback. \ No newline at end of file --- 63,77 ---- proguard obfuscator http://proguard.sourceforge.net ! Use <ja...@by...> for bug reports and feedback. have fun! bytonic Software ! ---------------- Holger Zickner <ho...@by...> Carsten Weisse <cw...@by...> Rene Stoeckel <rs...@by...> ! Contributors ! ------------ ! David Sanders lwjgl support Index: ChangeLog =================================================================== RCS file: /cvsroot/jake2/jake2/ChangeLog,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ChangeLog 10 May 2005 11:01:22 -0000 1.7 --- ChangeLog 26 May 2005 16:56:31 -0000 1.8 *************** *** 1,3 **** ! 0.9.4 - multiplayer client and server functionality --- 1,3 ---- ! 0.9.4 2005-05-26 - multiplayer client and server functionality *************** *** 8,11 **** --- 8,13 ---- - online installation of Quake2 demo data files - mouse wheel support + - very fast screenshot function + - memory footprint reduced - bugfixes Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.24 retrieving revision 1.25 diff -C2 -d -r1.24 -r1.25 *** build.xml 10 May 2005 11:57:09 -0000 1.24 --- build.xml 26 May 2005 16:56:31 -0000 1.25 *************** *** 113,117 **** <copy todir="${dist}"> <fileset dir="scripts"> ! <include name="Jake2.*"/> </fileset> <fileset dir="."> --- 113,117 ---- <copy todir="${dist}"> <fileset dir="scripts"> ! <include name="Jake2*"/> </fileset> <fileset dir="."> *************** *** 191,194 **** --- 191,196 ---- <tarfileset dir="." prefix="Jake2"> <include name="src/jake2/**"/> + <include name="patch/**"/> + <include name="resources/**"/> <include name="lib/**"/> <include name="build.xml"/> *************** *** 196,200 **** <include name="ChangeLog"/> <include name="LICENSE"/> ! <include name="README"/> <include name="readme.id"/> </tarfileset> --- 198,203 ---- <include name="ChangeLog"/> <include name="LICENSE"/> ! <include name="README*"/> ! <include name="install.xml"/> <include name="readme.id"/> </tarfileset> *************** *** 203,206 **** --- 206,211 ---- <zipfileset dir="." prefix="Jake2"> <include name="src/jake2/**"/> + <include name="patch/**"/> + <include name="resources/**"/> <include name="scripts/*.*"/> <include name="lib/**"/> *************** *** 210,214 **** <include name="ChangeLog"/> <include name="LICENSE"/> ! <include name="README"/> <include name="readme.id"/> </zipfileset> --- 215,220 ---- <include name="ChangeLog"/> <include name="LICENSE"/> ! <include name="README*"/> ! <include name="install.xml"/> <include name="readme.id"/> </zipfileset> *************** *** 219,223 **** <target name="installer" depends="dist"> <izpack input="${basedir}/install.xml" ! output="${basedir}/Jake2-install.jar" installerType="standard" basedir="${dist}" --- 225,229 ---- <target name="installer" depends="dist"> <izpack input="${basedir}/install.xml" ! output="${basedir}/Jake2-${version}-install.jar" installerType="standard" basedir="${dist}" Index: README_DE =================================================================== RCS file: /cvsroot/jake2/jake2/README_DE,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** README_DE 3 Nov 2004 15:46:31 -0000 1.6 --- README_DE 26 May 2005 16:56:31 -0000 1.7 *************** *** 9,14 **** Jake2 ist eine reine Java Anwendung. Als native Library kommen im Moment nur jogl für die OpenGL Anbindung und joal für OpenAudio Soundunterstützung zum ! Einsatz. Die komplette Funktionalität der Engine wurde ausschliesslich mit Java ! realisiert. Jake2 befindet sich noch im Entwicklungsstadium. Die Kontaktaddresse für --- 9,15 ---- Jake2 ist eine reine Java Anwendung. Als native Library kommen im Moment nur jogl für die OpenGL Anbindung und joal für OpenAudio Soundunterstützung zum ! Einsatz. Seit Version 0.9.4 ist auch ein lwjgl Treiber als Alternative zur ! jogl/joal Kombination enthalten. Die komplette Funktionalität der Engine wurde ! ausschliesslich mit Java realisiert. Jake2 befindet sich noch im Entwicklungsstadium. Die Kontaktaddresse für *************** *** 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: --- 29,38 ---- ausgehend von der Binärdistribution: ! - Installationsprogramm mit "java -jar Jake2-0.9.4-install.jar" starten - den Anweisungen folgen - ins Installationsverzeichnis wechseln - Jake2 mit "jake2.sh" oder "jake2.bat" aus dem Installationsverzeichnis starten + - um den lwjgl OpenGL/OpenAL Treiber zu nutzen Jake2 mit "jake2_lwjgl.sh" oder + "jake2_lwjgl.bat" aus dem Installationsverzeichnis starten ausgehend von Sourcedistribution: *************** *** 55,77 **** 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! bytonic Software ! Holger Zickner <ho...@by...> Carsten Weisse <cw...@by...> Rene Stoeckel <rs...@by...> ! <ja...@by...> für Bugreports und Rückmeldungen. \ No newline at end of file --- 58,83 ---- Jake2 benutzt: ! jogl OpenGL bindings https://jogl.dev.java.net ! joal OpenAL bindings https://joal.dev.java.net ! lwjgl Light Weight Java Game Library http://www.lwjgl.org ! 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 + <ja...@by...> für Bugreports und Rückmeldungen. ! have fun! bytonic Software ! ---------------- Holger Zickner <ho...@by...> Carsten Weisse <cw...@by...> Rene Stoeckel <rs...@by...> ! Contributors ! ------------ ! David Sanders lwjgl Unterstützung Index: install.xml =================================================================== RCS file: /cvsroot/jake2/jake2/install.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** install.xml 10 May 2005 11:00:56 -0000 1.4 --- install.xml 26 May 2005 16:56:31 -0000 1.5 *************** *** 22,26 **** <res id="LicencePanel.licence" src="LICENSE"/> <res id="InfoPanel.info" src="README"/> ! <res src="../shortcutSpec.xml" id="shortcutSpec.xml" /> <!-- res id="Installer.image" src="../resources/icon.png"/ --> </resources> --- 22,26 ---- <res id="LicencePanel.licence" src="LICENSE"/> <res id="InfoPanel.info" src="README"/> ! <!-- res src="../shortcutSpec.xml" id="shortcutSpec.xml" / --> <!-- res id="Installer.image" src="../resources/icon.png"/ --> </resources> *************** *** 40,115 **** <pack name="Jake2" required="yes"> <description>Jake2 files</description> <fileset dir="." targetdir="$INSTALL_PATH"> <include name="*"/> <include name="lib/jake2.jar"/> - <exclude name="*.bat"/> <exclude name="*.sh"/> </fileset> <fileset dir="." targetdir="$INSTALL_PATH"> ! <os family="windows"/> ! <include name="*.bat"/> </fileset> ! <fileset dir="." targetdir="$INSTALL_PATH"> ! <os name="Linux"/> ! <include name="*.sh"/> ! </fileset> </pack> <pack name="jogl OpenGL library" required="yes"> <description>default OpenGL library</description> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os family="windows"/> <include name="windows/jogl*"/> <include name="jogl.jar"/> </fileset> ! <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> ! <os name="Linux"/> <include name="linux/*jogl*"/> <include name="jogl.jar"/> </fileset> ! <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> ! <os name="Mac OS X"/> ! <include name="osx/*jogl*"/> <include name="jogl.jar"/> </fileset> ! </pack> ! <pack name="joal sound library" required="no"> <description>default sound library</description> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os family="windows"/> <include name="windows/joal*"/> <include name="windows/OpenAL*"/> </fileset> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os name="Linux"/> <include name="linux/*joal*"/> <include name="linux/*openal*"/> </fileset> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os name="Mac OS X"/> <include name="osx/*joal*"/> <include name="osx/*openal*"/> </fileset> </pack> ! <pack name="lwjgl library" required="no"> <description>alternative OpenGL and sound driver</description> ! <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> ! <os family="windows"/> <include name="windows/lwjgl*"/> <include name="lwjgl*.jar"/> </fileset> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os name="Linux"/> <include name="linux/lwjgl/*"/> <include name="lwjgl*.jar"/> </fileset> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> - <os name="Mac OS X"/> <include name="osx/lwjgl/*"/> <include name="lwjgl*.jar"/> </fileset> ! </pack> </packs> --- 40,161 ---- <pack name="Jake2" required="yes"> <description>Jake2 files</description> + <os family="windows"/> <fileset dir="." targetdir="$INSTALL_PATH"> <include name="*"/> <include name="lib/jake2.jar"/> <exclude name="*.sh"/> + <exclude name="*lwjgl.bat"/> </fileset> + </pack> + <pack name="Jake2" required="yes"> + <description>Jake2 files</description> + <os name="Linux"/> <fileset dir="." targetdir="$INSTALL_PATH"> ! <include name="*"/> ! <include name="lib/jake2.jar"/> ! <exclude name="*.bat"/> ! <exclude name="*mac.sh"/> ! <exclude name="*lwjgl.sh"/> </fileset> ! <executable targetfile="$INSTALL_PATH/Jake2.sh"/> </pack> + <pack name="Jake2" required="yes"> + <description>Jake2 files</description> + <os name="Mac OS X"/> + <fileset dir="." targetdir="$INSTALL_PATH"> + <include name="*"/> + <include name="lib/jake2.jar"/> + <exclude name="*.bat"/> + <exclude name="*.sh"/> + <include name="*mac.sh"/> + </fileset> + <executable targetfile="$INSTALL_PATH/Jake2_mac.sh"/> + </pack> <pack name="jogl OpenGL library" required="yes"> <description>default OpenGL library</description> + <os family="windows"/> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> <include name="windows/jogl*"/> <include name="jogl.jar"/> </fileset> ! </pack> ! <pack name="jogl OpenGL library" required="yes"> ! <description>default OpenGL library</description> ! <os name="Linux"/> ! <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> <include name="linux/*jogl*"/> <include name="jogl.jar"/> </fileset> ! </pack> ! <pack name="jogl OpenGL library" required="yes"> ! <description>default OpenGL library</description> ! <os name="Mac OS X"/> ! <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> ! <include name="osx/*jogl*"/> <include name="jogl.jar"/> </fileset> ! </pack> ! <pack name="joal sound library" required="no"> <description>default sound library</description> + <os family="windows"/> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> <include name="windows/joal*"/> <include name="windows/OpenAL*"/> </fileset> + </pack> + <pack name="joal sound library" required="no"> + <description>default sound library</description> + <os name="Linux"/> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> <include name="linux/*joal*"/> <include name="linux/*openal*"/> </fileset> + </pack> + <pack name="joal sound library" required="no"> + <description>default sound library</description> + <os name="Mac OS X"/> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> <include name="osx/*joal*"/> <include name="osx/*openal*"/> </fileset> </pack> ! <pack name="lwjgl library" required="no"> <description>alternative OpenGL and sound driver</description> ! <os family="windows"/> ! <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> <include name="windows/lwjgl*"/> <include name="lwjgl*.jar"/> </fileset> + <fileset dir="." targetdir="$INSTALL_PATH"> + <include name="*lwjgl.bat"/> + </fileset> + </pack> + <pack name="lwjgl library" required="no"> + <description>alternative OpenGL and sound driver</description> + <os name="Linux"/> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> <include name="linux/lwjgl/*"/> <include name="lwjgl*.jar"/> </fileset> + <fileset dir="." targetdir="$INSTALL_PATH"> + <include name="Jake2_lwjgl.sh"/> + </fileset> + <executable targetfile="$INSTALL_PATH/Jake2_lwjgl.sh"/> + </pack> + <pack name="lwjgl library" required="no"> + <description>alternative OpenGL and sound driver</description> + <os name="Mac OS X"/> <fileset dir="lib" targetdir="$INSTALL_PATH/lib"> <include name="osx/lwjgl/*"/> <include name="lwjgl*.jar"/> </fileset> ! <fileset dir="." targetdir="$INSTALL_PATH"> ! <include name="Jake2_mac_lwjgl.sh"/> ! </fileset> ! <executable targetfile="$INSTALL_PATH/Jake2_mac_lwjgl.sh"/> ! </pack> </packs> |