Skip to content

Commit

Permalink
Merge pull request #1872 from vasl-developers/dev669
Browse files Browse the repository at this point in the history
6610 build changes
  • Loading branch information
derimmer authored Nov 18, 2024
2 parents 8b3b5bc + a40e165 commit c27ab6e
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 9 deletions.
Binary file added dist/Whats New VASL669-10.pdf
Binary file not shown.
Binary file removed dist/Whats New VASL669.pdf
Binary file not shown.
4 changes: 2 additions & 2 deletions dist/buildFile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<VASSAL.build.GameModule ModuleOther1="" ModuleOther2="" VassalVersion="3.7.14" description="VASL" name="VASL" nextPieceSlotId="15449" version="6.6.9">
<VASSAL.build.GameModule ModuleOther1="" ModuleOther2="" VassalVersion="3.7.14" description="VASL" name="VASL" nextPieceSlotId="15449" version="6.6.10">
<VASSAL.build.module.properties.GlobalProperties>
<VASSAL.build.module.properties.GlobalProperty description="TurnMarker1" initialValue="Spy (white)" isNumeric="false" max="null" min="null" name="TurnMarker1" wrap="false"/>
<VASSAL.build.module.properties.GlobalProperty description="TurnMarkerLayerLevel1" initialValue="33" isNumeric="true" max="100" min="0" name="TurnMarkerLayerLevel1" wrap="false"/>
Expand Down Expand Up @@ -161,7 +161,7 @@
</VASL.build.module.ASLMap>
<VASSAL.build.module.NotesWindow buttonText="" hotkey="" icon="notesV.gif" tooltip="Notes"/>
<VASSAL.build.module.Documentation>
<VASSAL.build.module.documentation.BrowserPDFFile pdfFile="Whats New VASL669.pdf" title="What's New"/>
<VASSAL.build.module.documentation.BrowserPDFFile pdfFile="Whats New VASL669-10.pdf" title="What's New"/>
<VASSAL.build.module.documentation.BrowserPDFFile pdfFile="Counters.pdf" title="Counters"/>
<VASSAL.build.module.documentation.BrowserPDFFile pdfFile="VASL Keystroke Cheat Sheet.pdf" title="Hotkey Listing"/>
<VASSAL.build.module.documentation.BrowserPDFFile pdfFile="Malf.pdf" title="Malf/Broken Unit Finder"/>
Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>org.vasl</groupId>
<artifactId>vasl</artifactId>
<version>6.6.9</version>
<version>6.6.10</version>
<packaging>jar</packaging>

<properties>
Expand Down
12 changes: 6 additions & 6 deletions src/VASL/build/module/map/ASLPieceMover.java
Original file line number Diff line number Diff line change
Expand Up @@ -923,13 +923,13 @@ protected DropTargetListener getListener(DropTargetEvent e) {
* @param dragX x position
* @param dragY y position
*/
@Deprecated(since = "2023-05-08", forRemoval = true)
//@Deprecated(since = "2023-05-08", forRemoval = true)
protected void moveDragCursor(int dragX, int dragY) {}

/**
* Removes the drag cursor from the current draw window
*/
@Deprecated(since = "2023-05-08", forRemoval = true)
//@Deprecated(since = "2023-05-08", forRemoval = true)
protected void removeDragCursor() {}

/** calculates the offset between cursor dragCursor positions */
Expand Down Expand Up @@ -1650,17 +1650,17 @@ protected void makeDragCursor(double zoom, double os_scale) {
* @param dragX x position
* @param dragY y position
*/
/*@Override
@Override
protected void moveDragCursor(int dragX, int dragY) {
if (drawWin != null) {
dragCursor.setLocation(dragX - drawOffset.x, dragY - drawOffset.y);
}
}*/
}

/**
* Removes the drag cursor from the current draw window
*/
/*@Override
@Override
protected void removeDragCursor() {
if (drawWin != null) {
if (dragCursor != null) {
Expand All @@ -1669,7 +1669,7 @@ protected void removeDragCursor() {
}
drawWin = null;
}
}*/
}

/**
* creates or moves cursor object to given JLayeredPane. Usually called by setDrawWinToOwnerOf()
Expand Down

0 comments on commit c27ab6e

Please sign in to comment.