+
+ ←↑↓→ Joystick
+ Space Button
+
+
←↑↓→ Joypad
X Button A
Z Button B
Space Select
Enter Start
+
+ ←↑↓→ Joystick
+ Space Button 1
+ Shift Button 2
+ 1 1p
+ 2 2p
+ 5 Coin
+
+
+ ← → Joystick
+ Space Fire
+
+
+ A W S D Move
+ ←↑↓→ Fire
+
+
diff --git a/scripts/sync-dev.sh b/scripts/sync-dev.sh
index f4278ac5..e98aa600 100755
--- a/scripts/sync-dev.sh
+++ b/scripts/sync-dev.sh
@@ -2,5 +2,5 @@
. ./scripts/env.sh
DESTPATH=$RSYNC_PATH/dev/
-git ls-files -z | rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules -ril --chmod=a+rx -e "ssh -p 2222" --files-from - -0 . $DESTPATH
-rsync --stats -rpilvz --chmod=a+rx -e "ssh -p 2222" ./gen $DESTPATH/
+git ls-files -z | rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules -ril --chmod=a+rx -e "ssh" --files-from - -0 . $DESTPATH
+rsync --stats -rpilvz --chmod=a+rx -e "ssh" ./gen config.js $DESTPATH/
diff --git a/scripts/sync-version-prod.sh b/scripts/sync-version-prod.sh
index 1abf289a..8213cdb6 100755
--- a/scripts/sync-version-prod.sh
+++ b/scripts/sync-version-prod.sh
@@ -21,5 +21,5 @@ mkdir -p $TMPDIR
git archive $VERSION | tar x -C $TMPDIR
echo "Copying to $DESTPATH..."
rsync --stats --exclude '.*' --exclude 'scripts/*' --exclude=node_modules --copy-dest=$DEVPATH -rilz --chmod=a+rx -e "ssh -p 2222" $TMPDIR/ $SUBMODS $DESTPATH
-rsync --stats -rpilvz --chmod=a+rx -e "ssh -p 2222" --copy-dest=$DEVPATH ./gen $DESTPATH/
+rsync --stats -rpilvz --chmod=a+rx -e "ssh -p 2222" --copy-dest=$DEVPATH ./gen config.js $DESTPATH/
echo "Done."
diff --git a/src/ui.ts b/src/ui.ts
index 7744ab6a..e3df8860 100644
--- a/src/ui.ts
+++ b/src/ui.ts
@@ -1653,7 +1653,17 @@ function addPageFocusHandlers() {
}
function showInstructions() {
- $("#emucontrols-" + getRootBasePlatform(platform_id)).show();
+ var div = $(document).find(".emucontrols-" + getRootBasePlatform(platform_id));
+ $("#emulator").append(div);
+ var vcanvas = $("#emulator").find("canvas");
+ if (vcanvas) {
+ vcanvas.on('focus', () => {
+ if (platform.isRunning()) div.fadeIn(200);
+ });
+ vcanvas.on('blur', () => {
+ div.fadeOut(200);
+ });
+ }
}
function installGAHooks() {
diff --git a/tools/Makefile b/tools/Makefile
index 7c3f2d61..96a1bc79 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -1,5 +1,5 @@
-all: binaries images/parrot.c
+all: binaries
%.lzg: %
lzg -9 $< $@
diff --git a/tools/nes/Makefile b/tools/nes/Makefile
index ce974e39..4717cee2 100644
--- a/tools/nes/Makefile
+++ b/tools/nes/Makefile
@@ -1,4 +1,9 @@
+all: nametable.dat
+
+clean:
+ rm -f *.dat road.png
+
nametable.dat: road.png
makechr -e error.png $< #-b 0000ff
diff --git a/tools/vicdual/Makefile b/tools/vicdual/Makefile
index 4b7dd523..905eafc1 100644
--- a/tools/vicdual/Makefile
+++ b/tools/vicdual/Makefile
@@ -1,6 +1,9 @@
all: cp437.vicdual.c c64.vicdual.c
+clean:
+ rm -f cp437.vicdual.c c64.vicdual.c
+
# convert DOS CP437 font (256 chars)
cp437.vicdual.c: ../fonts/cp437-8x8.bdf
python ../parsebdf8.py $< -r -C > $@
diff --git a/tools/williams/Makefile b/tools/williams/Makefile
index 0a23a52c..54919892 100644
--- a/tools/williams/Makefile
+++ b/tools/williams/Makefile
@@ -1,12 +1,15 @@
all: baddies.c badspacerobots.tga tom-thumb.c swave.c.rom.h
+clean:
+ rm -f baddies.[ch] *.gif *.tga *.tga.png tom-thumb.c swave.c.rom.h
+
%.h: %
cat $* | hexdump -v -e '"\n" 128/1 "0x%02x,"' > $@
# convert PCX (or PNG) file to Williams C sprite
%.c: %.pcx
- python ../pcx2will.py $< > $@
+ python3 ../pcx2will.py $< > $@
# convert PNG into RLE-encoded TGA bitmap
%.tga: %.png
@@ -23,5 +26,5 @@ all: baddies.c badspacerobots.tga tom-thumb.c swave.c.rom.h
# convert BDF font file to definitions
%.c: ../fonts/%.bdf
- python ../parsebdf4bit.py -s 33 -e 97 $< > $@
+ python3 ../parsebdf4bit.py -s 33 -e 97 $< > $@