rescue-svn Mailing List for Rescue! Max
Status: Beta
Brought to you by:
yuranet
You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
(5) |
Aug
|
Sep
(2) |
Oct
(1) |
Nov
|
Dec
|
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
(7) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(8) |
2010 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(3) |
Oct
|
Nov
|
Dec
|
2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(1) |
2013 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
(14) |
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
(6) |
Dec
|
2021 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2022 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(4) |
Sep
|
Oct
|
Nov
|
Dec
|
2023 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2024 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(1) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <yu...@us...> - 2024-05-08 15:56:53
|
Revision: 57 http://sourceforge.net/p/rescue/code/57 Author: yuranet Date: 2024-05-08 15:56:51 +0000 (Wed, 08 May 2024) Log Message: ----------- docs update Modified Paths: -------------- Rescue/src/rescue/MissionLoader.java Modified: Rescue/src/rescue/MissionLoader.java =================================================================== --- Rescue/src/rescue/MissionLoader.java 2023-06-05 19:23:30 UTC (rev 56) +++ Rescue/src/rescue/MissionLoader.java 2024-05-08 15:56:51 UTC (rev 57) @@ -123,6 +123,8 @@ loadImagesForSetup(); try { + // on Linux java 1.8 this is the ONLY one that works + // SampledJukeBox does NOT work on Linux java 1.8 jukebox = new SunAudioJukeBox(); } catch (NoClassDefFoundError err) { @@ -133,7 +135,7 @@ jukebox = new SampledJukeBox(); } catch (Exception ex) { - System.out.println("seems we can not start SampledJukeBox " + err); + System.out.println("seems we can not start SampledJukeBox " + ex); jukebox = new NullJukeBox(); } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2023-06-05 19:23:33
|
Revision: 56 http://sourceforge.net/p/rescue/code/56 Author: yuranet Date: 2023-06-05 19:23:30 +0000 (Mon, 05 Jun 2023) Log Message: ----------- fix for macOS scroll wheel Modified Paths: -------------- Rescue/ChangeLog.txt Rescue/src/rescue/BrowserLauncher.java Rescue/src/rescue/MissionObject.java Rescue/src/rescue/RunRescue.java Rescue/src/rescue/SunAudioJukeBox.java Rescue/src/rescue/gui/AboutDialog.java Rescue/src/rescue/gui/AspectRatio.java Rescue/src/rescue/gui/MissionSetup.java Rescue/src/rescue/gui/SFrame.java Rescue/src/rescue/gui/SplashScreen.java Rescue/src/rescue/lobby/client/ClientGameRescue.java Rescue/src/rescue/lobby/server/ServerGameRescue.java Rescue/src/rescue/panels/BigMapPanel.java Rescue/src/rescue/panels/ContainerPanel.java Rescue/src/rescue/panels/InterfacePanel.java Rescue/src/rescue/panels/ShipInfoPanel.java Rescue/src/rescue/panels/ShipsPanel.java Rescue/src/rescue/panels/SmallMapPanel.java Rescue/src/rescue/qdxml/XMLFileFilter.java Rescue/src/rescue/spaceobjects/Base.java Rescue/src/rescue/spaceobjects/ImageObject.java Rescue/src/rescue/spaceobjects/MannedObject.java Rescue/src/rescue/spaceobjects/SpaceObject.java Rescue/src/rescue/spaceobjects/Torpedo.java Rescue/src/rescue/spaceobjects/Wormhole.java Modified: Rescue/ChangeLog.txt =================================================================== --- Rescue/ChangeLog.txt 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/ChangeLog.txt 2023-06-05 19:23:30 UTC (rev 56) @@ -3,6 +3,7 @@ Rescue! Max 1.0.6 Fix crash when clicking cancel in the edit keyboard shortcuts dialog + Fix for MouseWheel not working correctly on macOS Rescue! Max 1.0.5 Modified: Rescue/src/rescue/BrowserLauncher.java =================================================================== --- Rescue/src/rescue/BrowserLauncher.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/BrowserLauncher.java 2023-06-05 19:23:30 UTC (rev 56) @@ -1,7 +1,6 @@ package rescue; import java.io.File; -import java.io.FileNotFoundException; import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.Field; Modified: Rescue/src/rescue/MissionObject.java =================================================================== --- Rescue/src/rescue/MissionObject.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/MissionObject.java 2023-06-05 19:23:30 UTC (rev 56) @@ -5,7 +5,6 @@ import java.util.Vector; import java.awt.image.BufferedImage; import javax.imageio.ImageIO; -import java.io.File; import java.io.IOException; import java.awt.Graphics; import java.util.Hashtable; Modified: Rescue/src/rescue/RunRescue.java =================================================================== --- Rescue/src/rescue/RunRescue.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/RunRescue.java 2023-06-05 19:23:30 UTC (rev 56) @@ -9,18 +9,14 @@ import java.awt.Point; import java.awt.geom.Point2D; import java.awt.Color; -import java.awt.image.BufferedImage; import java.awt.Graphics2D; import java.awt.KeyboardFocusManager; import java.util.Vector; -import java.util.Arrays; -import java.io.IOException; import java.net.URL; import java.io.File; import javax.swing.AbstractAction; import java.awt.event.ActionEvent; import javax.swing.Action; - import java.awt.event.KeyEvent; import java.util.List; import javax.swing.KeyStroke; Modified: Rescue/src/rescue/SunAudioJukeBox.java =================================================================== --- Rescue/src/rescue/SunAudioJukeBox.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/SunAudioJukeBox.java 2023-06-05 19:23:30 UTC (rev 56) @@ -1,6 +1,5 @@ package rescue; -import java.util.Hashtable; import java.net.URL; public class SunAudioJukeBox extends JukeBox { Modified: Rescue/src/rescue/gui/AboutDialog.java =================================================================== --- Rescue/src/rescue/gui/AboutDialog.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/gui/AboutDialog.java 2023-06-05 19:23:30 UTC (rev 56) @@ -10,8 +10,6 @@ import javax.swing.BorderFactory; import javax.swing.JDialog; import java.awt.Frame; -import java.awt.Rectangle; -import java.awt.BorderLayout; import java.awt.FlowLayout; import java.awt.event.WindowEvent; import java.awt.event.ActionEvent; Modified: Rescue/src/rescue/gui/AspectRatio.java =================================================================== --- Rescue/src/rescue/gui/AspectRatio.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/gui/AspectRatio.java 2023-06-05 19:23:30 UTC (rev 56) @@ -1,8 +1,5 @@ package rescue.gui; -import javax.swing.JPanel; -import javax.swing.JFrame; -import javax.swing.JDialog; import java.awt.event.ComponentAdapter; import java.awt.event.ComponentEvent; import java.awt.Component; Modified: Rescue/src/rescue/gui/MissionSetup.java =================================================================== --- Rescue/src/rescue/gui/MissionSetup.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/gui/MissionSetup.java 2023-06-05 19:23:30 UTC (rev 56) @@ -2,7 +2,6 @@ import rescue.*; import rescue.qdxml.XMLFileFilter; - import java.awt.Cursor; import java.awt.GridBagLayout; import java.awt.GridBagConstraints; Modified: Rescue/src/rescue/gui/SFrame.java =================================================================== --- Rescue/src/rescue/gui/SFrame.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/gui/SFrame.java 2023-06-05 19:23:30 UTC (rev 56) @@ -1,11 +1,7 @@ package rescue.gui; import rescue.panels.ContainerPanel; - import javax.swing.JInternalFrame; -import javax.swing.JPanel; -import java.awt.Component; -import java.awt.Dimension; import java.awt.Point; public class SFrame extends JInternalFrame { Modified: Rescue/src/rescue/gui/SplashScreen.java =================================================================== --- Rescue/src/rescue/gui/SplashScreen.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/gui/SplashScreen.java 2023-06-05 19:23:30 UTC (rev 56) @@ -1,15 +1,10 @@ package rescue.gui; -import java.awt.Color; import java.awt.Dimension; import java.awt.Frame; import java.awt.Graphics; -import java.awt.Image; -import java.awt.Insets; import java.awt.MediaTracker; -import java.awt.Toolkit; import java.awt.Window; - import javax.swing.ImageIcon; public class SplashScreen extends Window { Modified: Rescue/src/rescue/lobby/client/ClientGameRescue.java =================================================================== --- Rescue/src/rescue/lobby/client/ClientGameRescue.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/lobby/client/ClientGameRescue.java 2023-06-05 19:23:30 UTC (rev 56) @@ -1,42 +1,21 @@ package rescue.lobby.client; import org.lobby.client.*; - import rescue.gui.MissionSetup; -import rescue.MissionLoader; import rescue.RescueIO; import rescue.RunRescue; - import java.io.IOException; import java.io.InputStream; - import java.awt.Frame; import java.awt.Dimension; -import java.util.Map; -import java.util.HashMap; -import javax.swing.JDialog; import java.net.URL; -import javax.swing.ImageIcon; -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; import java.applet.Applet; - import javax.swing.ImageIcon; import javax.swing.JLabel; -import java.awt.Image; -import java.awt.image.BufferedImage; import javax.swing.JPanel; import javax.swing.Box; -import javax.swing.JButton; -import javax.swing.BorderFactory; -import javax.swing.JProgressBar; -import java.awt.event.ActionListener; -import java.awt.event.ActionEvent; - -import java.awt.FlowLayout; import javax.swing.JSpinner; import javax.swing.SpinnerNumberModel; -import java.awt.Component; import java.awt.BorderLayout; import javax.swing.BoxLayout; import javax.swing.JTextField; Modified: Rescue/src/rescue/lobby/server/ServerGameRescue.java =================================================================== --- Rescue/src/rescue/lobby/server/ServerGameRescue.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/lobby/server/ServerGameRescue.java 2023-06-05 19:23:30 UTC (rev 56) @@ -2,11 +2,7 @@ import org.lobby.server.ServerGame; import org.lobby.server.ServerGameListener; - -import java.util.Iterator; import java.util.Vector; -import java.util.Map; -import java.util.HashMap; public class ServerGameRescue implements ServerGame { Modified: Rescue/src/rescue/panels/BigMapPanel.java =================================================================== --- Rescue/src/rescue/panels/BigMapPanel.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/panels/BigMapPanel.java 2023-06-05 19:23:30 UTC (rev 56) @@ -1,16 +1,12 @@ package rescue.panels; import rescue.*; - import javax.swing.JPanel; -import java.awt.Canvas; import java.awt.Graphics; -import java.awt.Graphics2D; import java.awt.Color; import java.awt.Dimension; import java.awt.event.MouseEvent; import java.awt.event.MouseListener; -import java.awt.image.BufferedImage; import java.awt.event.MouseWheelEvent; import java.awt.event.MouseWheelListener; @@ -69,18 +65,12 @@ //********************************************************************** public void mouseWheelMoved(MouseWheelEvent e) { - if (e.getWheelRotation() < 0) { - rescue.zoom(true); - } - else { - + else if (e.getWheelRotation() > 0) { rescue.zoom(false); - } - } public void mouseClicked(MouseEvent e) { Modified: Rescue/src/rescue/panels/ContainerPanel.java =================================================================== --- Rescue/src/rescue/panels/ContainerPanel.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/panels/ContainerPanel.java 2023-06-05 19:23:30 UTC (rev 56) @@ -1,9 +1,7 @@ package rescue.panels; -import javax.swing.JInternalFrame; import javax.swing.JPanel; import java.awt.Dimension; -import java.awt.Component; import java.awt.Point; public class ContainerPanel extends JPanel { Modified: Rescue/src/rescue/panels/InterfacePanel.java =================================================================== --- Rescue/src/rescue/panels/InterfacePanel.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/panels/InterfacePanel.java 2023-06-05 19:23:30 UTC (rev 56) @@ -3,7 +3,6 @@ import rescue.*; import rescue.spaceobjects.Ship; import rescue.spaceobjects.ImageObject; - import javax.swing.JPanel; import java.awt.Graphics; import java.awt.Color; @@ -13,7 +12,6 @@ import java.awt.image.BufferedImage; import javax.imageio.ImageIO; import java.awt.Point; -import javax.swing.JTextField; import java.net.URL; import java.util.Vector; import javax.swing.Action; Modified: Rescue/src/rescue/panels/ShipInfoPanel.java =================================================================== --- Rescue/src/rescue/panels/ShipInfoPanel.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/panels/ShipInfoPanel.java 2023-06-05 19:23:30 UTC (rev 56) @@ -2,7 +2,6 @@ import rescue.spaceobjects.*; import rescue.*; - import javax.swing.JPanel; import java.awt.Graphics; import java.awt.Color; Modified: Rescue/src/rescue/panels/ShipsPanel.java =================================================================== --- Rescue/src/rescue/panels/ShipsPanel.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/panels/ShipsPanel.java 2023-06-05 19:23:30 UTC (rev 56) @@ -64,10 +64,10 @@ //JScrollBar a = getVerticalScrollBar(); //a.setValue( a.getValue()+(height*e.getWheelRotation()) ); - if (e.getWheelRotation()<0) { + if (e.getWheelRotation() < 0) { rescue.scrollShips( ((type==1)?true:false) ,true); } - else { + else if (e.getWheelRotation() > 0) { rescue.scrollShips( ((type==1)?true:false) ,false); } } Modified: Rescue/src/rescue/panels/SmallMapPanel.java =================================================================== --- Rescue/src/rescue/panels/SmallMapPanel.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/panels/SmallMapPanel.java 2023-06-05 19:23:30 UTC (rev 56) @@ -1,8 +1,6 @@ package rescue.panels; import rescue.*; - -import java.awt.Canvas; import javax.swing.JPanel; import java.awt.Graphics; import java.awt.Color; Modified: Rescue/src/rescue/qdxml/XMLFileFilter.java =================================================================== --- Rescue/src/rescue/qdxml/XMLFileFilter.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/qdxml/XMLFileFilter.java 2023-06-05 19:23:30 UTC (rev 56) @@ -2,7 +2,6 @@ import javax.swing.filechooser.FileFilter; import java.io.File; -import java.util.ResourceBundle; public class XMLFileFilter extends FileFilter { Modified: Rescue/src/rescue/spaceobjects/Base.java =================================================================== --- Rescue/src/rescue/spaceobjects/Base.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/spaceobjects/Base.java 2023-06-05 19:23:30 UTC (rev 56) @@ -1,7 +1,6 @@ package rescue.spaceobjects; import java.awt.Graphics; -import java.awt.Color; import java.awt.image.BufferedImage; import java.util.Vector; Modified: Rescue/src/rescue/spaceobjects/ImageObject.java =================================================================== --- Rescue/src/rescue/spaceobjects/ImageObject.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/spaceobjects/ImageObject.java 2023-06-05 19:23:30 UTC (rev 56) @@ -4,7 +4,6 @@ import java.awt.Point; import java.util.Vector; import java.awt.image.BufferedImage; -import java.awt.Color; public abstract class ImageObject extends SpaceObject { Modified: Rescue/src/rescue/spaceobjects/MannedObject.java =================================================================== --- Rescue/src/rescue/spaceobjects/MannedObject.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/spaceobjects/MannedObject.java 2023-06-05 19:23:30 UTC (rev 56) @@ -5,7 +5,6 @@ import java.util.Vector; import java.awt.image.BufferedImage; import java.awt.Color; -//import java.util.Arrays; public abstract class MannedObject extends ImageObject { Modified: Rescue/src/rescue/spaceobjects/SpaceObject.java =================================================================== --- Rescue/src/rescue/spaceobjects/SpaceObject.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/spaceobjects/SpaceObject.java 2023-06-05 19:23:30 UTC (rev 56) @@ -3,8 +3,6 @@ import java.awt.Graphics; import java.awt.Point; import java.util.Vector; -import java.awt.image.BufferedImage; -import java.awt.Color; public abstract class SpaceObject extends Point { Modified: Rescue/src/rescue/spaceobjects/Torpedo.java =================================================================== --- Rescue/src/rescue/spaceobjects/Torpedo.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/spaceobjects/Torpedo.java 2023-06-05 19:23:30 UTC (rev 56) @@ -2,7 +2,6 @@ import java.awt.Graphics; import java.awt.Color; -import java.awt.Point; import java.util.Vector; public class Torpedo extends SpaceObject { Modified: Rescue/src/rescue/spaceobjects/Wormhole.java =================================================================== --- Rescue/src/rescue/spaceobjects/Wormhole.java 2023-06-05 18:38:27 UTC (rev 55) +++ Rescue/src/rescue/spaceobjects/Wormhole.java 2023-06-05 19:23:30 UTC (rev 56) @@ -1,10 +1,8 @@ package rescue.spaceobjects; import java.awt.Graphics; -import java.awt.Color; import java.awt.image.BufferedImage; import java.util.Vector; -import java.awt.Point; public class Wormhole extends ImageObject { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2023-06-05 18:38:30
|
Revision: 55 http://sourceforge.net/p/rescue/code/55 Author: yuranet Date: 2023-06-05 18:38:27 +0000 (Mon, 05 Jun 2023) Log Message: ----------- fix for crash on cancel Modified Paths: -------------- Rescue/ChangeLog.txt Rescue/src/rescue/RunRescue.java Rescue/src/rescue/gui/Keymap.java Rescue/src/rescue/gui/PrefDialog.java Modified: Rescue/ChangeLog.txt =================================================================== --- Rescue/ChangeLog.txt 2022-08-15 11:19:56 UTC (rev 54) +++ Rescue/ChangeLog.txt 2023-06-05 18:38:27 UTC (rev 55) @@ -1,5 +1,9 @@ Yura Mamyrin (yu...@yu...) +Rescue! Max 1.0.6 + + Fix crash when clicking cancel in the edit keyboard shortcuts dialog + Rescue! Max 1.0.5 Grasshopper update (2.9) to fix font loading deadlock on startup Modified: Rescue/src/rescue/RunRescue.java =================================================================== --- Rescue/src/rescue/RunRescue.java 2022-08-15 11:19:56 UTC (rev 54) +++ Rescue/src/rescue/RunRescue.java 2023-06-05 18:38:27 UTC (rev 55) @@ -28,7 +28,7 @@ public class RunRescue implements Runnable,IndicatorsListener { // extends Thread public static final String DEFAULT_MISSION = "rescuemax.xml"; - public static final String VERSION = "1.0.5"; + public static final String VERSION = "1.0.6"; public static final String NAME="Rescue! Max"; public static final String KEYMAP_FILENAME = "keys.ini"; Modified: Rescue/src/rescue/gui/Keymap.java =================================================================== --- Rescue/src/rescue/gui/Keymap.java 2022-08-15 11:19:56 UTC (rev 54) +++ Rescue/src/rescue/gui/Keymap.java 2023-06-05 18:38:27 UTC (rev 55) @@ -79,9 +79,7 @@ action.actionPerformed(null); return true; } - } - } } @@ -91,10 +89,18 @@ public Action setupAction; public String setupName; - public void setupKeyForAction(Action action,String name) { + public void setupKeyForAction(Action action, String name) { + boolean removeKeyEventDispatcher = action == null && name == null && setupAction != null && setupName != null; + setupAction = action; setupName = name; - KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(this); + + if (setupAction != null && setupName != null) { + KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(this); + } + else if (removeKeyEventDispatcher) { + KeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventDispatcher(this); + } } Modified: Rescue/src/rescue/gui/PrefDialog.java =================================================================== --- Rescue/src/rescue/gui/PrefDialog.java 2022-08-15 11:19:56 UTC (rev 54) +++ Rescue/src/rescue/gui/PrefDialog.java 2023-06-05 18:38:27 UTC (rev 55) @@ -27,7 +27,7 @@ * <p> About Dialog </p> * @author Yura Mamyrin */ -public class PrefDialog extends JDialog implements ActionListener,PropertyChangeListener { +public class PrefDialog extends JDialog implements ActionListener, PropertyChangeListener { private static final String TEMP_ACCELERATOR_KEY = "TEMP_AcceleratorKey"; @@ -134,8 +134,8 @@ // in java 1.5 use toURI() instead of getFile() Keymap.saveKeys(actions, new FileOutputStream( new File(new URL(rescue.getMissionsRootURL() ,RunRescue.KEYMAP_FILENAME).getFile() ) ) ); } - catch(Exception ex) { - System.out.println("unable to save keys: "+ex); + catch (Exception ex) { + System.out.println("unable to save keys: " + ex); } closeDialog(); @@ -166,16 +166,19 @@ Action action = getCurrentAction(); action.removePropertyChangeListener(this); + // keyStroke can be null if we click cancel, as cancel calls "putValue(TEMP_ACCELERATOR_KEY, null)" Object keyStroke = action.getValue( TEMP_ACCELERATOR_KEY ); - List actions = rescue.getActions(); - for (int c=0;c<actions.size();c++) { - Action action2 = (Action)actions.get(c); + if (keyStroke != null) { + List actions = rescue.getActions(); + for (int c = 0; c < actions.size(); c++) { + Action action2 = (Action)actions.get(c); - if (action!=action2 && keyStroke.equals( action2.getValue( TEMP_ACCELERATOR_KEY ) )) { - action2.putValue( TEMP_ACCELERATOR_KEY , null ); - } - } + if (action != action2 && keyStroke.equals( action2.getValue( TEMP_ACCELERATOR_KEY ) )) { + action2.putValue(TEMP_ACCELERATOR_KEY, null); + } + } + } repaint(); } @@ -188,6 +191,10 @@ /** Closes the dialog */ private void closeDialog() { + // in case we are in the middle of a change, cancel everything + keymap.setupKeyForAction(null, null); + + // in case we have a current action listening for events, this will clear it with a empty event List actions = rescue.getActions(); for (int c=0;c<actions.size();c++) { ((Action)actions.get(c)).putValue( TEMP_ACCELERATOR_KEY , null ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2022-08-15 11:20:01
|
Revision: 54 http://sourceforge.net/p/rescue/code/54 Author: yuranet Date: 2022-08-15 11:19:56 +0000 (Mon, 15 Aug 2022) Log Message: ----------- show correct version Modified Paths: -------------- website/index.htm Modified: website/index.htm =================================================================== --- website/index.htm 2022-08-15 10:55:28 UTC (rev 53) +++ website/index.htm 2022-08-15 11:19:56 UTC (rev 54) @@ -56,7 +56,7 @@ <p><b>Download</b>: <a href="http://sourceforge.net/projects/rescue/files/latest/download">Rescue! Max beta 5</a> - (1.0.4) 3.8MB + (1.0.5) 3.8MB <a href="http://sf.net/p/rescue/code/HEAD/tree/Rescue/ChangeLog.txt">Change Log</a> <p>Rescue! Max requires java 1.4 or above to run. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2022-08-15 10:55:30
|
Revision: 53 http://sourceforge.net/p/rescue/code/53 Author: yuranet Date: 2022-08-15 10:55:28 +0000 (Mon, 15 Aug 2022) Log Message: ----------- website added Added Paths: ----------- website/ website/connect.sh website/index.htm Added: website/connect.sh =================================================================== --- website/connect.sh (rev 0) +++ website/connect.sh 2022-08-15 10:55:28 UTC (rev 53) @@ -0,0 +1,2 @@ +sftp yu...@we...:rescue + Property changes on: website/connect.sh ___________________________________________________________________ Added: svn:executable ## -0,0 +1 ## +* \ No newline at end of property Added: website/index.htm =================================================================== --- website/index.htm (rev 0) +++ website/index.htm 2022-08-15 10:55:28 UTC (rev 53) @@ -0,0 +1,146 @@ +<html> + +<head> +<title>Rescue! Max</title> +</head> + +<body bgcolor="#000000" text="#FF0000" topmargin="0" leftmargin="0" link="#FFFF00" vlink="#FFFF00" alink="#FFFF00"> + +<table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%"> + <tr> + <td> </td> + <td bgcolor="#FF0000"> </td> + <td> </td> + <td align="center" valign="top" width="100%" colspan="2"> + <center> + + <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: collapse"> + <tr> + <td align="right" valign="bottom"> + <img src="images/bantoplt.gif" width="30" height="16"></td> + <td></td> + <td valign="bottom"> + <img src="images/bantoprt.gif" width="30" height="16"></td> + </tr> + <tr> + <td align="right" valign="top"> + <img src="images/banbonlt.gif" width="30" height="60"></td> + <td align="center" bgcolor="#FFFF00"> + <font size="7" color="#000000">Rescue! Max</font></td> + <td valign="top"> + <img src="images/banbonrt.gif" width="30" height="60"></td> + </tr> + </table> + + </center> + </td> + </tr> + <tr> + <td> </td> + <td bgcolor="#FF0000"> </td> + <td valign="bottom"><img src="images/bl3.gif" width="30" height="60"></td> + <td valign="top" height="100%"><br> + + + + Rescue Max is a Action Adventure in Space written in java.<br> + It is based on a old mac game called Rescue! by Tom Spreen.<br> + <br> + Screenshots:<br> + <a href="screenshots/rescue1.0a.png"> + <img border="0" src="screenshots/rescue1.0a_small.png" width="200" height="150"></a> + <a href="screenshots/rescue1.0b.png"> + <img border="0" src="screenshots/rescue1.0b_small.png" width="200" height="150"></a><br> + Rescue Classic look + Rescue Max Look<br> + + <p><b>Download</b>: + <a href="http://sourceforge.net/projects/rescue/files/latest/download">Rescue! Max beta 5</a> + (1.0.4) 3.8MB +<a href="http://sf.net/p/rescue/code/HEAD/tree/Rescue/ChangeLog.txt">Change Log</a> + + <p>Rescue! Max requires java 1.4 or above to run. + <a href="http://www.java.com/en/download/manual.jsp">download java</a><br> + Bugs and suggestions please e-mail to <A HREF="mailto:%79%75%72%61%40%79%75%72%61%2e%6e%65%74">yura@yura.net</A><p> + + + <p><b><u>Anonymous Subversion</u></b></p> + <p>Run the following commands in a directory that you + have write access to (such as your home directory): </p> + + + <code> + svn co https://svn.code.sf.net/p/rescue/code/Rescue + </code> + + <Br><br> + +<a href="http://sf.net/p/rescue/code/">Browse Subversion Repository</a> + + <Br><br> + + Made By Yura Mamyrin<br> + <br> + + </td> + <td valign="top" height="100%"> + + + <p><b><br> + Ideas for new missions (themes):</b><p>Star Trek: Original<br> + Star Trek: The Next Generation<br> + Star Trek: Deep Space Nine<br> + Star Trek: Voyager<br> + Star Trek: Enterprise<br> + The Orville<br> + Star Wars<br> + Red Dwarf<br> + Babylon 5<br> + Crusade (Babylon 5)<br> + Andromeda<br> + Farscape<br> + Lexx<br> + Battlestar Galactica<br> + Buck Rogers<br> + Stargate<p> </td> + </tr> + <tr> + <td> </td> + <td valign="bottom" bgcolor="#FF0000"><img src="images/bl1.gif" width="20" height="60"></td> + <td valign="bottom" bgcolor="#FF0000"><img src="images/bl2.gif" width="30" height="60"></td> + <td align="left" bgcolor="#FF0000"> + + + +<a href="http://sourceforge.net/projects/rescue/"><font color="#000000">Project Page</font></a> + +<a href="http://freshmeat.net/projects/rescue/"><font color="#000000">FM Page</font></a> + +<a href="xml.pdf"><font color="#000000">How to make a mission</font></a> + +<a href="http://yura.net/"><font color="#000000">yura.net</font></a> + + + + </td> + <td align="right" bgcolor="#FF0000"> + + +<a href="http://sourceforge.net/donate/index.php?group_id=134260"><img src="http://images.sourceforge.net/images/project-support.jpg" width="88" height="32" border="0" alt="Support This Project" /></a> + + + +<A href="http://sourceforge.net"><IMG src="http://sourceforge.net/sflogo.php?group_id=134260&type=2" border="0" alt="SourceForge.net Logo" /></A> + + + + </td> + </tr> + <tr> + <td colspan="5"> </td> + </tr> +</table> + + +</body> +</html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2022-08-15 09:44:48
|
Revision: 52 http://sourceforge.net/p/rescue/code/52 Author: yuranet Date: 2022-08-15 09:44:47 +0000 (Mon, 15 Aug 2022) Log Message: ----------- label font fix Modified Paths: -------------- Rescue/src/rescue/panels/ShipsPanel.java Modified: Rescue/src/rescue/panels/ShipsPanel.java =================================================================== --- Rescue/src/rescue/panels/ShipsPanel.java 2022-08-15 09:20:29 UTC (rev 51) +++ Rescue/src/rescue/panels/ShipsPanel.java 2022-08-15 09:44:47 UTC (rev 52) @@ -7,13 +7,9 @@ import javax.swing.JScrollPane; import javax.swing.ListCellRenderer; import javax.swing.JList; -import java.awt.Canvas; import java.awt.Graphics; -import java.awt.Graphics2D; import java.awt.Color; import java.awt.Dimension; -import java.awt.event.MouseEvent; -import java.awt.event.MouseListener; import java.awt.image.BufferedImage; import java.awt.Component; import java.util.Vector; @@ -21,7 +17,6 @@ import java.awt.event.MouseWheelListener; import java.awt.event.MouseWheelEvent; import java.util.Collections; -import java.awt.Point; public class ShipsPanel extends JScrollPane implements MouseWheelListener { @@ -60,7 +55,6 @@ setBorder(null); //refresh(); - } public void mouseWheelMoved(MouseWheelEvent e) { @@ -76,11 +70,9 @@ else { rescue.scrollShips( ((type==1)?true:false) ,false); } - } public void newGame() { - SpaceObjectPanels = new Vector(); theOthers = new Vector(); @@ -96,12 +88,10 @@ if (type==1 && (soAtI instanceof Ship) && soAtI!=player) { SpaceObjectPanels.add( new ShipPanel(soAtI) ); - } else if (type==2 && ((soAtI instanceof Planet)||(soAtI instanceof Base)||(soAtI instanceof Wormhole))) { SpaceObjectPanels.add( new ShipPanel(soAtI) ); - } } @@ -109,11 +99,9 @@ sort = 0; show = 3; - } public void list() { - // YURA:TODO remove dead ships //if ( !rescue.getPause() ) { // no need to sort if game is paused THERE IS A NEED, IF TYPE OF SORT CHANGES @@ -129,7 +117,6 @@ //if (type==1 && show!=3) { } // used to be repaint(); setShow(show); - } public void scroll(boolean up) { @@ -140,37 +127,26 @@ int b = a.getValue(); if (up) { - a.setValue(b-height); - } else { - a.setValue(b+height); - } - } public boolean canScroll(boolean up) { - int b = getVerticalScrollBar().getValue(); //System.out.print(b+"\n"); if (up) { - if (b==0) { return false; } else { return true; } - } else { - if (b==(height*(SpaceObjectPanels.size()-ShipsBox.getVisibleRowCount())) || SpaceObjectPanels.size() < ShipsBox.getVisibleRowCount()) { return false; } else { return true; } - } - } public void setSort(int a) { // will need to resort when bording ship @@ -178,7 +154,6 @@ } public void setShow(int a) { - // YURA:TODO take into account the leval of the sensor scan (and when it changes // YURA:TODO what happens when someones starts to like you? this neds to be updated @@ -212,7 +187,6 @@ ) { tmp.add( theOthers.remove(i) ); i--; redo=true; - } else if (type==2 && (soAtI instanceof Wormhole || scan >= ((MannedObject)soAtI).getCloakPower()) && player.getSystem(5)==0 && @@ -226,9 +200,7 @@ ) { tmp.add( theOthers.remove(i) ); i--; redo=true; - } - } for (int i = 0; i < SpaceObjectPanels.size(); i++) { @@ -253,7 +225,6 @@ ) { theOthers.add( SpaceObjectPanels.remove(i) ); i--; redo=true; - } else if (type==2 && @@ -268,9 +239,7 @@ ) { theOthers.add( SpaceObjectPanels.remove(i) ); i--; redo=true; - } - } if (redo) { @@ -280,9 +249,7 @@ SpaceObjectPanels.addAll(tmp); ShipsBox.revalidate(); - } - } public int getSort() { @@ -294,14 +261,11 @@ } public void clearSelection() { - ShipsBox.clearSelection(); - } class CustomCellRenderer implements ListCellRenderer { public Component getListCellRendererComponent (JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { - ShipPanel component = (ShipPanel)value; if ( component.setSelected(isSelected) ) { @@ -310,7 +274,6 @@ if (isSelected) { rescue.newSelection(type, component.getSO() ); } //component.setCellHasFocus(cellHasFocus); - } return component; @@ -325,7 +288,6 @@ private boolean selected; public ShipPanel (ImageObject so) { - setBackground( Color.BLACK ); mySO = so; @@ -340,14 +302,13 @@ g.setColor( Color.WHITE ); + g.setFont(getFont()); g.drawString( so.getName(), 24,10); g.drawImage(so.getIcon(),2,2,this); - } public void paintComponent(Graphics g) { - super.paintComponent(g); //System.out.print("-"); @@ -361,9 +322,7 @@ g.drawRect(92,17,81,8); g.setColor( Color.GREEN.darker() ); g.fillRect(93,18,(int)(80*(((MannedObject)mySO).getTotalEnergy()/(double)((MannedObject)mySO).getMaxtotalenergy())),7); - } - } public ImageObject getSO() { @@ -376,7 +335,6 @@ selected=a; return true; - } public int compareTo(Object o) { @@ -391,7 +349,6 @@ //if (a<b) return -1; //if (a>b) return 1; //return 0; - } else { // least energy @@ -403,11 +360,7 @@ if ( ((ShipPanel)o).getSO() instanceof MannedObject ) { b = ((MannedObject)(((ShipPanel)o).getSO())).getTotalEnergy(); } return a-b; - } - } - } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2022-08-15 09:20:31
|
Revision: 51 http://sourceforge.net/p/rescue/code/51 Author: yuranet Date: 2022-08-15 09:20:29 +0000 (Mon, 15 Aug 2022) Log Message: ----------- dead startup fix Modified Paths: -------------- Rescue/ChangeLog.txt Rescue/lib/Grasshopper.jar Rescue/src/rescue/RunRescue.java Modified: Rescue/ChangeLog.txt =================================================================== --- Rescue/ChangeLog.txt 2021-05-19 17:18:19 UTC (rev 50) +++ Rescue/ChangeLog.txt 2022-08-15 09:20:29 UTC (rev 51) @@ -1,5 +1,9 @@ Yura Mamyrin (yu...@yu...) +Rescue! Max 1.0.5 + + Grasshopper update (2.9) to fix font loading deadlock on startup + Rescue! Max 1.0.4 fix no sun audio crash on startup Modified: Rescue/lib/Grasshopper.jar =================================================================== (Binary files differ) Modified: Rescue/src/rescue/RunRescue.java =================================================================== --- Rescue/src/rescue/RunRescue.java 2021-05-19 17:18:19 UTC (rev 50) +++ Rescue/src/rescue/RunRescue.java 2022-08-15 09:20:29 UTC (rev 51) @@ -28,7 +28,7 @@ public class RunRescue implements Runnable,IndicatorsListener { // extends Thread public static final String DEFAULT_MISSION = "rescuemax.xml"; - public static final String VERSION = "1.0.4"; + public static final String VERSION = "1.0.5"; public static final String NAME="Rescue! Max"; public static final String KEYMAP_FILENAME = "keys.ini"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2021-05-19 17:18:20
|
Revision: 50 http://sourceforge.net/p/rescue/code/50 Author: yuranet Date: 2021-05-19 17:18:19 +0000 (Wed, 19 May 2021) Log Message: ----------- fallback to another sound system Modified Paths: -------------- Rescue/build.xml Rescue/src/rescue/MissionLoader.java Rescue/src/rescue/RunRescue.java Added Paths: ----------- Rescue/src/rescue/SampledJukeBox.java Property Changed: ---------------- Rescue/ Rescue/nbproject/ Index: Rescue =================================================================== --- Rescue 2020-11-22 01:27:38 UTC (rev 49) +++ Rescue 2021-05-19 17:18:19 UTC (rev 50) Property changes on: Rescue ___________________________________________________________________ Added: svn:ignore ## -0,0 +1,2 ## +build +dist Modified: Rescue/build.xml =================================================================== --- Rescue/build.xml 2020-11-22 01:27:38 UTC (rev 49) +++ Rescue/build.xml 2021-05-19 17:18:19 UTC (rev 50) @@ -10,6 +10,9 @@ to compile the Rescue! Max classes, manual files and to generate distribution files </description> + + <!-- this is needed for running the junit test in netbeans --> + <import file="nbproject/build-impl.xml"/> <property name="dir.build" location="build"/> @@ -51,10 +54,9 @@ <available file="${dir.lobby.dist.client}" property="dir.lobby.dist.client.available"/> - <target name="classes" - description="compiles all the classes" - depends="init"> + <target name="classes" description="compiles all the classes" > + <mkdir dir="${dir.dist}"/> <mkdir dir="${dir.build.classes}"/> <!-- compile the classes --> @@ -336,13 +338,4 @@ </target> - - - <target name="init" - description="Generates all the necessary directories"> - - <mkdir dir="${dir.dist}"/> - </target> - - </project> Index: Rescue/nbproject =================================================================== --- Rescue/nbproject 2020-11-22 01:27:38 UTC (rev 49) +++ Rescue/nbproject 2021-05-19 17:18:19 UTC (rev 50) Property changes on: Rescue/nbproject ___________________________________________________________________ Added: svn:ignore ## -0,0 +1 ## +private Modified: Rescue/src/rescue/MissionLoader.java =================================================================== --- Rescue/src/rescue/MissionLoader.java 2020-11-22 01:27:38 UTC (rev 49) +++ Rescue/src/rescue/MissionLoader.java 2021-05-19 17:18:19 UTC (rev 50) @@ -128,7 +128,14 @@ catch (NoClassDefFoundError err) { System.out.println("seems we do not have class " + err); // create a null jukebox if we cant create a real one - jukebox = new NullJukeBox(); + + try { + jukebox = new SampledJukeBox(); + } + catch (Exception ex) { + System.out.println("seems we can not start SampledJukeBox " + err); + jukebox = new NullJukeBox(); + } } catch(Exception ex) { System.err.println("unable to create jukebox!"); Modified: Rescue/src/rescue/RunRescue.java =================================================================== --- Rescue/src/rescue/RunRescue.java 2020-11-22 01:27:38 UTC (rev 49) +++ Rescue/src/rescue/RunRescue.java 2021-05-19 17:18:19 UTC (rev 50) @@ -1726,6 +1726,7 @@ for (int i = 0; i < selectedObjects.size() ; i++) { + // TODO this item may be removed at the same time from the main game thread a = (int)((MannedObject)selectedObjects.elementAt(i)).distance(playerShip) - ((MannedObject)selectedObjects.elementAt(i)).getSize(); if (a < b) { b=a; p=(MannedObject)selectedObjects.elementAt(i); } @@ -1733,7 +1734,6 @@ } return p; - } public void setSelect(int a) { Added: Rescue/src/rescue/SampledJukeBox.java =================================================================== --- Rescue/src/rescue/SampledJukeBox.java (rev 0) +++ Rescue/src/rescue/SampledJukeBox.java 2021-05-19 17:18:19 UTC (rev 50) @@ -0,0 +1,50 @@ +package rescue; + +import java.net.URL; +import java.util.HashMap; +import java.util.Map; +import javax.sound.sampled.AudioInputStream; +import javax.sound.sampled.AudioSystem; +import javax.sound.sampled.Clip; + +public class SampledJukeBox extends JukeBox { + + Map lopped = new HashMap(); + + public void setUpSound(String type, URL b) { + try { + AudioInputStream audioInputStream = AudioSystem.getAudioInputStream(RescueIO.getInputStream(b)); + Clip clip = AudioSystem.getClip(); + clip.open(audioInputStream); + music.put(type, clip); + lopped.put(clip, Boolean.valueOf(type.equals("music") || type.equals("background"))); + } + catch (Exception ex) { + System.err.println("error loading music ("+type+") file: "+b); + ex.printStackTrace(); + } + } + + public void playSound(String a) { + Object object = music.get(a); + if (object instanceof Clip) { + Clip clip = (Clip)object; + if ( ((Boolean)lopped.get(clip)).booleanValue() ) { + clip.loop(Clip.LOOP_CONTINUOUSLY); + } + else { + clip.stop(); + clip.setFramePosition(0); + clip.start(); + } + } + } + + public void stopSound(String a) { + Object object = music.get(a); + if (object instanceof Clip) { + Clip clip = (Clip)object; + clip.stop(); + } + } +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2020-11-22 01:27:41
|
Revision: 49 http://sourceforge.net/p/rescue/code/49 Author: yuranet Date: 2020-11-22 01:27:38 +0000 (Sun, 22 Nov 2020) Log Message: ----------- remove empty lines and test email notification Modified Paths: -------------- Rescue/src/rescue/gui/MissionSetup.java Modified: Rescue/src/rescue/gui/MissionSetup.java =================================================================== --- Rescue/src/rescue/gui/MissionSetup.java 2020-11-21 21:01:12 UTC (rev 48) +++ Rescue/src/rescue/gui/MissionSetup.java 2020-11-22 01:27:38 UTC (rev 49) @@ -141,17 +141,11 @@ }); missionsBox.addItemListener(new ItemListener() { - public void itemStateChanged(ItemEvent e) { - if (e.getStateChange()==ItemEvent.SELECTED) { - loadMission((MissionLoader)e.getItem()); - } - } - }); @@ -472,7 +466,6 @@ } public void addLabel(String a, Box b) { - FlowLayout f = new FlowLayout( FlowLayout.LEADING ); f.setHgap(20); JPanel p = new JPanel( f ); @@ -495,23 +488,14 @@ // Write your code here what to do with selected file try { - setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); - loadMission( new MissionLoader(rescue, file.getParentFile().toURI().toURL(), file.getName()) ); - setCursor(Cursor.getPredefinedCursor(Cursor.DEFAULT_CURSOR)); - } catch(Exception a) { - JOptionPane.showMessageDialog(null, "Error Loading Mission File: "+file.getName()+".\n"+a.getMessage(), "Load error!", JOptionPane.ERROR_MESSAGE ); - } - } - - } else if (e.getActionCommand().equals("cancel")) { closeDialog(null); @@ -519,7 +503,6 @@ else if (e.getActionCommand().equals("ok")) { if (rescue!=null) { - for (int c=0; c < changlings.size() ;c++) { ((missionObjectPanel)changlings.get(c)).ok(); @@ -527,10 +510,8 @@ } currentMission.setCluster( clusterSimilarTypes.isSelected() ); rescue.setMission(currentMission); - } else { - StringBuffer buffer = new StringBuffer(); buffer.append(currentMission.getXMLFileName()); @@ -545,20 +526,13 @@ buffer.append(clusterSimilarTypes.isSelected()); newGameOptions = buffer.toString(); - } closeDialog(null); - } - - - else if (e.getActionCommand().equals("cadet")) { for (int c=0; c < changlings.size() ;c++) { - ((missionObjectPanel)changlings.get(c)).setCurrentPreset(1); - } repaint(); @@ -566,9 +540,7 @@ else if (e.getActionCommand().equals("lieutenant")) { for (int c=0; c < changlings.size() ;c++) { - ((missionObjectPanel)changlings.get(c)).setCurrentPreset(2); - } repaint(); } @@ -575,9 +547,7 @@ else if (e.getActionCommand().equals("captain")) { for (int c=0; c < changlings.size() ;c++) { - ((missionObjectPanel)changlings.get(c)).setCurrentPreset(3); - } repaint(); } @@ -584,9 +554,7 @@ else if (e.getActionCommand().equals("admiral")) { for (int c=0; c < changlings.size() ;c++) { - ((missionObjectPanel)changlings.get(c)).setCurrentPreset(4); - } repaint(); } @@ -603,11 +571,8 @@ } public void setVisible(boolean a) { - if (a) { - newGameOptions = null; - } super.setVisible(a); } @@ -632,8 +597,6 @@ else if (r==8) { cnt1=cnt1+r; } else { cnt1=cnt1+r; tot1++; } // if (r<10) //else { r=r-10; cnt2=cnt2+r; tot2++; } - - } rank1 = cnt1/tot1; // average score for the num of enemes chosen This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2020-11-21 21:01:13
|
Revision: 48 http://sourceforge.net/p/rescue/code/48 Author: yuranet Date: 2020-11-21 21:01:12 +0000 (Sat, 21 Nov 2020) Log Message: ----------- webpage added to version control Added Paths: ----------- Rescue/website/ Rescue/website/index.htm Added: Rescue/website/index.htm =================================================================== --- Rescue/website/index.htm (rev 0) +++ Rescue/website/index.htm 2020-11-21 21:01:12 UTC (rev 48) @@ -0,0 +1,145 @@ +<html> + +<head> +<title>Rescue! Max</title> +</head> + +<body bgcolor="#000000" text="#FF0000" topmargin="0" leftmargin="0" link="#FFFF00" vlink="#FFFF00" alink="#FFFF00"> + +<table border="0" cellpadding="0" cellspacing="0" width="100%" height="100%"> + <tr> + <td> </td> + <td bgcolor="#FF0000"> </td> + <td> </td> + <td align="center" valign="top" width="100%" colspan="2"> + <center> + + <table border="0" cellpadding="0" cellspacing="0" style="border-collapse: collapse"> + <tr> + <td align="right" valign="bottom"> + <img src="images/bantoplt.gif" width="30" height="16"></td> + <td></td> + <td valign="bottom"> + <img src="images/bantoprt.gif" width="30" height="16"></td> + </tr> + <tr> + <td align="right" valign="top"> + <img src="images/banbonlt.gif" width="30" height="60"></td> + <td align="center" bgcolor="#FFFF00"> + <font size="7" color="#000000">Rescue! Max</font></td> + <td valign="top"> + <img src="images/banbonrt.gif" width="30" height="60"></td> + </tr> + </table> + + </center> + </td> + </tr> + <tr> + <td> </td> + <td bgcolor="#FF0000"> </td> + <td valign="bottom"><img src="images/bl3.gif" width="30" height="60"></td> + <td valign="top" height="100%"><br> + + + + Rescue Max is a Action Adventure in Space written in java.<br> + It is based on a old mac game called Rescue! by Tom Spreen.<br> + <br> + Screenshots:<br> + <a href="screenshots/rescue1.0a.png"> + <img border="0" src="screenshots/rescue1.0a_small.png" width="200" height="150"></a> + <a href="screenshots/rescue1.0b.png"> + <img border="0" src="screenshots/rescue1.0b_small.png" width="200" height="150"></a><br> + Rescue Classic look + Rescue Max Look<br> + + <p><b>Download</b>: + <a href="http://sourceforge.net/projects/rescue/files/latest/download">Rescue! Max beta 4</a> + (1.0.4) 3.8MB + + + <p>Rescue! Max requires java 1.4 or above to run. + <a href="http://www.java.com/en/download/manual.jsp">download java</a><br> + Bugs and suggestions please e-mail to <A HREF="mailto:%79%75%72%61%40%79%75%72%61%2e%6e%65%74">yura@yura.net</A><p> + + + <p><b><u>Anonymous Subversion</u></b></p> + <p>Run the following commands in a directory that you + have write access to (such as your home directory): </p> + + + <code> + svn co https://svn.code.sf.net/p/rescue/code/Rescue + </code> + + <Br><br> + +<a href="http://sf.net/p/rescue/code/">Browse Subversion Repository</a> + + <Br><br> + + Made By Yura Mamyrin<br> + <br> + + </td> + <td valign="top" height="100%"> + + + <p><b><br> + Ideas for new missions (themes):</b><p>Star Trek: Original<br> + Star Trek: The Next Generation<br> + Star Trek: Deep Space Nine<br> + Star Trek: Voyager<br> + Star Trek: Enterprise <br> + Star Wars<br> + Red Dwarf<br> + Babylon 5<br> + Crusade (Babylon 5)<br> + Andromeda<br> + Farscape<br> + Lexx<br> + Battlestar Galactica<br> + Buck Rogers<br> + Stargate<p> </td> + </tr> + <tr> + <td> </td> + <td valign="bottom" bgcolor="#FF0000"><img src="images/bl1.gif" width="20" height="60"></td> + <td valign="bottom" bgcolor="#FF0000"><img src="images/bl2.gif" width="30" height="60"></td> + <td align="left" bgcolor="#FF0000"> + + + +<a href="http://sourceforge.net/projects/rescue/"><font color="#000000">Project Page</font></a> + +<a href="http://freshmeat.net/projects/rescue/"><font color="#000000">FM Page</font></a> + +<a href="xml.pdf"><font color="#000000">How to make a mission</font></a> + +<a href="http://yura.net/"><font color="#000000">yura.net</font></a> + + + + </td> + <td align="right" bgcolor="#FF0000"> + + +<a href="http://sourceforge.net/donate/index.php?group_id=134260"><img src="http://images.sourceforge.net/images/project-support.jpg" width="88" height="32" border="0" alt="Support This Project" /></a> + + + +<A href="http://sourceforge.net"><IMG src="http://sourceforge.net/sflogo.php?group_id=134260&type=2" border="0" alt="SourceForge.net Logo" /></A> + + + + </td> + </tr> + <tr> + <td colspan="5"> </td> + </tr> +</table> + + +</body> +</html> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2020-11-21 20:51:08
|
Revision: 47 http://sourceforge.net/p/rescue/code/47 Author: yuranet Date: 2020-11-21 20:51:06 +0000 (Sat, 21 Nov 2020) Log Message: ----------- fix crash on no row selected in keyboard screen Modified Paths: -------------- Rescue/ChangeLog.txt Rescue/lib/Grasshopper.jar Rescue/src/rescue/RunRescue.java Rescue/src/rescue/gui/PrefDialog.java Modified: Rescue/ChangeLog.txt =================================================================== --- Rescue/ChangeLog.txt 2020-11-21 20:26:53 UTC (rev 46) +++ Rescue/ChangeLog.txt 2020-11-21 20:51:06 UTC (rev 47) @@ -1,5 +1,11 @@ Yura Mamyrin (yu...@yu...) +Rescue! Max 1.0.4 + + fix no sun audio crash on startup + fix huge fonts on JDK-13 Linux/GTKTheme hi-res screens + fix crash on no row selected in keyboard shortcut screen + Rescue! Max 1.0.0.3 added preview to setup screen Modified: Rescue/lib/Grasshopper.jar =================================================================== (Binary files differ) Modified: Rescue/src/rescue/RunRescue.java =================================================================== --- Rescue/src/rescue/RunRescue.java 2020-11-21 20:26:53 UTC (rev 46) +++ Rescue/src/rescue/RunRescue.java 2020-11-21 20:51:06 UTC (rev 47) @@ -28,7 +28,7 @@ public class RunRescue implements Runnable,IndicatorsListener { // extends Thread public static final String DEFAULT_MISSION = "rescuemax.xml"; - public static final String VERSION = "1.0.0.4"; + public static final String VERSION = "1.0.4"; public static final String NAME="Rescue! Max"; public static final String KEYMAP_FILENAME = "keys.ini"; Modified: Rescue/src/rescue/gui/PrefDialog.java =================================================================== --- Rescue/src/rescue/gui/PrefDialog.java 2020-11-21 20:26:53 UTC (rev 46) +++ Rescue/src/rescue/gui/PrefDialog.java 2020-11-21 20:51:06 UTC (rev 47) @@ -1,37 +1,23 @@ package rescue.gui; import rescue.*; - -import java.util.Vector; - -import java.awt.GridBagLayout; -import java.awt.GridBagConstraints; -import java.awt.Insets; import javax.swing.JPanel; import javax.swing.JLabel; import javax.swing.JButton; -import javax.swing.JTextArea; -import javax.swing.BorderFactory; import javax.swing.JDialog; import java.awt.Frame; -import java.awt.Rectangle; import java.awt.BorderLayout; -import java.awt.FlowLayout; import java.awt.event.WindowEvent; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.JCheckBox; import javax.swing.JSpinner; - import javax.swing.table.AbstractTableModel; import javax.swing.Action; import javax.swing.JScrollPane; import javax.swing.JTable; -import javax.swing.BoxLayout; - import java.beans.PropertyChangeListener; import java.beans.PropertyChangeEvent; - import java.net.URL; import java.io.FileOutputStream; import java.io.File; @@ -41,8 +27,6 @@ * <p> About Dialog </p> * @author Yura Mamyrin */ - - public class PrefDialog extends JDialog implements ActionListener,PropertyChangeListener { private static final String TEMP_ACCELERATOR_KEY = "TEMP_AcceleratorKey"; @@ -53,6 +37,8 @@ private JSpinner delay; private Keymap keymap; + private JTable table; + public PrefDialog(Frame parent, boolean modal, RunRescue r, RescueGUI g, Keymap km) { super(parent,"Preferences", modal); @@ -147,7 +133,6 @@ try { // in java 1.5 use toURI() instead of getFile() Keymap.saveKeys(actions, new FileOutputStream( new File(new URL(rescue.getMissionsRootURL() ,RunRescue.KEYMAP_FILENAME).getFile() ) ) ); - } catch(Exception ex) { System.out.println("unable to save keys: "+ex); @@ -158,23 +143,22 @@ else if (e.getActionCommand().equals("change")) { Action action = getCurrentAction(); - action.addPropertyChangeListener(this); - keymap.setupKeyForAction(action, TEMP_ACCELERATOR_KEY ); - + if (action != null) { + action.addPropertyChangeListener(this); + keymap.setupKeyForAction(action, TEMP_ACCELERATOR_KEY ); + } } else if (e.getActionCommand().equals("clear")) { Action action = getCurrentAction(); - action.putValue( TEMP_ACCELERATOR_KEY , null ); - repaint(); - + if (action != null) { + action.putValue( TEMP_ACCELERATOR_KEY , null ); + repaint(); + } } else if (e.getActionCommand().equals("cancel")) { - closeDialog(); - } - } public void propertyChange(PropertyChangeEvent evt) { @@ -197,7 +181,8 @@ } private Action getCurrentAction() { - return (Action)rescue.getActions().get( table.getSelectedRow() ); + int selectedRow = table.getSelectedRow(); + return selectedRow < 0 ? null : (Action)rescue.getActions().get(selectedRow); } /** Closes the dialog */ @@ -212,7 +197,6 @@ dispose(); } - private JTable table; private JScrollPane makeKeyTable() { List actions = rescue.getActions(); @@ -231,7 +215,6 @@ } public int getRowCount() { - return rescue.getActions().size(); } @@ -244,16 +227,12 @@ Action action = (Action)rescue.getActions().get(row); switch(col) { - case 0: return action.getValue( Action.NAME ); case 1: return action.getValue( Action.ACTION_COMMAND_KEY ); case 2: return action.getValue( TEMP_ACCELERATOR_KEY ); default: throw new RuntimeException(); - } - } - }; table = new JTable(tableModel); @@ -261,8 +240,5 @@ table.setSelectionMode(javax.swing.ListSelectionModel.SINGLE_SELECTION); return new JScrollPane(table); - - } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2020-11-21 20:27:01
|
Revision: 46 http://sourceforge.net/p/rescue/code/46 Author: yuranet Date: 2020-11-21 20:26:53 +0000 (Sat, 21 Nov 2020) Log Message: ----------- fix to work on hi-res Linux Modified Paths: -------------- Rescue/src/rescue/gui/MissionSetup.java Rescue/src/rescue/gui/RescueGUI.java Modified: Rescue/src/rescue/gui/MissionSetup.java =================================================================== --- Rescue/src/rescue/gui/MissionSetup.java 2020-11-16 23:24:53 UTC (rev 45) +++ Rescue/src/rescue/gui/MissionSetup.java 2020-11-21 20:26:53 UTC (rev 46) @@ -6,17 +6,14 @@ import java.awt.Cursor; import java.awt.GridBagLayout; import java.awt.GridBagConstraints; -import java.awt.Insets; import javax.swing.JPanel; import javax.swing.JLabel; import javax.swing.JButton; import javax.swing.JTextArea; -import javax.swing.BorderFactory; import javax.swing.JDialog; import java.awt.Frame; -import java.awt.Rectangle; import java.awt.BorderLayout; -import java.awt.FlowLayout; +import java.awt.Color; import java.awt.event.WindowEvent; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -28,12 +25,10 @@ import javax.swing.JOptionPane; import javax.swing.JSlider; import javax.swing.JCheckBox; -import java.util.Vector; import java.awt.Graphics; import java.awt.Dimension; import javax.swing.event.ChangeListener; import javax.swing.event.ChangeEvent; -import javax.swing.BoxLayout; import java.awt.FlowLayout; import java.awt.Font; import java.awt.image.BufferedImage; @@ -44,13 +39,12 @@ import javax.swing.JList; import java.awt.Component; import java.awt.event.ItemEvent; +import java.util.List; /** * <p> Mission Dialog </p> * @author Yura Mamyrin */ - - public class MissionSetup extends JDialog implements ActionListener { private JPanel mainPanel; @@ -60,7 +54,7 @@ private JRadioButton custom; private Box thebox; private JCheckBox clusterSimilarTypes; - private Vector changlings; + private List changlings; private JLabel missionRank; private String newGameOptions; @@ -76,7 +70,6 @@ initGUI(); getContentPane().add(mainPanel); - } // use this constructor if you already have a mission loaded! @@ -117,15 +110,11 @@ //###################################################################### TOP end if (missions==null) { - loadMission( rescue.getMission() ); - } else { - loadMissions(r.getMissionsRootURL(),missions); } - } public JPanel makeDropDownTopPanel() { @@ -173,7 +162,6 @@ public void loadMissions(final URL base, final String options) { - new Thread() { public void run() { @@ -202,9 +190,6 @@ } }.start(); - - - } @@ -392,7 +377,6 @@ gbc.gridy = 1; // row gbc.gridwidth = 1; // width gbc.gridheight = 1; // height - } public void loadMission(MissionLoader a) { @@ -410,18 +394,18 @@ missionName.setText( currentMission.getMissionName() ); } - Vector v = currentMission.getMissionObjects(); + List v = currentMission.getMissionObjects(); missionObjectPanel mop; - Vector allies = new Vector(); - Vector enemies = new Vector(); - Vector nutral = new Vector(); + List allies = new java.util.Vector(); + List enemies = new java.util.Vector(); + List nutral = new java.util.Vector(); String po = ((MissionObject)currentMission.getPlayerObject()).getName(); for(int i=0; i< v.size() ; i++) { - MissionObject cmo = (MissionObject)v.elementAt(i); + MissionObject cmo = (MissionObject)v.get(i); if (cmo.getMin() != cmo.getMax()) { @@ -430,9 +414,7 @@ if (cmo.isAllies(po)) { allies.add(mop); } else if (cmo.isEnemies(po)) { enemies.add(mop); } else { nutral.add(mop); } - } - } @@ -443,9 +425,8 @@ addLabel("ALLIES",missionSetupBox); for(int i=0; i< allies.size() ; i++) { - missionSetupBox.add( (JPanel)allies.elementAt(i) ); + missionSetupBox.add( (JPanel)allies.get(i) ); } - } if (enemies.size() > 0) { @@ -452,7 +433,7 @@ addLabel("ENEMIES",missionSetupBox); for(int i=0; i< enemies.size() ; i++) { - missionSetupBox.add( (JPanel)enemies.elementAt(i) ); + missionSetupBox.add( (JPanel)enemies.get(i) ); } } if (nutral.size() > 0) { @@ -460,7 +441,7 @@ addLabel("NEUTRAL",missionSetupBox); for(int i=0; i< nutral.size() ; i++) { - missionSetupBox.add( (JPanel)nutral.elementAt(i) ); + missionSetupBox.add( (JPanel)nutral.get(i) ); } } @@ -488,7 +469,6 @@ changlings.addAll(nutral); checkMissionRank(); - } public void addLabel(String a, Box b) { @@ -498,7 +478,6 @@ JPanel p = new JPanel( f ); p.add( new JLabel( "<html><u>" +a+ "</u></html>" ) ); b.add(p); - } public void actionPerformed(ActionEvent e) { @@ -535,9 +514,7 @@ } else if (e.getActionCommand().equals("cancel")) { - closeDialog(null); - } else if (e.getActionCommand().equals("ok")) { @@ -545,7 +522,7 @@ for (int c=0; c < changlings.size() ;c++) { - ((missionObjectPanel)changlings.elementAt(c)).ok(); + ((missionObjectPanel)changlings.get(c)).ok(); } currentMission.setCluster( clusterSimilarTypes.isSelected() ); @@ -561,7 +538,7 @@ for (int c=0; c < changlings.size() ;c++) { - buffer.append( ((missionObjectPanel)changlings.elementAt(c)).getValue() ); + buffer.append( ((missionObjectPanel)changlings.get(c)).getValue() ); buffer.append((c==changlings.size()-1)?("\n"):(",")); } @@ -580,46 +557,39 @@ for (int c=0; c < changlings.size() ;c++) { - ((missionObjectPanel)changlings.elementAt(c)).setCurrentPreset(1); + ((missionObjectPanel)changlings.get(c)).setCurrentPreset(1); } repaint(); - } else if (e.getActionCommand().equals("lieutenant")) { for (int c=0; c < changlings.size() ;c++) { - ((missionObjectPanel)changlings.elementAt(c)).setCurrentPreset(2); + ((missionObjectPanel)changlings.get(c)).setCurrentPreset(2); } repaint(); - } else if (e.getActionCommand().equals("captain")) { for (int c=0; c < changlings.size() ;c++) { - ((missionObjectPanel)changlings.elementAt(c)).setCurrentPreset(3); + ((missionObjectPanel)changlings.get(c)).setCurrentPreset(3); } repaint(); - } else if (e.getActionCommand().equals("admiral")) { for (int c=0; c < changlings.size() ;c++) { - ((missionObjectPanel)changlings.elementAt(c)).setCurrentPreset(4); + ((missionObjectPanel)changlings.get(c)).setCurrentPreset(4); } repaint(); - } - - - } /** Closes the dialog */ @@ -629,9 +599,7 @@ } public String getNewGameOptions() { - return newGameOptions; - } public void setVisible(boolean a) { @@ -658,7 +626,7 @@ for (int c=0; c < changlings.size() ;c++) { - int r = ((missionObjectPanel)changlings.elementAt(c)).getCurrentRank(po); + int r = ((missionObjectPanel)changlings.get(c)).getCurrentRank(po); if (r==-1) {} else if (r==8) { cnt1=cnt1+r; } @@ -685,7 +653,6 @@ else { missionRank.setText("Mission Rank: Admiral"); } - } class missionObjectPanel extends JPanel { @@ -765,9 +732,10 @@ note.setFocusable(false); + note.setBackground(new Color(0, true)); // for nimbus + note.setBorder(null); // for nimbus + add(note); - - } public void paintComponent(Graphics g) { @@ -781,13 +749,10 @@ g.drawString(value+"" ,185,20); g.drawImage(icon,0,5,this); - } public void ok() { - myMO.setNumber( value ); - } public int getValue() { @@ -795,16 +760,11 @@ } public void setCurrentPreset(int a) { - value = myMO.getCurrentPreset(a); - } public int getCurrentRank(String p) { - return myMO.getCurrentRank(p,value); - } - } } Modified: Rescue/src/rescue/gui/RescueGUI.java =================================================================== --- Rescue/src/rescue/gui/RescueGUI.java 2020-11-16 23:24:53 UTC (rev 45) +++ Rescue/src/rescue/gui/RescueGUI.java 2020-11-21 20:26:53 UTC (rev 46) @@ -7,7 +7,6 @@ import java.awt.Frame; import java.awt.GraphicsEnvironment; import java.awt.Image; -import java.awt.Insets; import java.awt.Rectangle; import java.awt.Toolkit; import java.awt.Window; @@ -15,8 +14,9 @@ import java.awt.event.ActionListener; import java.awt.event.KeyEvent; import java.awt.event.WindowEvent; +import java.awt.geom.AffineTransform; import java.io.File; -import java.util.Vector; +import java.util.List; import javax.swing.ImageIcon; import javax.swing.JButton; import javax.swing.JDesktopPane; @@ -37,16 +37,15 @@ * <p> Rescue GUI </p> * @author Yura Mamyrin */ - public class RescueGUI extends JPanel implements ActionListener, RescueListener, Runnable { private RunRescue rescue; private Component bigmap; - private Vector panels; + private List panels; private Component[] inGameMenus; private Component[] outGameMenus; - private Vector Windows; + private List Windows; private JDesktopPane desktop; private JMenu windowsMenu; @@ -146,23 +145,20 @@ for(int i=0; i< inGameMenus.length ; i++) { inGameMenus[i].setEnabled(false); } - } public Image getIcon() { - return icon; - } public void newGame(MissionLoader cm) { - Vector w = cm.getWindows(); + List w = cm.getWindows(); bigmap = cm.getBigMap(); panels = cm.getPanels(); - Windows = new Vector(); + Windows = new java.util.Vector(); String name; JMenuItem menuItem; @@ -171,7 +167,7 @@ for(int i=0; i< w.size() ; i++) { Component frame; - ContainerPanel containerPanel = (ContainerPanel)w.elementAt(i); + ContainerPanel containerPanel = (ContainerPanel)w.get(i); name = containerPanel.getName(); if ( rescue.getMode() ) { @@ -257,7 +253,7 @@ for(int i=0; i< Windows.size() ; i++) { - a = ((Window)Windows.elementAt(i)); + a = ((Window)Windows.get(i)); a.setVisible(true); @@ -265,7 +261,6 @@ // does not work at the beggining of the game findParentFrame(this).setVisible(false); - } else { @@ -288,12 +283,11 @@ for(int i=0; i< outGameMenus.length ; i++) { outGameMenus[i].setEnabled(false); } - } repaint(); + } - } public void closeGame() { if ( rescue.getMode() ) { @@ -300,8 +294,8 @@ for(int i=0; i< Windows.size() ; i++) { - ((Window)Windows.elementAt(i)).setVisible(false); - ((Window)Windows.elementAt(i)).dispose(); + ((Window)Windows.get(i)).setVisible(false); + ((Window)Windows.get(i)).dispose(); } @@ -312,9 +306,9 @@ for(int i=0; i< Windows.size() ; i++) { - ((SFrame)Windows.elementAt(i)).dispose(); + ((SFrame)Windows.get(i)).dispose(); - desktop.remove( ((SFrame)Windows.elementAt(i)) ); + desktop.remove( ((SFrame)Windows.get(i)) ); } @@ -326,16 +320,13 @@ for(int i=0; i< outGameMenus.length ; i++) { outGameMenus[i].setEnabled(true); } - } Windows = null; bigmap = null; - } public void dead() { - new Thread(this).start(); } @@ -349,7 +340,7 @@ Frame frame; if ( rescue.getMode() ) { - frame = (Frame)Windows.elementAt(0); + frame = (Frame)Windows.get(0); } else { frame = findParentFrame(this); @@ -358,7 +349,6 @@ JOptionPane.showMessageDialog(frame, "You are dead!" , "Dead", JOptionPane.PLAIN_MESSAGE ); rescue.closeCurrentMission(); - } // YURA: This method ONLY works when mode is FALSE @@ -368,15 +358,13 @@ for(int i=0; i< Windows.size() ; i++) { - a = ((SFrame)Windows.elementAt(i)); + a = ((SFrame)Windows.get(i)); a.setLocation( a.getPreferredLocation() ); a.setSize( a.getPreferredSize() ); a.setVisible(true); try { a.setIcon( false ); } catch (Exception e) {} - } - } protected JMenuBar createMenuBar() { @@ -804,7 +792,7 @@ if (counter>=10 || rescue.getPause() ) { for(int i=0; i< panels.size() ; i++) { - ((Component)panels.elementAt(i)).list(); + ((Component)panels.get(i)).list(); } counter=0; } @@ -817,7 +805,6 @@ counter=0; } - } public void actionPerformed(ActionEvent e) { @@ -894,11 +881,10 @@ int i = Integer.parseInt( e.getActionCommand().substring(7) ); - ((SFrame)Windows.elementAt(i)).setVisible(true); - try { ((SFrame)Windows.elementAt(i)).setIcon( false ); ((SFrame)Windows.elementAt(i)).setSelected(true); } catch (Exception a) {} + ((SFrame)Windows.get(i)).setVisible(true); + try { ((SFrame)Windows.get(i)).setIcon( false ); ((SFrame)Windows.get(i)).setSelected(true); } catch (Exception a) {} return; - } else { @@ -905,7 +891,6 @@ System.out.print("unknown command "+e.getActionCommand()+"\n"); return; } - } /** @@ -940,7 +925,16 @@ } */ - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + String systemLookAndFeel = UIManager.getSystemLookAndFeelClassName(); + AffineTransform dat = GraphicsEnvironment.getLocalGraphicsEnvironment().getDefaultScreenDevice().getDefaultConfiguration().getDefaultTransform(); + + // the system (gtk) theme on linux is broken with hi res screens (fonts are HUGE) + if (dat.getScaleX() != 1.0 && "com.sun.java.swing.plaf.gtk.GTKLookAndFeel".equals(systemLookAndFeel)) { + UIManager.setLookAndFeel("javax.swing.plaf.nimbus.NimbusLookAndFeel"); + } + else { + UIManager.setLookAndFeel(systemLookAndFeel); + } } catch (Exception e) { e.printStackTrace(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2020-11-16 23:24:59
|
Revision: 45 http://sourceforge.net/p/rescue/code/45 Author: yuranet Date: 2020-11-16 23:24:53 +0000 (Mon, 16 Nov 2020) Log Message: ----------- version bump Modified Paths: -------------- Rescue/src/rescue/RunRescue.java Modified: Rescue/src/rescue/RunRescue.java =================================================================== --- Rescue/src/rescue/RunRescue.java 2020-11-16 23:19:54 UTC (rev 44) +++ Rescue/src/rescue/RunRescue.java 2020-11-16 23:24:53 UTC (rev 45) @@ -28,7 +28,7 @@ public class RunRescue implements Runnable,IndicatorsListener { // extends Thread public static final String DEFAULT_MISSION = "rescuemax.xml"; - public static final String VERSION = "1.0.0.3"; + public static final String VERSION = "1.0.0.4"; public static final String NAME="Rescue! Max"; public static final String KEYMAP_FILENAME = "keys.ini"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2020-11-16 23:19:56
|
Revision: 44 http://sourceforge.net/p/rescue/code/44 Author: yuranet Date: 2020-11-16 23:19:54 +0000 (Mon, 16 Nov 2020) Log Message: ----------- fix to be able to run if no sun audio Modified Paths: -------------- Rescue/src/rescue/MissionLoader.java Modified: Rescue/src/rescue/MissionLoader.java =================================================================== --- Rescue/src/rescue/MissionLoader.java 2013-09-16 23:25:16 UTC (rev 43) +++ Rescue/src/rescue/MissionLoader.java 2020-11-16 23:19:54 UTC (rev 44) @@ -2,15 +2,9 @@ import rescue.panels.*; import rescue.spaceobjects.*; - import rescue.qdxml.DocHandler; import rescue.qdxml.QDParser; - import java.util.Hashtable; -import java.util.Enumeration; - -import java.io.FileReader; -import java.io.File; import java.util.Vector; import java.awt.Component; import java.awt.Dimension; @@ -21,7 +15,6 @@ import java.awt.Color; import java.net.URL; import java.io.InputStreamReader; - import javax.swing.Icon; import javax.swing.ImageIcon; import javax.imageio.ImageIO; @@ -74,22 +67,16 @@ MissionObjects = new Vector(); readXML(true); - } private void readXML(boolean l) throws Exception { - loadSO = l; - InputStreamReader isr = new InputStreamReader(RescueIO.getInputStream(new URL(path,XMLFile))); QDParser.parse(this,isr); isr.close(); - - } public String getXMLFileName() { - return XMLFile; } @@ -108,26 +95,25 @@ } return previewIcon; - } public void loadImagesForSetup() { - for(int i=0; i< MissionObjects.size() ; i++) { - try { - ((MissionObject)MissionObjects.get(i)).loadImagesForSetup(); - } catch(Exception ex) { - ex.printStackTrace(); - } } + } + + class NullJukeBox extends JukeBox { + public void setUpSound(String a, URL b) { } + public void playSound(String a) { } + public void stopSound(String a) { } + } - } public void loadImagesForGame() { if (MissionWindows==null) { @@ -137,25 +123,18 @@ loadImagesForSetup(); try { - jukebox = new SunAudioJukeBox(); } + catch (NoClassDefFoundError err) { + System.out.println("seems we do not have class " + err); + // create a null jukebox if we cant create a real one + jukebox = new NullJukeBox(); + } catch(Exception ex) { - System.err.println("unable to create jukebox!"); ex.printStackTrace(); - // create a null jukebox if we cant create a real one - jukebox = new JukeBox() { - - public void setUpSound(String a, URL b) { } - - public void playSound(String a) { } - - public void stopSound(String a) { } - - }; - + jukebox = new NullJukeBox(); } MissionWindows = new Vector(); @@ -163,35 +142,25 @@ panels = new Vector(); for(int i=0; i< MissionObjects.size() ; i++) { - try { - ((MissionObject)MissionObjects.get(i)).loadImagesForGame(); - } catch(Exception ex) { - ex.printStackTrace(); - } } try { - // load gui images at this point! readXML(false); } catch(Exception ex) { - ex.printStackTrace(); - } } - } public String toString() { - return missionName; } @@ -226,7 +195,6 @@ jukebox.load(); return v; - } public boolean getExternal() { @@ -548,5 +516,4 @@ throw new Exception("unknown color "+s); } - } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2013-09-16 23:25:19
|
Revision: 43 http://sourceforge.net/p/rescue/code/43 Author: yuranet Date: 2013-09-16 23:25:16 +0000 (Mon, 16 Sep 2013) Log Message: ----------- do not leave game in unstable state Modified Paths: -------------- Rescue/src/rescue/gui/RescueGUI.java Rescue/todo.txt Modified: Rescue/src/rescue/gui/RescueGUI.java =================================================================== --- Rescue/src/rescue/gui/RescueGUI.java 2013-09-16 23:11:00 UTC (rev 42) +++ Rescue/src/rescue/gui/RescueGUI.java 2013-09-16 23:25:16 UTC (rev 43) @@ -183,7 +183,7 @@ main = new JFrame(name); // YURA:TODO while i still have not fixed the resizing - //main.setResizable(false); + main.setResizable(false); main.setIconImage( icon ); sframe = main; @@ -196,7 +196,7 @@ sframe = new JDialog(main,name); // YURA:TODO while i still have not fixed the resizing - //((JDialog)sframe).setResizable(false); + ((JDialog)sframe).setResizable(false); ((JDialog)sframe).setContentPane( containerPanel ); @@ -226,7 +226,7 @@ sframe.pack(); // YURA:TODO while i still have not fixed the resizing - //sframe.setResizable(false); + sframe.setResizable(false); sframe.setDefaultCloseOperation(javax.swing.WindowConstants.HIDE_ON_CLOSE); sframe.setFrameIcon( new ImageIcon(icon) ); Modified: Rescue/todo.txt =================================================================== --- Rescue/todo.txt 2013-09-16 23:11:00 UTC (rev 42) +++ Rescue/todo.txt 2013-09-16 23:25:16 UTC (rev 43) @@ -1,7 +1,5 @@ TODO: -windows can resize, but look broken if resized! - when quit game then crash, coz this not being done: cc=255; pp=255; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2013-09-16 23:11:02
|
Revision: 42 http://sourceforge.net/p/rescue/code/42 Author: yuranet Date: 2013-09-16 23:11:00 +0000 (Mon, 16 Sep 2013) Log Message: ----------- todo update Modified Paths: -------------- Rescue/build.xml Added Paths: ----------- Rescue/todo.txt Removed Paths: ------------- Rescue/bugs.txt Deleted: Rescue/bugs.txt =================================================================== --- Rescue/bugs.txt 2013-09-16 22:39:15 UTC (rev 41) +++ Rescue/bugs.txt 2013-09-16 23:11:00 UTC (rev 42) @@ -1,213 +0,0 @@ -TODO: - -when quit game then crash, coz this not being done: -cc=255; -pp=255; -tt=255; -return; - - - add a paramiter that indicates how lickely someone is going to change there mind as to who they like - so if it is 0, then they will never change there mind as to who they like - if it is 10, then they will like anyone who helps them in any possible way - make sure u hate the ship that shots u , even if u dont hate there race - - smoke to broken ship - odd blue crap to wormholes - all systems damaged means ship is dead? - add sound on and off options - score system - keyboard shortcuts - - make energy bars not flicker - fix error with condition being on same panel as end game button - make it when computer down no ships lists can be used, make sheild damage actually work (in the info) - make the engery work properly, when lots of systems are damaged you can not make a lot of energy (warp core broken cant make energy) (and make it less hard to kill a last bit of a dieing ship) - make auto-on shields work, and auto select neerest ememy (sort out the selection system) - improve ship AI, make them fly in groups and stuff, make bad ships go to bady base - check that the systems to shoot are working, The base must be much stronger then it is now - make it store number of people rescued and they r the ones that r killed when badys shoot the planets (not the planet) - - make it so that when cloak is on u cant see the ships, and they cant use the weapons - make the resizing of panels work - make warp choose fastest way to destination - make comunication work (and destress signal) - make it work in linux - make sounds work - - buttons to add: - X EndGame (not really needed as you can just click on X) - X pref - X high score - Quit - Interface Help - About Interface - X Auto-Shields ? auto select neerest enemy (select all badys still ok) - X Auto-Destruct - Comunicate - Send Distress Signal - -BUGS: - - game sometimes stops refreshing the GUI (but game continues) (like the gif resolution bug) - game crashes when you exit one game but its stilkl trying to update it - should not shoot at someone if they are tractored by a friend - stars go to one side in fast worp when zoomed out - during turn speed should not jump around so much - when other ship fires torpedo it uses distance to the center NOT the distance to the object - should not be able to become friends with borg by killing other ships - when fps goes down the ship shakes - -MAYBES: - - ship should strech in warp - - - -ERROR: - - - - - - - - -Exception in thread "AWT-EventQueue-0" java.lang.ArrayIndexOutOfBoundsException: No such child: 2 - at java.awt.Container.getComponent(Unknown Source) - at javax.swing.JComponent.rectangleIsObscured(Unknown Source) - at javax.swing.JComponent.paint(Unknown Source) - at javax.swing.JLayeredPane.paint(Unknown Source) - at javax.swing.JComponent.paintToOffscreen(Unknown Source) - at javax.swing.RepaintManager$PaintManager.paintDoubleBuffered(Unknown Source) - at javax.swing.RepaintManager$PaintManager.paint(Unknown Source) - at javax.swing.BufferStrategyPaintManager.paint(Unknown Source) - at javax.swing.RepaintManager.paint(Unknown Source) - at javax.swing.JComponent._paintImmediately(Unknown Source) - at javax.swing.JComponent.paintImmediately(Unknown Source) - at javax.swing.RepaintManager.paintDirtyRegions(Unknown Source) - at javax.swing.RepaintManager.paintDirtyRegions(Unknown Source) - at javax.swing.RepaintManager.seqPaintDirtyRegions(Unknown Source) - at javax.swing.SystemEventQueueUtilities$ComponentWorkRequest.run(Unknown Source) - at java.awt.event.InvocationEvent.dispatch(Unknown Source) - at java.awt.EventQueue.dispatchEvent(Unknown Source) - at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) - at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) - at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) - at java.awt.EventDispatchThread.pumpEvents(Unknown Source) - at java.awt.EventDispatchThread.pumpEvents(Unknown Source) - at java.awt.EventDispatchThread.run(Unknown Source) - - - - - - - - -Exception in thread "AWT-EventQueue-0" java.lang.ArrayIndexOutOfBoundsException: 2 >= 0 - at java.util.Vector.elementAt(Unknown Source) - at javax.swing.JList$5.getElementAt(Unknown Source) - at javax.swing.plaf.basic.BasicListUI.paintCell(Unknown Source) - at javax.swing.plaf.basic.BasicListUI.paint(Unknown Source) - at javax.swing.plaf.ComponentUI.update(Unknown Source) - at javax.swing.JComponent.paintComponent(Unknown Source) - at javax.swing.JComponent.paint(Unknown Source) - at javax.swing.JComponent.paintWithOffscreenBuffer(Unknown Source) - at javax.swing.JComponent.paintDoubleBuffered(Unknown Source) - at javax.swing.JComponent._paintImmediately(Unknown Source) - at javax.swing.JComponent.paintImmediately(Unknown Source) - at javax.swing.RepaintManager.paintDirtyRegions(Unknown Source) - at javax.swing.SystemEventQueueUtilities$ComponentWorkRequest.run(Unknown Source) - at java.awt.event.InvocationEvent.dispatch(Unknown Source) - at java.awt.EventQueue.dispatchEvent(Unknown Source) - at java.awt.EventDispatchThread.pumpOneEventForHierarchy(Unknown Source) - at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) - at java.awt.EventDispatchThread.pumpEvents(Unknown Source) - at java.awt.EventDispatchThread.pumpEvents(Unknown Source) - at java.awt.EventDispatchThread.run(Unknown Source) - - - - - - -Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException - at rescue.RunRescue.drawStars(RunRescue.java:435) - at rescue.panels.BigMapPanel.paintComponent(BigMapPanel.java:50) - at javax.swing.JComponent.paint(Unknown Source) - at javax.swing.JComponent.paintWithOffscreenBuffer(Unknown Source) - at javax.swing.JComponent.paintDoubleBuffered(Unknown Source) - at javax.swing.JComponent._paintImmediately(Unknown Source) - at javax.swing.JComponent.paintImmediately(Unknown Source) - at javax.swing.RepaintManager.paintDirtyRegions(Unknown Source) - at javax.swing.SystemEventQueueUtilities$ComponentWorkRequest.run(Unknown Source) - at java.awt.event.InvocationEvent.dispatch(Unknown Source) - at java.awt.EventQueue.dispatchEvent(Unknown Source) - at java.awt.EventDispatchThread.pumpOneEventForHierarchy(Unknown Source) - at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) - at java.awt.EventDispatchThread.pumpEvents(Unknown Source) - at java.awt.EventDispatchThread.pumpEvents(Unknown Source) - at java.awt.EventDispatchThread.run(Unknown Source) - - - - - -Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException - at java.awt.geom.Point2D.distance(Point2D.java:320) - at rescue.RunRescue.drawShipsBig(RunRescue.java:442) - at rescue.panels.BigMapPanel.paintComponent(BigMapPanel.java:51) - at javax.swing.JComponent.paint(JComponent.java:1003) - at javax.swing.JComponent.paintWithOffscreenBuffer(JComponent.java:4930) - at javax.swing.JComponent.paintDoubleBuffered(JComponent.java:4883) - at javax.swing.JComponent._paintImmediately(JComponent.java:4826) - at javax.swing.JComponent.paintImmediately(JComponent.java:4633) - at javax.swing.RepaintManager.paintDirtyRegions(RepaintManager.java:451) - at javax.swing.SystemEventQueueUtilities$ComponentWorkRequest.run(SystemEventQueueUtilities.java:114) - at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:209) - at java.awt.EventQueue.dispatchEvent(EventQueue.java:461) - at java.awt.EventDispatchThread.pumpOneEventForHierarchy(EventDispatchThread.java:234) - at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:163) - at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:157) - at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:149) - at java.awt.EventDispatchThread.run(EventDispatchThread.java:110) -Exception in thread "main" java.lang.NullPointerException - at java.awt.geom.Point2D.distance(Point2D.java:320) - at rescue.spaceobjects.MovingObject.advanceShipLocation(MovingObject.java:216) - at rescue.spaceobjects.MovingObject.advance(MovingObject.java:261) - at rescue.spaceobjects.Ship.advance(Ship.java:570) - at rescue.RunRescue.updateGame(RunRescue.java:481) - at rescue.RunRescue.run(RunRescue.java:102) - at rescue.gui.RescueGUI.main(RescueGUI.java:1015) -Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException - at java.awt.geom.Point2D.distance(Point2D.java:320) - at rescue.RunRescue.drawShipsBig(RunRescue.java:442) - at rescue.panels.BigMapPanel.paintComponent(BigMapPanel.java:51) - at javax.swing.JComponent.paint(JComponent.java:1003) - at javax.swing.JComponent.paintChildren(JComponent.java:840) - at javax.swing.JComponent.paint(JComponent.java:1012) - at javax.swing.JComponent.paintChildren(JComponent.java:840) - at javax.swing.JComponent.paint(JComponent.java:1012) - at javax.swing.JLayeredPane.paint(JLayeredPane.java:559) - at javax.swing.JComponent.paintChildren(JComponent.java:840) - at javax.swing.JComponent.paint(JComponent.java:1012) - at javax.swing.JComponent.paintChildren(JComponent.java:840) - at javax.swing.JComponent.paint(JComponent.java:1012) - at javax.swing.JComponent.paintChildren(JComponent.java:840) - at javax.swing.JComponent.paint(JComponent.java:1012) - at javax.swing.JLayeredPane.paint(JLayeredPane.java:559) - at javax.swing.JComponent.paintWithOffscreenBuffer(JComponent.java:4930) - at javax.swing.JComponent.paintDoubleBuffered(JComponent.java:4883) - at javax.swing.JComponent._paintImmediately(JComponent.java:4826) - at javax.swing.JComponent.paintImmediately(JComponent.java:4633) - at javax.swing.RepaintManager.paintDirtyRegions(RepaintManager.java:451) - at javax.swing.SystemEventQueueUtilities$ComponentWorkRequest.run(SystemEventQueueUtilities.java:114) - at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:209) - at java.awt.EventQueue.dispatchEvent(EventQueue.java:461) - at java.awt.EventDispatchThread.pumpOneEventForHierarchy(EventDispatchThread.java:234) - at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:163) - at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:157) - at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:149) - at java.awt.EventDispatchThread.run(EventDispatchThread.java:110) - Modified: Rescue/build.xml =================================================================== --- Rescue/build.xml 2013-09-16 22:39:15 UTC (rev 41) +++ Rescue/build.xml 2013-09-16 23:11:00 UTC (rev 42) @@ -256,7 +256,7 @@ <delete dir="${dir.build.game}"/> <mkdir dir="${dir.build.game}"/> - <copy file="bugs.txt" todir="${dir.build.game}"/> + <copy file="todo.txt" todir="${dir.build.game}"/> <copy file="gpl.txt" todir="${dir.build.game}"/> <copy file="ChangeLog.txt" todir="${dir.build.game}"/> Copied: Rescue/todo.txt (from rev 40, Rescue/bugs.txt) =================================================================== --- Rescue/todo.txt (rev 0) +++ Rescue/todo.txt 2013-09-16 23:11:00 UTC (rev 42) @@ -0,0 +1,215 @@ +TODO: + +windows can resize, but look broken if resized! + +when quit game then crash, coz this not being done: +cc=255; +pp=255; +tt=255; +return; + + + add a paramiter that indicates how lickely someone is going to change there mind as to who they like + so if it is 0, then they will never change there mind as to who they like + if it is 10, then they will like anyone who helps them in any possible way + make sure u hate the ship that shots u , even if u dont hate there race + + smoke to broken ship + odd blue crap to wormholes + all systems damaged means ship is dead? + add sound on and off options + score system + keyboard shortcuts + + make energy bars not flicker + fix error with condition being on same panel as end game button + make it when computer down no ships lists can be used, make sheild damage actually work (in the info) + make the engery work properly, when lots of systems are damaged you can not make a lot of energy (warp core broken cant make energy) (and make it less hard to kill a last bit of a dieing ship) + make auto-on shields work, and auto select neerest ememy (sort out the selection system) + improve ship AI, make them fly in groups and stuff, make bad ships go to bady base + check that the systems to shoot are working, The base must be much stronger then it is now + make it store number of people rescued and they r the ones that r killed when badys shoot the planets (not the planet) + + make it so that when cloak is on u cant see the ships, and they cant use the weapons + make the resizing of panels work + make warp choose fastest way to destination + make comunication work (and destress signal) + make it work in linux + make sounds work + + buttons to add: + X EndGame (not really needed as you can just click on X) + X pref + X high score + Quit + Interface Help + About Interface + X Auto-Shields ? auto select neerest enemy (select all badys still ok) + X Auto-Destruct + Comunicate + Send Distress Signal + +BUGS: + + game sometimes stops refreshing the GUI (but game continues) (like the gif resolution bug) + game crashes when you exit one game but its stilkl trying to update it + should not shoot at someone if they are tractored by a friend + stars go to one side in fast worp when zoomed out + during turn speed should not jump around so much + when other ship fires torpedo it uses distance to the center NOT the distance to the object + should not be able to become friends with borg by killing other ships + when fps goes down the ship shakes + +MAYBES: + + ship should strech in warp + + + +ERROR: + + + + + + + + +Exception in thread "AWT-EventQueue-0" java.lang.ArrayIndexOutOfBoundsException: No such child: 2 + at java.awt.Container.getComponent(Unknown Source) + at javax.swing.JComponent.rectangleIsObscured(Unknown Source) + at javax.swing.JComponent.paint(Unknown Source) + at javax.swing.JLayeredPane.paint(Unknown Source) + at javax.swing.JComponent.paintToOffscreen(Unknown Source) + at javax.swing.RepaintManager$PaintManager.paintDoubleBuffered(Unknown Source) + at javax.swing.RepaintManager$PaintManager.paint(Unknown Source) + at javax.swing.BufferStrategyPaintManager.paint(Unknown Source) + at javax.swing.RepaintManager.paint(Unknown Source) + at javax.swing.JComponent._paintImmediately(Unknown Source) + at javax.swing.JComponent.paintImmediately(Unknown Source) + at javax.swing.RepaintManager.paintDirtyRegions(Unknown Source) + at javax.swing.RepaintManager.paintDirtyRegions(Unknown Source) + at javax.swing.RepaintManager.seqPaintDirtyRegions(Unknown Source) + at javax.swing.SystemEventQueueUtilities$ComponentWorkRequest.run(Unknown Source) + at java.awt.event.InvocationEvent.dispatch(Unknown Source) + at java.awt.EventQueue.dispatchEvent(Unknown Source) + at java.awt.EventDispatchThread.pumpOneEventForFilters(Unknown Source) + at java.awt.EventDispatchThread.pumpEventsForFilter(Unknown Source) + at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) + at java.awt.EventDispatchThread.pumpEvents(Unknown Source) + at java.awt.EventDispatchThread.pumpEvents(Unknown Source) + at java.awt.EventDispatchThread.run(Unknown Source) + + + + + + + + +Exception in thread "AWT-EventQueue-0" java.lang.ArrayIndexOutOfBoundsException: 2 >= 0 + at java.util.Vector.elementAt(Unknown Source) + at javax.swing.JList$5.getElementAt(Unknown Source) + at javax.swing.plaf.basic.BasicListUI.paintCell(Unknown Source) + at javax.swing.plaf.basic.BasicListUI.paint(Unknown Source) + at javax.swing.plaf.ComponentUI.update(Unknown Source) + at javax.swing.JComponent.paintComponent(Unknown Source) + at javax.swing.JComponent.paint(Unknown Source) + at javax.swing.JComponent.paintWithOffscreenBuffer(Unknown Source) + at javax.swing.JComponent.paintDoubleBuffered(Unknown Source) + at javax.swing.JComponent._paintImmediately(Unknown Source) + at javax.swing.JComponent.paintImmediately(Unknown Source) + at javax.swing.RepaintManager.paintDirtyRegions(Unknown Source) + at javax.swing.SystemEventQueueUtilities$ComponentWorkRequest.run(Unknown Source) + at java.awt.event.InvocationEvent.dispatch(Unknown Source) + at java.awt.EventQueue.dispatchEvent(Unknown Source) + at java.awt.EventDispatchThread.pumpOneEventForHierarchy(Unknown Source) + at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) + at java.awt.EventDispatchThread.pumpEvents(Unknown Source) + at java.awt.EventDispatchThread.pumpEvents(Unknown Source) + at java.awt.EventDispatchThread.run(Unknown Source) + + + + + + +Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException + at rescue.RunRescue.drawStars(RunRescue.java:435) + at rescue.panels.BigMapPanel.paintComponent(BigMapPanel.java:50) + at javax.swing.JComponent.paint(Unknown Source) + at javax.swing.JComponent.paintWithOffscreenBuffer(Unknown Source) + at javax.swing.JComponent.paintDoubleBuffered(Unknown Source) + at javax.swing.JComponent._paintImmediately(Unknown Source) + at javax.swing.JComponent.paintImmediately(Unknown Source) + at javax.swing.RepaintManager.paintDirtyRegions(Unknown Source) + at javax.swing.SystemEventQueueUtilities$ComponentWorkRequest.run(Unknown Source) + at java.awt.event.InvocationEvent.dispatch(Unknown Source) + at java.awt.EventQueue.dispatchEvent(Unknown Source) + at java.awt.EventDispatchThread.pumpOneEventForHierarchy(Unknown Source) + at java.awt.EventDispatchThread.pumpEventsForHierarchy(Unknown Source) + at java.awt.EventDispatchThread.pumpEvents(Unknown Source) + at java.awt.EventDispatchThread.pumpEvents(Unknown Source) + at java.awt.EventDispatchThread.run(Unknown Source) + + + + + +Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException + at java.awt.geom.Point2D.distance(Point2D.java:320) + at rescue.RunRescue.drawShipsBig(RunRescue.java:442) + at rescue.panels.BigMapPanel.paintComponent(BigMapPanel.java:51) + at javax.swing.JComponent.paint(JComponent.java:1003) + at javax.swing.JComponent.paintWithOffscreenBuffer(JComponent.java:4930) + at javax.swing.JComponent.paintDoubleBuffered(JComponent.java:4883) + at javax.swing.JComponent._paintImmediately(JComponent.java:4826) + at javax.swing.JComponent.paintImmediately(JComponent.java:4633) + at javax.swing.RepaintManager.paintDirtyRegions(RepaintManager.java:451) + at javax.swing.SystemEventQueueUtilities$ComponentWorkRequest.run(SystemEventQueueUtilities.java:114) + at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:209) + at java.awt.EventQueue.dispatchEvent(EventQueue.java:461) + at java.awt.EventDispatchThread.pumpOneEventForHierarchy(EventDispatchThread.java:234) + at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:163) + at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:157) + at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:149) + at java.awt.EventDispatchThread.run(EventDispatchThread.java:110) +Exception in thread "main" java.lang.NullPointerException + at java.awt.geom.Point2D.distance(Point2D.java:320) + at rescue.spaceobjects.MovingObject.advanceShipLocation(MovingObject.java:216) + at rescue.spaceobjects.MovingObject.advance(MovingObject.java:261) + at rescue.spaceobjects.Ship.advance(Ship.java:570) + at rescue.RunRescue.updateGame(RunRescue.java:481) + at rescue.RunRescue.run(RunRescue.java:102) + at rescue.gui.RescueGUI.main(RescueGUI.java:1015) +Exception in thread "AWT-EventQueue-0" java.lang.NullPointerException + at java.awt.geom.Point2D.distance(Point2D.java:320) + at rescue.RunRescue.drawShipsBig(RunRescue.java:442) + at rescue.panels.BigMapPanel.paintComponent(BigMapPanel.java:51) + at javax.swing.JComponent.paint(JComponent.java:1003) + at javax.swing.JComponent.paintChildren(JComponent.java:840) + at javax.swing.JComponent.paint(JComponent.java:1012) + at javax.swing.JComponent.paintChildren(JComponent.java:840) + at javax.swing.JComponent.paint(JComponent.java:1012) + at javax.swing.JLayeredPane.paint(JLayeredPane.java:559) + at javax.swing.JComponent.paintChildren(JComponent.java:840) + at javax.swing.JComponent.paint(JComponent.java:1012) + at javax.swing.JComponent.paintChildren(JComponent.java:840) + at javax.swing.JComponent.paint(JComponent.java:1012) + at javax.swing.JComponent.paintChildren(JComponent.java:840) + at javax.swing.JComponent.paint(JComponent.java:1012) + at javax.swing.JLayeredPane.paint(JLayeredPane.java:559) + at javax.swing.JComponent.paintWithOffscreenBuffer(JComponent.java:4930) + at javax.swing.JComponent.paintDoubleBuffered(JComponent.java:4883) + at javax.swing.JComponent._paintImmediately(JComponent.java:4826) + at javax.swing.JComponent.paintImmediately(JComponent.java:4633) + at javax.swing.RepaintManager.paintDirtyRegions(RepaintManager.java:451) + at javax.swing.SystemEventQueueUtilities$ComponentWorkRequest.run(SystemEventQueueUtilities.java:114) + at java.awt.event.InvocationEvent.dispatch(InvocationEvent.java:209) + at java.awt.EventQueue.dispatchEvent(EventQueue.java:461) + at java.awt.EventDispatchThread.pumpOneEventForHierarchy(EventDispatchThread.java:234) + at java.awt.EventDispatchThread.pumpEventsForHierarchy(EventDispatchThread.java:163) + at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:157) + at java.awt.EventDispatchThread.pumpEvents(EventDispatchThread.java:149) + at java.awt.EventDispatchThread.run(EventDispatchThread.java:110) + This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2013-09-16 22:39:17
|
Revision: 41 http://sourceforge.net/p/rescue/code/41 Author: yuranet Date: 2013-09-16 22:39:15 +0000 (Mon, 16 Sep 2013) Log Message: ----------- keys only work when they are meant to Modified Paths: -------------- Rescue/src/rescue/RunRescue.java Rescue/src/rescue/gui/Keymap.java Rescue/src/rescue/gui/PrefDialog.java Rescue/src/rescue/gui/RescueGUI.java Modified: Rescue/src/rescue/RunRescue.java =================================================================== --- Rescue/src/rescue/RunRescue.java 2013-09-16 21:11:02 UTC (rev 40) +++ Rescue/src/rescue/RunRescue.java 2013-09-16 22:39:15 UTC (rev 41) @@ -11,6 +11,7 @@ import java.awt.Color; import java.awt.image.BufferedImage; import java.awt.Graphics2D; +import java.awt.KeyboardFocusManager; import java.util.Vector; import java.util.Arrays; import java.io.IOException; @@ -21,6 +22,7 @@ import javax.swing.Action; import java.awt.event.KeyEvent; +import java.util.List; import javax.swing.KeyStroke; public class RunRescue implements Runnable,IndicatorsListener { // extends Thread @@ -82,7 +84,7 @@ private URL rooturl; - private Vector actions; + private Keymap keymap; public RunRescue(URL rurl) throws Exception { @@ -93,9 +95,9 @@ pause = true; // THIS MUST BE TRUE ALWAYS HERE heads = true; - makeActions(); + List actions = makeActions(); - new Keymap(actions); + keymap = new Keymap(actions); try { Keymap.loadKeys(actions, RescueIO.getInputStream( new URL(rooturl,KEYMAP_FILENAME) ) ); @@ -154,9 +156,9 @@ } } - private void makeActions() { + private List makeActions() { - actions = new Vector(); + Vector actions = new Vector(); actions.add(new AbstractAction() { { @@ -808,6 +810,8 @@ }); } + return actions; + } public void updateEvasiveIndicators(int value) { @@ -949,6 +953,7 @@ JukeBox.play("welcome"); + KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(keymap); } catch (Exception e) { @@ -971,6 +976,7 @@ JukeBox.stop("music"); + KeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventDispatcher(keymap); } // ########################################################### MAIN GUI STUFF @@ -1890,17 +1896,19 @@ } - public Vector getActions() { - - return actions; - + public List getActions() { + return keymap.getActions(); } + public Keymap getKeymap() { + return keymap; + } public Action getAction(String name) { + List actions = getActions(); for (int i=0;i<actions.size();i++) { - Action action = (Action)actions.elementAt(i); + Action action = (Action)actions.get(i); if ( name.equals((String)action.getValue( Action.ACTION_COMMAND_KEY )) ) { Modified: Rescue/src/rescue/gui/Keymap.java =================================================================== --- Rescue/src/rescue/gui/Keymap.java 2013-09-16 21:11:02 UTC (rev 40) +++ Rescue/src/rescue/gui/Keymap.java 2013-09-16 22:39:15 UTC (rev 41) @@ -1,29 +1,28 @@ package rescue.gui; -import java.util.Properties; -import java.util.Vector; import java.awt.KeyEventDispatcher; import java.awt.KeyboardFocusManager; import java.awt.event.KeyEvent; -import java.net.URL; +import java.io.InputStream; +import java.io.OutputStream; +import java.util.List; +import java.util.Properties; import javax.swing.Action; import javax.swing.KeyStroke; -import java.io.InputStream; -import java.io.OutputStream; // UI should have a table and a change button under it, then a save and cencel too public class Keymap implements KeyEventDispatcher { - private Vector actions; + private final List actions; - public Keymap(Vector a) { - + public Keymap(List a) { actions = a; + } - KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(this); + public List getActions() { + return actions; + } - } - /** * some problems here, the Alt-Gr key is mapped to Ctrl+Alt * and there is NO way to tell them apart, isAltGraphDown also acts the same way with both @@ -62,7 +61,7 @@ setupAction.putValue(setupName, ks ); setupAction = null; setupName = null; - + KeyboardFocusManager.getCurrentKeyboardFocusManager().removeKeyEventDispatcher(this); } return true; @@ -71,7 +70,7 @@ for (int c=0;c<actions.size();c++) { - Action action = (Action)actions.elementAt(c); + Action action = (Action)actions.get(c); KeyStroke akey = (KeyStroke)action.getValue(Action.ACCELERATOR_KEY); @@ -90,24 +89,25 @@ } - public static Action setupAction; - public static String setupName; - public static void setupKeyForAction(Action action,String name) { + public Action setupAction; + public String setupName; + public void setupKeyForAction(Action action,String name) { setupAction = action; setupName = name; + KeyboardFocusManager.getCurrentKeyboardFocusManager().addKeyEventDispatcher(this); } - public static void loadKeys(Vector actions, InputStream file) throws Exception { + public static void loadKeys(List actions, InputStream file) throws Exception { Properties keysconfig = new Properties(); keysconfig.load( file ); for (int c=0;c<actions.size();c++) { - Action action = (Action)actions.elementAt(c); + Action action = (Action)actions.get(c); String keys = keysconfig.getProperty( (String)action.getValue(Action.ACTION_COMMAND_KEY) ); KeyStroke ks; @@ -125,12 +125,12 @@ } - public static void saveKeys(Vector actions, OutputStream file) throws Exception { + public static void saveKeys(List actions, OutputStream file) throws Exception { Properties keysconfig = new Properties(); for (int c=0;c<actions.size();c++) { - Action action = (Action)actions.elementAt(c); + Action action = (Action)actions.get(c); String name = (String)action.getValue(Action.ACTION_COMMAND_KEY); KeyStroke keyStroke = (KeyStroke)action.getValue(Action.ACCELERATOR_KEY); Modified: Rescue/src/rescue/gui/PrefDialog.java =================================================================== --- Rescue/src/rescue/gui/PrefDialog.java 2013-09-16 21:11:02 UTC (rev 40) +++ Rescue/src/rescue/gui/PrefDialog.java 2013-09-16 22:39:15 UTC (rev 41) @@ -35,6 +35,7 @@ import java.net.URL; import java.io.FileOutputStream; import java.io.File; +import java.util.List; /** * <p> About Dialog </p> @@ -50,12 +51,14 @@ private RescueGUI gui; private JCheckBox inout; private JSpinner delay; + private Keymap keymap; - public PrefDialog(Frame parent, boolean modal, RunRescue r, RescueGUI g) { + public PrefDialog(Frame parent, boolean modal, RunRescue r, RescueGUI g, Keymap km) { super(parent,"Preferences", modal); rescue=r; gui=g; + keymap=km; initGUI(); pack(); @@ -135,9 +138,9 @@ rescue.setMode( inout.isSelected() ); rescue.setDelay( ((Integer)delay.getValue()).intValue() ); - Vector actions = rescue.getActions(); + List actions = rescue.getActions(); for (int c=0;c<actions.size();c++) { - Action action = (Action)actions.elementAt(c); + Action action = (Action)actions.get(c); action.putValue( Action.ACCELERATOR_KEY , action.getValue(TEMP_ACCELERATOR_KEY) ); } @@ -156,7 +159,7 @@ Action action = getCurrentAction(); action.addPropertyChangeListener(this); - Keymap.setupKeyForAction(action, TEMP_ACCELERATOR_KEY ); + keymap.setupKeyForAction(action, TEMP_ACCELERATOR_KEY ); } else if (e.getActionCommand().equals("clear")) { @@ -181,9 +184,9 @@ Object keyStroke = action.getValue( TEMP_ACCELERATOR_KEY ); - Vector actions = rescue.getActions(); + List actions = rescue.getActions(); for (int c=0;c<actions.size();c++) { - Action action2 = (Action)actions.elementAt(c); + Action action2 = (Action)actions.get(c); if (action!=action2 && keyStroke.equals( action2.getValue( TEMP_ACCELERATOR_KEY ) )) { action2.putValue( TEMP_ACCELERATOR_KEY , null ); @@ -194,17 +197,15 @@ } private Action getCurrentAction() { - - return (Action)rescue.getActions().elementAt( table.getSelectedRow() ); - + return (Action)rescue.getActions().get( table.getSelectedRow() ); } /** Closes the dialog */ private void closeDialog() { - Vector actions = rescue.getActions(); + List actions = rescue.getActions(); for (int c=0;c<actions.size();c++) { - ((Action)actions.elementAt(c)).putValue( TEMP_ACCELERATOR_KEY , null ); + ((Action)actions.get(c)).putValue( TEMP_ACCELERATOR_KEY , null ); } setVisible(false); @@ -214,9 +215,9 @@ private JTable table; private JScrollPane makeKeyTable() { - Vector actions = rescue.getActions(); + List actions = rescue.getActions(); for (int c=0;c<actions.size();c++) { - Action action = (Action)actions.elementAt(c); + Action action = (Action)actions.get(c); action.putValue( TEMP_ACCELERATOR_KEY , action.getValue(Action.ACCELERATOR_KEY) ); } @@ -240,7 +241,7 @@ public Object getValueAt(int row, int col) { - Action action = (Action)rescue.getActions().elementAt(row); + Action action = (Action)rescue.getActions().get(row); switch(col) { Modified: Rescue/src/rescue/gui/RescueGUI.java =================================================================== --- Rescue/src/rescue/gui/RescueGUI.java 2013-09-16 21:11:02 UTC (rev 40) +++ Rescue/src/rescue/gui/RescueGUI.java 2013-09-16 22:39:15 UTC (rev 41) @@ -837,7 +837,7 @@ } else if (e.getActionCommand().equals("preferences")) { - PrefDialog aboutDialog = new PrefDialog( findParentFrame(this) , true, rescue, this); + PrefDialog aboutDialog = new PrefDialog( findParentFrame(this) , true, rescue, this, rescue.getKeymap() ); Dimension frameSize = getSize(); Dimension aboutSize = aboutDialog.getPreferredSize(); int x = getLocation().x + (frameSize.width - aboutSize.width) / 2; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2013-09-16 21:11:05
|
Revision: 40 http://sourceforge.net/p/rescue/code/40 Author: yuranet Date: 2013-09-16 21:11:02 +0000 (Mon, 16 Sep 2013) Log Message: ----------- bug report option in menu Modified Paths: -------------- Rescue/src/rescue/gui/RescueGUI.java Modified: Rescue/src/rescue/gui/RescueGUI.java =================================================================== --- Rescue/src/rescue/gui/RescueGUI.java 2013-09-12 22:43:11 UTC (rev 39) +++ Rescue/src/rescue/gui/RescueGUI.java 2013-09-16 21:11:02 UTC (rev 40) @@ -755,6 +755,11 @@ menu.add( rescue.getAction("help") ); + menuItem = new JMenuItem("Send Bug Report"); + menuItem.setActionCommand("bug report"); + menuItem.addActionListener(this); + menu.add(menuItem); + menuItem = new JMenuItem("About Rescue!"); menuItem.setMnemonic(KeyEvent.VK_R); //menuItem.setAccelerator(javax.swing.KeyStroke.getKeyStroke( @@ -877,6 +882,9 @@ aboutDialog.setVisible(true); return; } + else if (e.getActionCommand().equals("bug report")) { + System.err.println("bug report"); + } else if (e.getActionCommand().equals("w default")) { defaultWindowPositions(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2013-09-12 22:43:15
|
Revision: 39 http://sourceforge.net/p/rescue/code/39 Author: yuranet Date: 2013-09-12 22:43:11 +0000 (Thu, 12 Sep 2013) Log Message: ----------- new version of browser launcher Modified Paths: -------------- Rescue/src/rescue/BrowserLauncher.java Modified: Rescue/src/rescue/BrowserLauncher.java =================================================================== --- Rescue/src/rescue/BrowserLauncher.java 2013-09-12 21:34:46 UTC (rev 38) +++ Rescue/src/rescue/BrowserLauncher.java 2013-09-12 22:43:11 UTC (rev 39) @@ -148,6 +148,8 @@ /** JVM constant for any other platform */ private static final int OTHER = -1; + + private static final int JAVA_AWT_DESKTOP = 7; /** * The file type of the Finder on a Macintosh. Hardcoding "Finder" would keep non-U.S. English @@ -200,7 +202,19 @@ static { loadedWithoutErrors = true; String osName = System.getProperty("os.name"); - if (osName.startsWith("Mac OS")) { + if (osName.startsWith("Windows")) { + if (osName.indexOf("9") != -1) { + jvm = WINDOWS_9x; + } else { + jvm = WINDOWS_NT; + } + } + // we would use this on all OSs, but on windows this sometimes fails + // when opening local files in the browser with a strange "move items" dialog + else if (isJavaAwtDesktopSupported()) { + jvm = JAVA_AWT_DESKTOP; + } + else if (osName.startsWith("Mac OS")) { String mrjVersion = System.getProperty("mrj.version"); String majorMRJVersion = mrjVersion.substring(0, 3); try { @@ -225,13 +239,8 @@ loadedWithoutErrors = false; errorMessage = "Invalid MRJ version: " + mrjVersion; } - } else if (osName.startsWith("Windows")) { - if (osName.indexOf("9") != -1) { - jvm = WINDOWS_9x; - } else { - jvm = WINDOWS_NT; - } - } else { + } + else { jvm = OTHER; } @@ -240,6 +249,15 @@ } } + private static boolean isJavaAwtDesktopSupported() { + try { + return java.awt.Desktop.isDesktopSupported() && java.awt.Desktop.getDesktop().isSupported( java.awt.Desktop.Action.BROWSE ); + } + catch(Throwable th) { + return false; + } + } + /** * This class should be never be instantiated; this just ensures so. */ @@ -449,6 +467,7 @@ break; case MRJ_3_0: case MRJ_3_1: + case JAVA_AWT_DESKTOP: browser = ""; // Return something non-null break; case WINDOWS_NT: @@ -480,6 +499,14 @@ } switch (jvm) { + case JAVA_AWT_DESKTOP: + try { + java.awt.Desktop.getDesktop().browse( new java.net.URI(url) ); + } + catch (Exception ex) { + throw new IOException("Unable to launch URL: " + url, ex); + } + break; case MRJ_2_0: Object aeDesc = null; try { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2013-09-12 21:34:49
|
Revision: 38 http://sourceforge.net/p/rescue/code/38 Author: yuranet Date: 2013-09-12 21:34:46 +0000 (Thu, 12 Sep 2013) Log Message: ----------- mac runny Modified Paths: -------------- Rescue/build.xml Modified: Rescue/build.xml =================================================================== --- Rescue/build.xml 2013-09-12 21:29:09 UTC (rev 37) +++ Rescue/build.xml 2013-09-12 21:34:46 UTC (rev 38) @@ -306,7 +306,8 @@ depends="distribution.jar,distribution.source.zip,game"> <zip destfile="${dir.dist}/Rescue.zip"> - <zipfileset dir="${dir.build.game}" prefix="Rescue" excludes="*.sh" defaultexcludes="no"/> + <zipfileset dir="${dir.build.game}" prefix="Rescue" excludes="*.sh"/> + <zipfileset dir="${dir.build.game}" prefix="Rescue" includes="._*" defaultexcludes="no"/> <zipfileset dir="${dir.build.game}" prefix="Rescue" includes="*.sh" filemode="755"/> </zip> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2013-09-12 21:29:11
|
Revision: 37 http://sourceforge.net/p/rescue/code/37 Author: yuranet Date: 2013-09-12 21:29:09 +0000 (Thu, 12 Sep 2013) Log Message: ----------- mac runny Modified Paths: -------------- Rescue/build.xml Modified: Rescue/build.xml =================================================================== --- Rescue/build.xml 2013-09-12 20:49:49 UTC (rev 36) +++ Rescue/build.xml 2013-09-12 21:29:09 UTC (rev 37) @@ -306,7 +306,8 @@ depends="distribution.jar,distribution.source.zip,game"> <zip destfile="${dir.dist}/Rescue.zip"> - <zipfileset dir="${dir.build.game}" prefix="Rescue" defaultexcludes="no" /> + <zipfileset dir="${dir.build.game}" prefix="Rescue" excludes="*.sh" defaultexcludes="no"/> + <zipfileset dir="${dir.build.game}" prefix="Rescue" includes="*.sh" filemode="755"/> </zip> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2013-09-12 20:49:52
|
Revision: 36 http://sourceforge.net/p/rescue/code/36 Author: yuranet Date: 2013-09-12 20:49:49 +0000 (Thu, 12 Sep 2013) Log Message: ----------- correct frame shown and hidden Modified Paths: -------------- Rescue/src/rescue/gui/RescueGUI.java Modified: Rescue/src/rescue/gui/RescueGUI.java =================================================================== --- Rescue/src/rescue/gui/RescueGUI.java 2013-09-12 20:33:04 UTC (rev 35) +++ Rescue/src/rescue/gui/RescueGUI.java 2013-09-12 20:49:49 UTC (rev 36) @@ -264,7 +264,7 @@ } // does not work at the beggining of the game - setVisible(false); + findParentFrame(this).setVisible(false); } else { @@ -305,7 +305,7 @@ } - setVisible(true); + findParentFrame(this).setVisible(true); } else { @@ -346,13 +346,14 @@ } catch (InterruptedException e) {} - Frame frame = findParentFrame(this); + Frame frame; if ( rescue.getMode() ) { - frame = (Frame)Windows.elementAt(0); - } + else { + frame = findParentFrame(this); + } JOptionPane.showMessageDialog(frame, "You are dead!" , "Dead", JOptionPane.PLAIN_MESSAGE ); @@ -993,10 +994,7 @@ } } - public static Frame findParentFrame(Container c) { - return (Frame)javax.swing.SwingUtilities.getAncestorOfClass(Frame.class, c); - } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2013-09-12 20:33:06
|
Revision: 35 http://sourceforge.net/p/rescue/code/35 Author: yuranet Date: 2013-09-12 20:33:04 +0000 (Thu, 12 Sep 2013) Log Message: ----------- simpler to launch on mac Modified Paths: -------------- Rescue/build.xml Modified: Rescue/build.xml =================================================================== --- Rescue/build.xml 2013-09-12 20:32:00 UTC (rev 34) +++ Rescue/build.xml 2013-09-12 20:33:04 UTC (rev 35) @@ -306,7 +306,7 @@ depends="distribution.jar,distribution.source.zip,game"> <zip destfile="${dir.dist}/Rescue.zip"> - <zipfileset dir="${dir.build.game}" prefix="Rescue" /> + <zipfileset dir="${dir.build.game}" prefix="Rescue" defaultexcludes="no" /> </zip> </target> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2013-09-12 20:32:03
|
Revision: 34 http://sourceforge.net/p/rescue/code/34 Author: yuranet Date: 2013-09-12 20:32:00 +0000 (Thu, 12 Sep 2013) Log Message: ----------- simpler to launch on mac Modified Paths: -------------- Rescue/build.xml Added Paths: ----------- Rescue/resources/._Rescue.jar Rescue/resources/._run.sh Modified: Rescue/build.xml =================================================================== --- Rescue/build.xml 2013-09-11 23:52:31 UTC (rev 33) +++ Rescue/build.xml 2013-09-12 20:32:00 UTC (rev 34) @@ -281,7 +281,7 @@ <copy todir="${dir.build.game}"> <!-- script start files for easy starting --> - <fileset dir="${basedir}/resources"/> + <fileset dir="${basedir}/resources" defaultexcludes="no" includes="*.sh,*.cmd,*.htm,._*"/> </copy> <!-- remember the installer chmod in installer/izpack/install.xml --> Added: Rescue/resources/._Rescue.jar =================================================================== (Binary files differ) Index: Rescue/resources/._Rescue.jar =================================================================== --- Rescue/resources/._Rescue.jar 2013-09-11 23:52:31 UTC (rev 33) +++ Rescue/resources/._Rescue.jar 2013-09-12 20:32:00 UTC (rev 34) Property changes on: Rescue/resources/._Rescue.jar ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property Added: Rescue/resources/._run.sh =================================================================== (Binary files differ) Index: Rescue/resources/._run.sh =================================================================== --- Rescue/resources/._run.sh 2013-09-11 23:52:31 UTC (rev 33) +++ Rescue/resources/._run.sh 2013-09-12 20:32:00 UTC (rev 34) Property changes on: Rescue/resources/._run.sh ___________________________________________________________________ Added: svn:mime-type ## -0,0 +1 ## +application/octet-stream \ No newline at end of property This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <yu...@us...> - 2013-09-11 23:52:38
|
Revision: 33 http://sourceforge.net/p/rescue/code/33 Author: yuranet Date: 2013-09-11 23:52:31 +0000 (Wed, 11 Sep 2013) Log Message: ----------- simpler method call Modified Paths: -------------- Rescue/src/rescue/gui/RescueGUI.java Modified: Rescue/src/rescue/gui/RescueGUI.java =================================================================== --- Rescue/src/rescue/gui/RescueGUI.java 2013-09-11 23:37:46 UTC (rev 32) +++ Rescue/src/rescue/gui/RescueGUI.java 2013-09-11 23:52:31 UTC (rev 33) @@ -967,8 +967,7 @@ // getMaximizedBounds ? Rectangle screenSize = GraphicsEnvironment.getLocalGraphicsEnvironment().getMaximumWindowBounds(); - frame.setLocation(screenSize.x,screenSize.y); - frame.setSize(screenSize.width, screenSize.height); + frame.setBounds(screenSize); frame.setVisible(true); rr.addRescueListener(gui); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |