From 3c6c08bba8a07f8033544af0da0346037339553d Mon Sep 17 00:00:00 2001 From: Igor Maznitsa Date: Sat, 13 Jun 2020 13:19:36 +0300 Subject: [PATCH] release 2.0.6 --- README.md | 28 ++++++++---------- changelog.txt | 7 ++++- docs/screenshots/pidentity48.png | Bin 0 -> 25239 bytes pom.xml | 4 +-- zxpoly-emul/pom.xml | 2 +- .../zxpoly/streamer/streamer.html | 5 ++-- zxpoly-sprite-corrector/pom.xml | 2 +- zxpoly-sprite-corrector/src/assemble/zip.xml | 26 ++++++++++++---- .../src/assemble/zip/icon.png | Bin 0 -> 16727 bytes .../src/assemble/zip/logo.png | Bin 13597 -> 0 bytes .../zxpspritecorrector/AboutDialog.java | 2 +- zxpoly-z80/pom.xml | 2 +- 12 files changed, 49 insertions(+), 29 deletions(-) create mode 100644 docs/screenshots/pidentity48.png create mode 100644 zxpoly-sprite-corrector/src/assemble/zip/icon.png delete mode 100644 zxpoly-sprite-corrector/src/assemble/zip/logo.png diff --git a/README.md b/README.md index 6fbf8727..2e63b94f 100644 --- a/README.md +++ b/README.md @@ -7,22 +7,20 @@ # Changelog -_ __2.0.6 (SNAPSHOT)__ - - added dialog to choose sound device for beeper if several devices detected - - GraalVM CE updated to 20.1.0 - - improved ubuntu desktop icon script +_ __2.0.6 (13-jun-2020)__ + - minor improvements in Spec256 emulation + - added support of POK trainers + - added support of Spec256 container export into editor + - added dialog to choose sound device for beeper if several devices detected + - GraalVM CE updated to 20.1.0 + - improved ubuntu desktop icon script + - refactoring + - added MPEG TS streaming, requires [FFMpeg](https://ffmpeg.org/) (beta) - __2.0.5 (14-mar-2020)__ - improved beeper to render playing TAP sound - GraalVM CE 20.0.0 as embedded JDK image - added support for gamepads and joysticks (through Jinput library) - -- __2.0.4 (18-jan-2020)__ - - added support of beeper (turned off by default) - - added more ROM sources - - fixed ROM loading from WoS - - improved CPU sync in Spec256 - # Introduction I am a ZX-Spectrum fan since 1989. ZX-Spectrum platform was very popular in the USSR. In april of 1994 I got some idea how to resolve [attribute clash](https://en.wikipedia.org/wiki/Attribute_clash) through moving the platform from mono-system to poly-system. @@ -36,7 +34,7 @@ Both the concept and emulator and all its parts are published under [GNU GPL3 li # Emulator GUI Keyboard plays role of ZX-Keyboard (ALT = SS, SHIFT = CS, CTRL+WHEEL = scaling), F5 shows ZX-keys on the screen. Numpad plays role of Kempson joystick. -![The Main Window of the Emulator](docs/screenshots/tapeloading.png) +![The Main Window of the Emulator](docs/screenshots/pidentity48.png) # Supported snapshot formats - Snapshots: .Z80, .SNA, .ZXP (ZX-Poly snapshot format), ZIP (Spec256 with SNA inside) @@ -44,10 +42,10 @@ Keyboard plays role of ZX-Keyboard (ALT = SS, SHIFT = CS, CTRL+WHEEL = scaling), - Disks: .TRD, .SCL # Prebuilt versions -The pre-built versions of the emulator and sprite editor can be downloaded from [the release page](https://github.com/raydac/zxpoly/releases/tag/2.0.5). -The emulator is written in Java and its JAR file can be started just through command line `java -jar zxpoly-emul-2.0.5-SNAPSHOT.jar` +The pre-built versions of the emulator and sprite editor can be downloaded from [the release page](https://github.com/raydac/zxpoly/releases/tag/2.0.6). +The emulator is written in Java and its JAR file can be started just through command line `java -jar zxpoly-emul-2.0.6.jar` By default it starts embedded ZX-Poly Test ROM image, but it can be replaced by ZX-128 SOS in **File->Options->Active ROM**, the ROM will be downloaded from one of remote network resources. -![Test-ROM](/docs/screenshots/testromscr1.png) +![Test-ROM](docs/screenshots/testromscr1.png) # Support of game controllers Since 2.0.5 the emulator supports gamepads and joysticks. It uses X,Y position and recognizing all buttons as Fire. Mapping of game controller can be turned on through **Service->Game controllers**. I recommend restart emulator after new controller connect because JInput works not well for such situation. diff --git a/changelog.txt b/changelog.txt index 5010a340..73ca093e 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,7 +1,12 @@ -_ __2.0.6 (SNAPSHOT)__ +_ __2.0.6 (13-jun-2020)__ + - minor improvements in Spec256 emulation + - added support of POK trainers + - added support of Spec256 container export into editor - added dialog to choose sound device for beeper if several devices detected - GraalVM CE updated to 20.1.0 - improved ubuntu desktop icon script + - refactoring + - added MPEG TS streaming support (beta) - __2.0.5 (14-mar-2020)__ - improved beeper to render playing TAP sound diff --git a/docs/screenshots/pidentity48.png b/docs/screenshots/pidentity48.png new file mode 100644 index 0000000000000000000000000000000000000000..09886934c782f727968ef0218cd928644872990b GIT binary patch literal 25239 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.0.0 com.igormaznitsa zxpoly - 2.0.6-SNAPSHOT + 2.0.6 pom https://github.com/raydac/zxpoly @@ -110,7 +110,7 @@ org.apache.maven.plugins maven-assembly-plugin - 3.1.1 + 3.3.0 sh.tak.appbundler diff --git a/zxpoly-emul/pom.xml b/zxpoly-emul/pom.xml index 5b30f1d7..6d71cfb3 100644 --- a/zxpoly-emul/pom.xml +++ b/zxpoly-emul/pom.xml @@ -5,7 +5,7 @@ com.igormaznitsa zxpoly - 2.0.6-SNAPSHOT + 2.0.6 ZX-Poly emulator diff --git a/zxpoly-emul/src/main/resources/com/igormaznitsa/zxpoly/streamer/streamer.html b/zxpoly-emul/src/main/resources/com/igormaznitsa/zxpoly/streamer/streamer.html index b6165a18..cc7cf226 100644 --- a/zxpoly-emul/src/main/resources/com/igormaznitsa/zxpoly/streamer/streamer.html +++ b/zxpoly-emul/src/main/resources/com/igormaznitsa/zxpoly/streamer/streamer.html @@ -1,6 +1,6 @@ -ZX-Poly streaming +ZX-Poly 2.0.6 streaming - + @@ -79,5 +79,6 @@

