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: Holger Z. <hz...@us...> - 2004-10-27 12:19:31
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8870 Modified Files: Tag: software20 build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.13.2.2 retrieving revision 1.13.2.3 diff -C2 -d -r1.13.2.2 -r1.13.2.3 *** build.xml 26 Oct 2004 15:26:01 -0000 1.13.2.2 --- build.xml 27 Oct 2004 12:19:22 -0000 1.13.2.3 *************** *** 175,179 **** <include name="ChangeLog"/> <include name="LICENSE"/> ! <include name="README"/> <include name="readme.id"/> </tarfileset> --- 175,179 ---- <include name="ChangeLog"/> <include name="LICENSE"/> ! <include name="README*"/> <include name="readme.id"/> </tarfileset> *************** *** 193,197 **** <include name="ChangeLog"/> <include name="LICENSE"/> ! <include name="README"/> <include name="readme.id"/> </zipfileset> --- 193,197 ---- <include name="ChangeLog"/> <include name="LICENSE"/> ! <include name="README*"/> <include name="readme.id"/> </zipfileset> |
|
From: Holger Z. <hz...@us...> - 2004-10-27 12:14:52
|
Update of /cvsroot/jake2/jake2/src/jake2/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7593/src/jake2/install Modified Files: Tag: software20 Q2DataInstaller.java Log Message: allow selection of demo file Index: Q2DataInstaller.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/install/Q2DataInstaller.java,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Q2DataInstaller.java 26 Oct 2004 14:43:22 -0000 1.1.2.1 --- Q2DataInstaller.java 27 Oct 2004 12:14:43 -0000 1.1.2.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("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,582 **** private void ok() { - if (!install.isSelected()) { - parent.okButtonActionPerformed(null); - System.exit(0); - } parent.progressPanel.destDir = parent.destdir; ! parent.progressPanel.mirror = "../Quake2Demo/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 { *************** *** 653,662 **** 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; } *************** *** 665,673 **** 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"); } *************** *** 707,713 **** } ! void endInstall(String message) { ! parent.okButtonActionPerformed(null); ! System.exit(0); } --- 389,400 ---- } ! void endInstall(boolean exit, String text) { ! parent.notFoundPanel.message.setText(text); ! parent.showNotFoundPanel(); ! ! if (exit) { ! parent.okButtonActionPerformed(null); ! System.exit(0); ! } } |
|
From: Carsten W. <ca...@us...> - 2004-10-26 18:18:29
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27938/src/jake2/client Modified Files: client_state_t.java Log Message: PlaySound needs it public Index: client_state_t.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/client_state_t.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** client_state_t.java 9 Jul 2004 06:50:50 -0000 1.3 --- client_state_t.java 26 Oct 2004 18:18:19 -0000 1.4 *************** *** 87,91 **** public float[] viewangles = { 0, 0, 0 }; ! int time; // this is the time value that the client // is rendering at. always <= cls.realtime float lerpfrac; // between oldframe and frame --- 87,91 ---- public float[] viewangles = { 0, 0, 0 }; ! public int time; // this is the time value that the client // is rendering at. always <= cls.realtime float lerpfrac; // between oldframe and frame |
|
From: Holger Z. <hz...@us...> - 2004-10-26 15:26:10
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14643 Modified Files: Tag: software20 build.xml Log Message: Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.13.2.1 retrieving revision 1.13.2.2 diff -C2 -d -r1.13.2.1 -r1.13.2.2 *** build.xml 26 Oct 2004 10:49:41 -0000 1.13.2.1 --- build.xml 26 Oct 2004 15:26:01 -0000 1.13.2.2 *************** *** 167,171 **** --- 167,175 ---- <include name="src/jake2/**"/> <include name="lib/**"/> + <include name="patch/**"/> + <include name="resources/**"/> + <include name="webstart/**"/> <include name="build.xml"/> + <include name="install.xml"/> <include name="build.bat"/> <include name="ChangeLog"/> *************** *** 180,184 **** --- 184,192 ---- <include name="scripts/*.*"/> <include name="lib/**"/> + <include name="patch/**"/> + <include name="resources/**"/> + <include name="webstart/**"/> <include name="build.xml"/> + <include name="install.xml"/> <include name="build.sh"/> <include name="build.bat"/> |
|
From: Holger Z. <hz...@us...> - 2004-10-26 15:17:02
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv11970 Modified Files: Tag: software20 install.xml Log Message: Index: install.xml =================================================================== RCS file: /cvsroot/jake2/jake2/install.xml,v retrieving revision 1.2.2.3 retrieving revision 1.2.2.4 diff -C2 -d -r1.2.2.3 -r1.2.2.4 *** install.xml 26 Oct 2004 14:43:23 -0000 1.2.2.3 --- install.xml 26 Oct 2004 15:16:53 -0000 1.2.2.4 *************** *** 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> *************** *** 90,94 **** </packs> ! <native type="izpack" name="ShellLink.dll"/> </installation> --- 90,94 ---- </packs> ! <!-- native type="izpack" name="ShellLink.dll"/ --> </installation> |
|
From: Holger Z. <hz...@us...> - 2004-10-26 14:43:34
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2329 Modified Files: Tag: software20 README shortcutSpec.xml install.xml README_DE Log Message: Index: README =================================================================== RCS file: /cvsroot/jake2/jake2/README,v retrieving revision 1.4.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** README 26 Oct 2004 13:30:15 -0000 1.4.4.1 --- README 26 Oct 2004 14:43:23 -0000 1.4.4.2 *************** *** 26,35 **** - run the installer with "java -jar Jake2-Install.jar" - follow the instructions - run the game with Jake2.sh or Jake2.bat there are 3 different start scripts: ! - jake2-jogl11.* for Jake2 with current jogl version (suggested) ! - jake2-jogl11ATI.* for Jake2 with current jogl version and ATI workaround ! - jake2.* for Jake2 with jogl-1.0 (in case jogl-1.1 does not work) build from source: --- 26,36 ---- - 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 there are 3 different start scripts: ! - Jake2-jogl11.* for Jake2 with current jogl version (suggested) ! - Jake2-jogl11ATI.* for Jake2 with current jogl version and ATI workaround ! - Jake2.* for Jake2 with jogl-1.0 (in case jogl-1.1 does not work) build from source: *************** *** 51,54 **** --- 52,71 ---- - procced with the build from source instructions + 3rd party components + -------------------- + + Jake2 uses: + jogl OpenGL bindings https://jogl.dev.java.net + joal OpenAL bindings https://jogl.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.4.1 retrieving revision 1.4.4.2 diff -C2 -d -r1.4.4.1 -r1.4.4.2 *** README_DE 26 Oct 2004 13:30:16 -0000 1.4.4.1 --- README_DE 26 Oct 2004 14:43:23 -0000 1.4.4.2 *************** *** 30,39 **** - Installationsprogramm mit "java -jar Jake2-Install.jar" starten - den Anweisungen folgen - Jake2 mit "jake2.sh" oder "jake2.bat" aus dem Installationsverzeichnis starten Es liegen 3 verschiedene Startskripts bei: ! - jake2-jogl11.* für Jake2 mit aktueller jogl Version (empfohlen) ! - jake2-jogl11ATI.* für Jake2 mit aktueller jogl Version und ATI workaround ! - jake2.* für Jake2 mit jogl-1.0 (wenn Probleme auftreten) ausgehend von Sourcedistribution: --- 30,40 ---- - 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 Es liegen 3 verschiedene Startskripts bei: ! - Jake2-jogl11.* für Jake2 mit aktueller jogl Version (empfohlen) ! - Jake2-jogl11ATI.* für Jake2 mit aktueller jogl Version und ATI workaround ! - Jake2.* für Jake2 mit jogl-1.0 (wenn Probleme auftreten) ausgehend von Sourcedistribution: *************** *** 55,58 **** --- 56,75 ---- - 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://jogl.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: shortcutSpec.xml =================================================================== RCS file: /cvsroot/jake2/jake2/shortcutSpec.xml,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** shortcutSpec.xml 26 Oct 2004 10:49:41 -0000 1.1.2.1 --- shortcutSpec.xml 26 Oct 2004 14:43:23 -0000 1.1.2.2 *************** *** 38,42 **** <createForPack name="Windows libraries and scripts"/> ! </shortcut> <shortcut --- 38,59 ---- <createForPack name="Windows libraries and scripts"/> ! </shortcut> ! ! <shortcut ! name="Jake2 ATI workaround" ! programGroup="yes" ! desktop="no" ! applications="no" ! startMenu="no" ! startup="no" ! target="$INSTALL_PATH/Jake2-jogl11ATI.bat" ! workingDirectory="$INSTALL_PATH" ! commandLine="" ! description="Jake2" ! initialState="noShow"> ! ! <createForPack name="Windows libraries and scripts"/> ! ! </shortcut> <shortcut Index: install.xml =================================================================== RCS file: /cvsroot/jake2/jake2/install.xml,v retrieving revision 1.2.2.2 retrieving revision 1.2.2.3 diff -C2 -d -r1.2.2.2 -r1.2.2.3 *** install.xml 26 Oct 2004 13:30:16 -0000 1.2.2.2 --- install.xml 26 Oct 2004 14:43:23 -0000 1.2.2.3 *************** *** 69,73 **** </fileset> <fileset dir="../scripts" targetdir="$INSTALL_PATH"> ! <include name="*jogl11.sh"/> </fileset> <executable targetfile="$INSTALL_PATH/Jake2.sh" stage="never"/> --- 69,73 ---- </fileset> <fileset dir="../scripts" targetdir="$INSTALL_PATH"> ! <include name="*jogl11*.sh"/> </fileset> <executable targetfile="$INSTALL_PATH/Jake2.sh" stage="never"/> *************** *** 83,87 **** </fileset> <fileset dir="../scripts" targetdir="$INSTALL_PATH"> ! <include name="*jogl11.bat"/> </fileset> <executable targetfile="$INSTALL_PATH/Jake2.bat" stage="never"/> --- 83,87 ---- </fileset> <fileset dir="../scripts" targetdir="$INSTALL_PATH"> ! <include name="*jogl11*.bat"/> </fileset> <executable targetfile="$INSTALL_PATH/Jake2.bat" stage="never"/> |
|
From: Holger Z. <hz...@us...> - 2004-10-26 14:43:32
|
Update of /cvsroot/jake2/jake2/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2329/scripts Modified Files: Tag: software20 Jake2-jogl11.sh Jake2-jogl11.bat Added Files: Tag: software20 Jake2-jogl11ATI.bat Jake2-jogl11ATI.sh Log Message: Index: Jake2-jogl11.bat =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Attic/Jake2-jogl11.bat,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Jake2-jogl11.bat 26 Oct 2004 10:49:17 -0000 1.1.2.1 --- Jake2-jogl11.bat 26 Oct 2004 14:43:23 -0000 1.1.2.2 *************** *** 1,3 **** @echo off SET PATH=lib\windows;%PATH% ! java -Xmx128M -Dsun.java2d.noddraw=true -Djava.library.path=lib/jogl-1.1/windows;lib/windows -cp lib/jake2.jar;lib/jogl-1.1/jogl.jar;lib/windows/joal.jar jake2.Jake2 \ No newline at end of file --- 1,3 ---- @echo off SET PATH=lib\windows;%PATH% ! java -Xmx128M -Dsun.java2d.noddraw=true -DATI_WORKAROUND=false -Djava.library.path=lib/jogl-1.1/windows;lib/windows -cp lib/jake2.jar;lib/jogl-1.1/jogl.jar;lib/windows/joal.jar jake2.Jake2 \ No newline at end of file --- NEW FILE: Jake2-jogl11ATI.bat --- @echo off SET PATH=lib\windows;%PATH% java -Xmx128M -Dsun.java2d.noddraw=true -DATI_WORKAROUND=true -Djava.library.path=lib/jogl-1.1/windows;lib/windows -cp lib/jake2.jar;lib/jogl-1.1/jogl.jar;lib/windows/joal.jar jake2.Jake2 --- NEW FILE: Jake2-jogl11ATI.sh --- #!/bin/bash export LD_LIBRARY_PATH=lib/linux CP=lib/jake2.jar:lib/jogl-1.1/jogl.jar:lib/linux/joal.jar exec java -Xmx128M -DATI_WORKAROUND=true -Djava.library.path=lib/jogl-1.1/linux:lib/linux -cp $CP jake2.Jake2 Index: Jake2-jogl11.sh =================================================================== RCS file: /cvsroot/jake2/jake2/scripts/Attic/Jake2-jogl11.sh,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Jake2-jogl11.sh 26 Oct 2004 10:49:17 -0000 1.1.2.1 --- Jake2-jogl11.sh 26 Oct 2004 14:43:23 -0000 1.1.2.2 *************** *** 4,6 **** CP=lib/jake2.jar:lib/jogl-1.1/jogl.jar:lib/linux/joal.jar ! exec java -Xmx128M -Djava.library.path=lib/jogl-1.1/linux:lib/linux -cp $CP jake2.Jake2 --- 4,6 ---- CP=lib/jake2.jar:lib/jogl-1.1/jogl.jar:lib/linux/joal.jar ! exec java -Xmx128M -DATI_WORKAROUND=true -Djava.library.path=lib/jogl-1.1/linux:lib/linux -cp $CP jake2.Jake2 |
|
From: Holger Z. <hz...@us...> - 2004-10-26 14:43:31
|
Update of /cvsroot/jake2/jake2/src/jake2/install In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2329/src/jake2/install Modified Files: Tag: software20 Q2DataInstaller.java Log Message: Index: Q2DataInstaller.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/install/Q2DataInstaller.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** Q2DataInstaller.java 24 Oct 2004 20:40:07 -0000 1.1 --- Q2DataInstaller.java 26 Oct 2004 14:43:22 -0000 1.1.2.1 *************** *** 402,408 **** 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(); --- 402,411 ---- private void ok() { ! if (!install.isSelected()) { ! parent.okButtonActionPerformed(null); ! System.exit(0); ! } parent.progressPanel.destDir = parent.destdir; ! parent.progressPanel.mirror = "../Quake2Demo/q2-314-demo-x86.exe"; parent.showProgressPanel(); new Thread(parent.progressPanel).start(); *************** *** 705,712 **** void endInstall(String message) { ! parent.notFoundPanel.message.setText(message); ! parent.dir = destDir + "/baseq2"; ! parent.showChooseDialog(); ! parent.okButtonActionPerformed(null); } --- 708,713 ---- void endInstall(String message) { ! parent.okButtonActionPerformed(null); ! System.exit(0); } *************** *** 744,748 **** installer.installQ2Data(); - System.exit(0); } } --- 745,748 ---- |
|
From: Holger Z. <hz...@us...> - 2004-10-26 13:30:24
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv15934 Modified Files: Tag: software20 README ChangeLog install.xml README_DE Log Message: README updates Index: README =================================================================== RCS file: /cvsroot/jake2/jake2/README,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** README 8 Sep 2004 09:51:51 -0000 1.4 --- README 26 Oct 2004 13:30:15 -0000 1.4.4.1 *************** *** 24,33 **** 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 build from source: - unpack jake2src-version.tar.gz or jake2-version.zip --- 24,36 ---- from binary distribution: ! - run the installer with "java -jar Jake2-Install.jar" ! - follow the instructions - run the game with Jake2.sh or Jake2.bat + there are 3 different start scripts: + - jake2-jogl11.* for Jake2 with current jogl version (suggested) + - jake2-jogl11ATI.* for Jake2 with current jogl version and ATI workaround + - jake2.* for Jake2 with jogl-1.0 (in case jogl-1.1 does not work) + build from source: - unpack jake2src-version.tar.gz or jake2-version.zip *************** *** 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 --- 40,46 ---- 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 Index: ChangeLog =================================================================== RCS file: /cvsroot/jake2/jake2/ChangeLog,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** ChangeLog 8 Sep 2004 20:41:20 -0000 1.4 --- ChangeLog 26 Oct 2004 13:30:16 -0000 1.4.4.1 *************** *** 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 Index: README_DE =================================================================== RCS file: /cvsroot/jake2/jake2/README_DE,v retrieving revision 1.4 retrieving revision 1.4.4.1 diff -C2 -d -r1.4 -r1.4.4.1 *** README_DE 8 Sep 2004 09:51:51 -0000 1.4 --- README_DE 26 Oct 2004 13:30:16 -0000 1.4.4.1 *************** *** 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,39 ---- ausgehend von der Binärdistribution: ! - Installationsprogramm mit "java -jar Jake2-Install.jar" starten ! - den Anweisungen folgen ! - Jake2 mit "jake2.sh" oder "jake2.bat" aus dem Installationsverzeichnis starten ! ! Es liegen 3 verschiedene Startskripts bei: ! - jake2-jogl11.* für Jake2 mit aktueller jogl Version (empfohlen) ! - jake2-jogl11ATI.* für Jake2 mit aktueller jogl Version und ATI workaround ! - jake2.* für Jake2 mit jogl-1.0 (wenn Probleme auftreten) 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 --- 43,50 ---- 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 Index: install.xml =================================================================== RCS file: /cvsroot/jake2/jake2/install.xml,v retrieving revision 1.2.2.1 retrieving revision 1.2.2.2 diff -C2 -d -r1.2.2.1 -r1.2.2.2 *** install.xml 26 Oct 2004 10:49:41 -0000 1.2.2.1 --- install.xml 26 Oct 2004 13:30:16 -0000 1.2.2.2 *************** *** 6,10 **** <info> <appname>Jake2</appname> ! <appversion>cvs</appversion> <authors> <author name="Bytonic Software" email="ja...@by..."/> --- 6,10 ---- <info> <appname>Jake2</appname> ! <appversion>0.9.4-pre1</appversion> <authors> <author name="Bytonic Software" email="ja...@by..."/> |
|
From: Holger Z. <hz...@us...> - 2004-10-26 10:49:51
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7865 Modified Files: Tag: software20 build.xml shortcutSpec.xml install.xml Log Message: integrate jogl-1.1 Index: build.xml =================================================================== RCS file: /cvsroot/jake2/jake2/build.xml,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** build.xml 24 Oct 2004 20:40:06 -0000 1.13 --- build.xml 26 Oct 2004 10:49:41 -0000 1.13.2.1 *************** *** 196,201 **** output="${basedir}/Jake2-install.jar" installerType="standard" ! basedir="${dist}" ! izPackDir="${basedir}/lib/izpack"/> </target> --- 196,200 ---- output="${basedir}/Jake2-install.jar" installerType="standard" ! basedir="${dist}"/> </target> Index: shortcutSpec.xml =================================================================== RCS file: /cvsroot/jake2/jake2/shortcutSpec.xml,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** shortcutSpec.xml 25 Oct 2004 15:15:26 -0000 1.1 --- shortcutSpec.xml 26 Oct 2004 10:49:41 -0000 1.1.2.1 *************** *** 7,11 **** <shortcut ! name="Jake2" programGroup="yes" desktop="no" --- 7,11 ---- <shortcut ! name="Jake2 jogl1.0" programGroup="yes" desktop="no" *************** *** 23,26 **** --- 23,43 ---- </shortcut> + <shortcut + name="Jake2" + programGroup="yes" + desktop="no" + applications="no" + startMenu="no" + startup="no" + target="$INSTALL_PATH/Jake2-jogl11.bat" + workingDirectory="$INSTALL_PATH" + commandLine="" + description="Jake2" + initialState="noShow"> + + <createForPack name="Windows libraries and scripts"/> + + </shortcut> + <shortcut name="Uninstaller" Index: install.xml =================================================================== RCS file: /cvsroot/jake2/jake2/install.xml,v retrieving revision 1.2 retrieving revision 1.2.2.1 diff -C2 -d -r1.2 -r1.2.2.1 *** install.xml 25 Oct 2004 15:15:26 -0000 1.2 --- install.xml 26 Oct 2004 10:49:41 -0000 1.2.2.1 *************** *** 47,50 **** --- 47,53 ---- <exclude name="*.ico"/> </fileset> + <fileset dir=".." targetdir="$INSTALL_PATH"> + <include name="lib/jogl-1.1/**/jogl.jar"/> + </fileset> <executable type="jar" targetfile="$INSTALL_PATH/lib/jake2.jar" *************** *** 62,66 **** --- 65,76 ---- <file src="lib/linux" targetdir="$INSTALL_PATH/lib"/> <file src="Jake2.sh" targetdir="$INSTALL_PATH"/> + <fileset dir=".." targetdir="$INSTALL_PATH"> + <include name="lib/jogl-1.1/linux/*"/> + </fileset> + <fileset dir="../scripts" targetdir="$INSTALL_PATH"> + <include name="*jogl11.sh"/> + </fileset> <executable targetfile="$INSTALL_PATH/Jake2.sh" stage="never"/> + <executable targetfile="$INSTALL_PATH/Jake2-jogl11.sh" stage="never"/> </pack> <pack name="Windows libraries and scripts" required="yes"> *************** *** 69,73 **** --- 79,90 ---- <file src="lib/windows" targetdir="$INSTALL_PATH/lib"/> <file src="Jake2.bat" targetdir="$INSTALL_PATH"/> + <fileset dir=".." targetdir="$INSTALL_PATH"> + <include name="lib/jogl-1.1/windows/*"/> + </fileset> + <fileset dir="../scripts" targetdir="$INSTALL_PATH"> + <include name="*jogl11.bat"/> + </fileset> <executable targetfile="$INSTALL_PATH/Jake2.bat" stage="never"/> + <executable targetfile="$INSTALL_PATH/Jake2-jogl11.bat" stage="never"/> </pack> </packs> |
|
From: Holger Z. <hz...@us...> - 2004-10-26 10:49:27
|
Update of /cvsroot/jake2/jake2/scripts In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7777/scripts Added Files: Tag: software20 Jake2-jogl11.sh Jake2-jogl11.bat Log Message: jogl-1.1 start scripts --- NEW FILE: Jake2-jogl11.bat --- @echo off SET PATH=lib\windows;%PATH% java -Xmx128M -Dsun.java2d.noddraw=true -Djava.library.path=lib/jogl-1.1/windows;lib/windows -cp lib/jake2.jar;lib/jogl-1.1/jogl.jar;lib/windows/joal.jar jake2.Jake2 --- NEW FILE: Jake2-jogl11.sh --- #!/bin/bash export LD_LIBRARY_PATH=lib/linux CP=lib/jake2.jar:lib/jogl-1.1/jogl.jar:lib/linux/joal.jar exec java -Xmx128M -Djava.library.path=lib/jogl-1.1/linux:lib/linux -cp $CP jake2.Jake2 |
|
From: Holger Z. <hz...@us...> - 2004-10-26 10:49:00
|
Update of /cvsroot/jake2/jake2/src/jake2/render In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7617/src/jake2/render Modified Files: Tag: software20 JoglBase.java Log Message: manually swap buffers with jogl-1.1 Index: JoglBase.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/render/JoglBase.java,v retrieving revision 1.9 retrieving revision 1.9.4.1 diff -C2 -d -r1.9 -r1.9.4.1 *** JoglBase.java 19 Sep 2004 20:32:05 -0000 1.9 --- JoglBase.java 26 Oct 2004 10:48:49 -0000 1.9.4.1 *************** *** 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); *************** *** 302,308 **** 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) { --- 307,313 ---- 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-26 09:28:51
|
Update of /cvsroot/jake2/jake2/lib/jogl-1.1/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22714/lib/jogl-1.1/windows Added Files: Tag: software20 jogl.dll jogl_cg.dll Log Message: jogl-1.1b5 --- NEW FILE: jogl_cg.dll --- (This appears to be a binary file; contents omitted.) --- NEW FILE: jogl.dll --- (This appears to be a binary file; contents omitted.) |
|
From: Holger Z. <hz...@us...> - 2004-10-26 09:28:50
|
Update of /cvsroot/jake2/jake2/lib/jogl-1.1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22714/lib/jogl-1.1 Added Files: Tag: software20 jogl.jar Log Message: jogl-1.1b5 --- NEW FILE: jogl.jar --- (This appears to be a binary file; contents omitted.) |
|
From: Holger Z. <hz...@us...> - 2004-10-26 09:28:50
|
Update of /cvsroot/jake2/jake2/lib/jogl-1.1/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22714/lib/jogl-1.1/linux Added Files: Tag: software20 libjogl_cg.so libjogl.so Log Message: jogl-1.1b5 --- NEW FILE: libjogl.so --- (This appears to be a binary file; contents omitted.) --- NEW FILE: libjogl_cg.so --- (This appears to be a binary file; contents omitted.) |
|
From: Holger Z. <hz...@us...> - 2004-10-26 09:28:16
|
Update of /cvsroot/jake2/jake2/lib/jogl-1.1/windows In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22636/lib/jogl-1.1/windows Log Message: Directory /cvsroot/jake2/jake2/lib/jogl-1.1/windows added to the repository |
|
From: Holger Z. <hz...@us...> - 2004-10-26 09:28:16
|
Update of /cvsroot/jake2/jake2/lib/jogl-1.1/linux In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22636/lib/jogl-1.1/linux Log Message: Directory /cvsroot/jake2/jake2/lib/jogl-1.1/linux added to the repository |
|
From: Holger Z. <hz...@us...> - 2004-10-26 09:28:15
|
Update of /cvsroot/jake2/jake2/lib/jogl-1.1 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22636/lib/jogl-1.1 Log Message: Directory /cvsroot/jake2/jake2/lib/jogl-1.1 added to the repository --> Using per-directory sticky tag `software20' |
|
From: Carsten W. <ca...@us...> - 2004-10-25 21:57:58
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6232/src/jake2/client Modified Files: CL_parse.java Log Message: downladed files will be stored in level directory (save games and config.cfg put to .jake2) Index: CL_parse.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CL_parse.java 24 Oct 2004 23:48:22 -0000 1.14 --- CL_parse.java 25 Oct 2004 21:57:49 -0000 1.15 *************** *** 57,65 **** public static String DownloadFileName(String fn) { ! return FS.Gamedir() + "/" + fn; ! // if (fn.startsWith("players")) ! // return Globals.BASEDIRNAME + "/" + fn; ! // else ! // return FS.Gamedir() + "/" + fn; } --- 57,61 ---- public static String DownloadFileName(String fn) { ! return FS.BaseGamedir() + "/" + fn; } |
|
From: Carsten W. <ca...@us...> - 2004-10-25 21:57:58
|
Update of /cvsroot/jake2/jake2/src/jake2/qcommon In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6232/src/jake2/qcommon Modified Files: FS.java Log Message: downladed files will be stored in level directory (save games and config.cfg put to .jake2) Index: FS.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/qcommon/FS.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** FS.java 19 Oct 2004 17:23:20 -0000 1.9 --- FS.java 25 Oct 2004 21:57:48 -0000 1.10 *************** *** 634,637 **** --- 634,638 ---- * * Called to find where to write a file (demos, savegames, etc) + * this is modified to <user.home>/.jake2 */ public static String Gamedir() { *************** *** 640,643 **** --- 641,653 ---- /* + * BaseGamedir + * + * Called to find where to write a downloaded file + */ + public static String BaseGamedir() { + return (fs_gamedir != null) ? fs_gamedir : Globals.BASEDIRNAME; + } + + /* * ExecAutoexec */ |
|
From: Holger Z. <hz...@us...> - 2004-10-25 15:15:35
|
Update of /cvsroot/jake2/jake2 In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8940 Modified Files: install.xml Added Files: shortcutSpec.xml Log Message: shortcut creation for windows --- NEW FILE: shortcutSpec.xml --- <?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <shortcuts> <programGroup defaultName="Jake2" location="applications"/> <shortcut name="Jake2" programGroup="yes" desktop="no" applications="no" startMenu="no" startup="no" target="$INSTALL_PATH/Jake2.bat" workingDirectory="$INSTALL_PATH" commandLine="" description="Jake2" initialState="noShow"> <createForPack name="Windows libraries and scripts"/> </shortcut> <shortcut name="Uninstaller" programGroup="yes" desktop="no" applications="no" startMenu="no" startup="no" target="$INSTALL_PATH/Uninstaller/uninstaller.jar" commandLine="" description="uninstall Jake2"> <createForPack name="Windows libraries and scripts"/> </shortcut> </shortcuts> Index: install.xml =================================================================== RCS file: /cvsroot/jake2/jake2/install.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** install.xml 24 Oct 2004 20:40:06 -0000 1.1 --- install.xml 25 Oct 2004 15:15:26 -0000 1.2 *************** *** 1,72 **** ! <?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> ! ! ! <installation version="1.0"> ! ! <info> ! <appname>Jake2</appname> ! <appversion>cvs</appversion> ! <authors> ! <author name="Bytonic Software" email="ja...@by..."/> ! </authors> ! <url>http://www.bytonic.de</url> ! </info> ! ! <guiprefs width="640" height="480" resizable="no"/> ! ! <locale> ! <langpack iso3="eng"/> ! </locale> ! ! <resources> ! <res id="LicencePanel.licence" src="LICENSE"/> ! <res id="InfoPanel.info" src="README"/> ! <!-- res id="Installer.image" src="../resources/icon.png"/ --> ! </resources> ! ! <panels> ! <panel classname="HelloPanel"/> ! <panel classname="InfoPanel"/> ! <panel classname="LicencePanel"/> ! <panel classname="TargetPanel"/> ! <panel classname="PacksPanel"/> ! <panel classname="InstallPanel"/> ! <panel classname="SimpleFinishPanel"/> ! </panels> ! ! <packs> ! <pack name="Jake2" required="yes"> ! <description>Jake2 files</description> ! <fileset dir="." targetdir="$INSTALL_PATH"> ! <include name="*"/> ! <include name="lib/*.jar"/> ! <exclude name="*.bat"/> ! <exclude name="*.sh"/> ! </fileset> ! <executable type="jar" ! targetfile="$INSTALL_PATH/lib/jake2.jar" ! class="jake2.install.Q2DataInstaller" ! stage="postinstall" ! keep="true"> ! <args> ! <arg value="$INSTALL_PATH"/> ! </args> ! </executable> ! </pack> ! <pack name="Linux libraries and scripts" required="yes"> ! <os name="Linux" arch="i386"/> ! <description>jogl and joal libraries for Linux</description> ! <file src="lib/linux" targetdir="$INSTALL_PATH/lib"/> ! <file src="Jake2.sh" targetdir="$INSTALL_PATH"/> ! <executable targetfile="$INSTALL_PATH/Jake2.sh" stage="never"/> ! </pack> ! <pack name="Windows libraries and scripts" required="yes"> ! <os family="windows" arch="i386"/> ! <description>jogl and joal libraries for Windows</description> ! <file src="lib/windows" targetdir="$INSTALL_PATH/lib"/> ! <file src="Jake2.bat" targetdir="$INSTALL_PATH"/> ! <executable targetfile="$INSTALL_PATH/Jake2.bat" stage="never"/> ! </pack> ! </packs> ! ! </installation> --- 1,77 ---- ! <?xml version="1.0" encoding="iso-8859-1" standalone="yes" ?> ! ! ! <installation version="1.0"> ! ! <info> ! <appname>Jake2</appname> ! <appversion>cvs</appversion> ! <authors> ! <author name="Bytonic Software" email="ja...@by..."/> ! </authors> ! <url>http://www.bytonic.de</url> ! </info> ! ! <guiprefs width="640" height="480" resizable="no"/> ! ! <locale> ! <langpack iso3="eng"/> ! </locale> ! ! <resources> ! <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> ! ! <panels> ! <panel classname="HelloPanel"/> ! <panel classname="InfoPanel"/> ! <panel classname="LicencePanel"/> ! <panel classname="TargetPanel"/> ! <panel classname="PacksPanel"/> ! <panel classname="InstallPanel"/> ! <panel classname="ShortcutPanel"/> ! <panel classname="SimpleFinishPanel"/> ! </panels> ! ! <packs> ! <pack name="Jake2" required="yes"> ! <description>Jake2 files</description> ! <fileset dir="." targetdir="$INSTALL_PATH"> ! <include name="*"/> ! <include name="lib/*.jar"/> ! <exclude name="*.bat"/> ! <exclude name="*.sh"/> ! <exclude name="*.ico"/> ! </fileset> ! <executable type="jar" ! targetfile="$INSTALL_PATH/lib/jake2.jar" ! class="jake2.install.Q2DataInstaller" ! stage="postinstall" ! keep="true"> ! <args> ! <arg value="$INSTALL_PATH"/> ! </args> ! </executable> ! </pack> ! <pack name="Linux libraries and scripts" required="yes"> ! <os name="Linux" arch="i386"/> ! <description>jogl and joal libraries for Linux</description> ! <file src="lib/linux" targetdir="$INSTALL_PATH/lib"/> ! <file src="Jake2.sh" targetdir="$INSTALL_PATH"/> ! <executable targetfile="$INSTALL_PATH/Jake2.sh" stage="never"/> ! </pack> ! <pack name="Windows libraries and scripts" required="yes"> ! <os family="windows"/> ! <description>jogl and joal libraries for Windows</description> ! <file src="lib/windows" targetdir="$INSTALL_PATH/lib"/> ! <file src="Jake2.bat" targetdir="$INSTALL_PATH"/> ! <executable targetfile="$INSTALL_PATH/Jake2.bat" stage="never"/> ! </pack> ! </packs> ! ! <native type="izpack" name="ShellLink.dll"/> ! ! </installation> |
|
From: Carsten W. <ca...@us...> - 2004-10-24 23:48:31
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31729/src/jake2/client Modified Files: CL_parse.java Log Message: this is the right place for download file Index: CL_parse.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v retrieving revision 1.13 retrieving revision 1.14 diff -C2 -d -r1.13 -r1.14 *** CL_parse.java 24 Oct 2004 22:23:41 -0000 1.13 --- CL_parse.java 24 Oct 2004 23:48:22 -0000 1.14 *************** *** 57,64 **** public static String DownloadFileName(String fn) { ! if (fn.startsWith("players")) ! return Globals.BASEDIRNAME + "/" + fn; ! else ! return FS.Gamedir() + "/" + fn; } --- 57,65 ---- public static String DownloadFileName(String fn) { ! return FS.Gamedir() + "/" + fn; ! // if (fn.startsWith("players")) ! // return Globals.BASEDIRNAME + "/" + fn; ! // else ! // return FS.Gamedir() + "/" + fn; } |
|
From: Carsten W. <ca...@us...> - 2004-10-24 22:23:50
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9079/src/jake2/client Modified Files: CL_parse.java Log Message: simple bugfix Index: CL_parse.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** CL_parse.java 24 Oct 2004 21:12:43 -0000 1.12 --- CL_parse.java 24 Oct 2004 22:23:41 -0000 1.13 *************** *** 119,125 **** + Globals.cls.downloadname + " " + len); } else { ! Globals.cls.downloadname = Globals.cls.downloadname; ! ! Com.Printf("CheckOrDownloading " + Globals.cls.downloadname + "\n"); MSG.WriteByte(Globals.cls.netchan.message, Defines.clc_stringcmd); MSG.WriteString(Globals.cls.netchan.message, "download " --- 119,123 ---- + Globals.cls.downloadname + " " + len); } else { ! Com.Printf("Downloading " + Globals.cls.downloadname + "\n"); MSG.WriteByte(Globals.cls.netchan.message, Defines.clc_stringcmd); MSG.WriteString(Globals.cls.netchan.message, "download " |
|
From: Carsten W. <ca...@us...> - 2004-10-24 21:12:52
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21210/src/jake2/client Modified Files: CL_parse.java Log Message: string bugfix and faster filecheck Index: CL_parse.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** CL_parse.java 24 Oct 2004 21:02:05 -0000 1.11 --- CL_parse.java 24 Oct 2004 21:12:43 -0000 1.12 *************** *** 57,61 **** public static String DownloadFileName(String fn) { ! if ("players".equals(fn)) return Globals.BASEDIRNAME + "/" + fn; else --- 57,61 ---- public static String DownloadFileName(String fn) { ! if (fn.startsWith("players")) return Globals.BASEDIRNAME + "/" + fn; else *************** *** 78,82 **** } ! if (FS.LoadFile(filename) != null) { // it exists, no need to download return true; } --- 78,82 ---- } ! if (FS.FileLength(filename) > 0) { // it exists, no need to download return true; } |
|
From: Rene S. <sa...@us...> - 2004-10-24 21:02:16
|
Update of /cvsroot/jake2/jake2/src/jake2/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18445/src/jake2/client Modified Files: CL.java CL_parse.java Log Message: Player Skin Download bug fixed Index: CL_parse.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL_parse.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CL_parse.java 21 Oct 2004 01:50:49 -0000 1.10 --- CL_parse.java 24 Oct 2004 21:02:05 -0000 1.11 *************** *** 98,109 **** fp = Lib.fopen(name, "r+b"); ! if (fp != null) { // it exists long len = 0; try { len = fp.length(); ! } catch (IOException e) { } ! ; Globals.cls.download = fp; --- 98,113 ---- fp = Lib.fopen(name, "r+b"); ! ! if (fp != null) { ! ! // it exists long len = 0; try { len = fp.length(); ! } ! catch (IOException e) { } ! Globals.cls.download = fp; *************** *** 117,121 **** Globals.cls.downloadname = Globals.cls.downloadname; ! Com.Printf("Downloading " + Globals.cls.downloadname + "\n"); MSG.WriteByte(Globals.cls.netchan.message, Defines.clc_stringcmd); MSG.WriteString(Globals.cls.netchan.message, "download " --- 121,125 ---- Globals.cls.downloadname = Globals.cls.downloadname; ! Com.Printf("CheckOrDownloading " + Globals.cls.downloadname + "\n"); MSG.WriteByte(Globals.cls.netchan.message, Defines.clc_stringcmd); MSG.WriteString(Globals.cls.netchan.message, "download " Index: CL.java =================================================================== RCS file: /cvsroot/jake2/jake2/src/jake2/client/CL.java,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** CL.java 20 Oct 2004 20:39:10 -0000 1.14 --- CL.java 24 Oct 2004 21:02:04 -0000 1.15 *************** *** 1131,1136 **** } ! int pos = Globals.cl.configstrings[Defines.CS_PLAYERSKINS ! + i].indexOf('\\'); if (pos != -1) pos++; --- 1131,1136 ---- } ! int pos = Globals.cl.configstrings[Defines.CS_PLAYERSKINS + i].indexOf('\\'); ! if (pos != -1) pos++; *************** *** 1138,1154 **** pos = 0; model = Globals.cl.configstrings[Defines.CS_PLAYERSKINS + i] ! .substring(pos); ! ! pos = model.indexOf('/'); ! ! if (pos == -1) ! pos = model.indexOf('\\'); ! ! if (pos != -1) { ! skin = model.substring(pos + 1); ! } else ! skin = ""; ! switch (n) { case 0: // model --- 1138,1152 ---- pos = 0; + int pos2 = Globals.cl.configstrings[Defines.CS_PLAYERSKINS + i].indexOf('\\', pos); + + if (pos2 == -1) + pos2 = Globals.cl.configstrings[Defines.CS_PLAYERSKINS + i].indexOf('/', pos); + + model = Globals.cl.configstrings[Defines.CS_PLAYERSKINS + i] ! .substring(pos, pos2); ! ! skin = Globals.cl.configstrings[Defines.CS_PLAYERSKINS + i].substring(pos2 + 1); ! switch (n) { case 0: // model |
2 messages has been excluded from this view by a project administrator.