VLC


© Copyright 2020 Igor Maznitsa
+ \ No newline at end of file diff --git a/zxpoly-sprite-corrector/pom.xml b/zxpoly-sprite-corrector/pom.xml index b0838d77..e9f13ade 100644 --- a/zxpoly-sprite-corrector/pom.xml +++ b/zxpoly-sprite-corrector/pom.xml @@ -4,7 +4,7 @@ com.igormaznitsa zxpoly - 2.0.6-SNAPSHOT + 2.0.6 zxpoly-sprite-corrector diff --git a/zxpoly-sprite-corrector/src/assemble/zip.xml b/zxpoly-sprite-corrector/src/assemble/zip.xml index 70d1f23c..855f8f36 100644 --- a/zxpoly-sprite-corrector/src/assemble/zip.xml +++ b/zxpoly-sprite-corrector/src/assemble/zip.xml @@ -11,18 +11,34 @@ - ${project.build.directory}/${project.artifactId}-${project.version}.jar + ${project.build.directory}${file.separator}${project.artifactId}-${project.version}.jar zxpoly-corrector.jar - / + ${file.separator} - ${project.basedir}/src/assemble/zip - / + ${project.basedir}${file.separator}src${file.separator}assemble${file.separator}zip + ${file.separator} - */** + *.png + + ${project.basedir}${file.separator}src${file.separator}assemble${file.separator}zip + ${file.separator} + + *.bat + + 755 + + + ${project.basedir}${file.separator}src${file.separator}assemble${file.separator}zip + ${file.separator} + + *.sh + + 755 + \ No newline at end of file diff --git a/zxpoly-sprite-corrector/src/assemble/zip/icon.png b/zxpoly-sprite-corrector/src/assemble/zip/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..b981ebd75356847aed54ae8335456e3155ebed5c GIT binary patch literal 16727 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 AtpET3 literal 0 HcmV?d00001 diff --git a/zxpoly-sprite-corrector/src/assemble/zip/logo.png b/zxpoly-sprite-corrector/src/assemble/zip/logo.png deleted file mode 100644 index f726fd342d2f339eae00a60fe0d8555497cb49a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 13597 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 diff --git a/zxpoly-sprite-corrector/src/main/java/com/igormaznitsa/zxpspritecorrector/AboutDialog.java b/zxpoly-sprite-corrector/src/main/java/com/igormaznitsa/zxpspritecorrector/AboutDialog.java index 0cf8165a..7371edd5 100755 --- a/zxpoly-sprite-corrector/src/main/java/com/igormaznitsa/zxpspritecorrector/AboutDialog.java +++ b/zxpoly-sprite-corrector/src/main/java/com/igormaznitsa/zxpspritecorrector/AboutDialog.java @@ -31,7 +31,7 @@ public AboutDialog(final JFrame parent) { super(parent, true); initComponents(); - this.infoText.setText(this.infoText.getText().replace("${project.version}", "2.0.6-SNAPSHOT")); + this.infoText.setText(this.infoText.getText().replace("${project.version}", "2.0.6")); this.setLocationRelativeTo(null); } diff --git a/zxpoly-z80/pom.xml b/zxpoly-z80/pom.xml index 4aabd65a..29265d33 100644 --- a/zxpoly-z80/pom.xml +++ b/zxpoly-z80/pom.xml @@ -4,7 +4,7 @@ com.igormaznitsa zxpoly - 2.0.6-SNAPSHOT + 2.0.6 zxpoly-z80