Skip to content

Commit f1051da

Browse files
FrodeSolheimFrodeSolheim
committed
Updated
1 parent 94d790f commit f1051da

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+822
-10922
lines changed

‎.gitignore

+9-7
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ build68k
1212
/build/linux-dist/Makefile
1313
/build/linux-dist/*-steamos-*
1414
/build/steamos-dist/Makefile
15+
/build-dir/
1516
/cef/
1617
/*.cfg
1718
/*.changes
@@ -44,10 +45,9 @@ core
4445
/dist/windows/fs-uae.iss
4546
/dist/windows/Makefile
4647
*.dll
47-
*.gcda
4848
/*.dsc
4949
*.exe
50-
*.lnk
50+
/.flatpak-builder
5151
/fontconfig/
5252
/Frameworks/
5353
/fs-uae
@@ -58,6 +58,7 @@ fs-uae-dbg-[0-9]*
5858
fs-uae-device-helper
5959
fs-uae.rc
6060
fs-uae-with-dat
61+
*.gcda
6162
/gen
6263
genblitter
6364
gencomp
@@ -118,11 +119,13 @@ libfsemu/out
118119
/libnfd/Makefile
119120
/libs/
120121
libuae/od-win32/lib
122+
*.lnk
121123
*.lo
122124
*.log
123125
log
124126
/Makefile
125127
/Makefile.in
128+
merge.stage
126129
/missing
127130
*.mo
128131
/natives_blob.bin
@@ -133,6 +136,9 @@ log
133136
/osc
134137
/*.out.*
135138
/out
139+
/perf.csv
140+
/perf.png
141+
/perf.rrd
136142
*.pot
137143
*.ppa.upload
138144
*.pyc
@@ -160,15 +166,11 @@ temp
160166
util/temp
161167
/VERSION
162168
.vscode/ipch
169+
.vscode/ipch
163170
/windows/fs-uae.iss
164171
/windows/fs-uae*_windows*
165172
/windows/Makefile
166173
winuae-merge.txt
167174
winuae/od-win32/lib
168175
xxx*
169176
*.zip
170-
merge.stage
171-
.vscode/ipch
172-
/perf.csv
173-
/perf.png
174-
/perf.rrd

‎ChangeLog

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
Version 3.1.0dev:
22

3+
* Add Midi Support to FS-UAE using the PortMidi library [cnvogelg].
34
* Support for F13-F19 keys on Apple Extended keyboard [immutable].
45
* Better clipboard sharing integration.
56
* New fsemu backend (work in progress).

‎INSTALL

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
# Building and Installing FS-UAE
1+
# Building and installing FS-UAE
22

33
See docs/compiling.md for instructions for building FS-UAE.

‎Makefile.am

+3-3
Original file line numberDiff line numberDiff line change
@@ -1859,11 +1859,11 @@ install-data-hook: mo fs-uae.dat
18591859
cp -R $(s)/share/mime/* $(DESTDIR)$(datadir)/mime
18601860

18611861
uninstall-local:
1862-
rm -f $(DESTDIR)$(datadir)/applications/fs-uae.desktop
1862+
rm -f $(DESTDIR)$(datadir)/applications/net.fs_uae.FS-UAE.desktop
18631863
rm -Rf $(DESTDIR)$(datadir)/fs-uae
1864-
find $(DESTDIR)$(datadir)/icons/hicolor -name fs-uae.png -delete
1864+
find $(DESTDIR)$(datadir)/icons/hicolor -name net.fs_uae.FS-UAE.png -delete
18651865
find $(DESTDIR)$(datadir)/locale -name fs-uae.mo -delete
1866-
rm -f $(DESTDIR)$(datadir)/mime/packages/fs-uae.xml
1866+
rm -f $(DESTDIR)$(datadir)/mime/packages/net.fs_uae.FS-UAE.xml
18671867

18681868
clean-local:
18691869
rm -f fs-uae.dat

‎README.flatpak

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
For OpenGL, we need --device=dri. But using all for controllers. Ideally,
2+
there would be a better way to give access to joysticks. Also, this only
3+
works for controllers connected before starting the app.
4+
5+
Maybe we can mount the entire dev or something to get hotplugging working?
6+
7+
Sounds like the future is inputfd...

‎configure-minimal.sh

-63
This file was deleted.

‎docs/amiga-forever.md

+5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
# Amiga Forever
22

3+
TODO: Write about Amiga Forever 8 no longer using rom.key, and that it decrypts
4+
the ROMs on first startup!
5+
TODO: Also check when this change happened (Amiga Forever 8+?). Verified,
6+
the rom.key file is still used in Amiga Forever 7.
7+
38
You can purchase [Amiga Forever](https://www.amigaforever.com/) Plus or
49
Premium edition in order to get licensed versions of Kickstart ROMs for all
510
supported Amiga models.

‎example.conf renamed to ‎docs/examples/example.conf

File renamed without changes.

‎docs/faq.md

+5-1
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,13 @@ This page contains answers to some frequently asked questions.
44

55
## Can I donate towards FS-UAE development?
66

7-
You do not have to, but I have put up a donation page if you want to:
7+
I have put up a donation page if you want to chip in and help cover expenses:
88
[https://fs-uae.net/donate](https://fs-uae.net/donate) :)
99

10+
## What does FS stand for in FS-UAE?
11+
12+
https://eab.abime.net/showthread.php?t=98922
13+
1014
## Do joysticks work with FS-UAE on Fedora Linux?
1115

1216
Yes they do, but from Fedora 17 and onwards, you need to install an extra

‎docs/getting-started.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@ Amiga Forever comes with a selection of software and games, and there are
1919
several web sites with legal Amiga downloads:
2020

2121
- Full versions of many games:
22-
[http://www.amigafuture.de/downloads.php?cat=6](http://www.amigafuture.de/downloads.php?cat=6)
22+
[https://www.amigafuture.de/app.php/dlext/index?cat=6](https://www.amigafuture.de/app.php/dlext/index?cat=6)
2323
- [Team 17 games](http://www.dream17.info/downloads.php?cat=1)
2424
- [Gremlin games](http://gremlinworld.emuunlim.com/amiga.htm)
2525
- [Some Factor 5 games](http://www.factor5.de/downloads.shtml)
26-
- [List of downloadable games](https://openretro.org/reports/downloadable-games)
26+
- [List of downloadable games](https://openretro.org/reports/downloadable-games) on OpenRetro.org
2727

2828
When you start FS-UAE Launcher, it should be quite straight-forward how to
2929
select the floppy disk images and start the emulation :)

‎docs/input-mapping.md

+114
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
# Input mapping
2+
3+
All keyboard and joystick events can be mapped to any Amiga keyboard and joystick action, overriding default settings and (and the setup resulting from using the joystick_port_n options). A few examples of what you can do:
4+
5+
* Do you want the key ‘S’ on your keyboard to press the ‘R’ key on the Amiga keyboard? You can do this with custom input mapping.
6+
* Do you want to create a setup where you can play Pinball Dreams with a game pad? You can map game pad buttons to the Amiga keyboard F1, F2, F3, F4, cursor down, left shift and right shift keys.
7+
8+
General configuration
9+
10+
To map an action, you add a line like this to your configuration file:
11+
12+
devicename_eventname = actionname
13+
14+
Here is a specific example, mapping the keyboard key q to the fire button on the primary Amiga joystick (joy_1 is the joystick in joystick port 1):
15+
16+
keyboard_key_q = action_joy_1_fire_button
17+
18+
Input Actions
19+
20+
Examples of input actions are:
21+
22+
* action_joy_1_fire_button (fire button on joystick in port 1)
23+
* action_key_z (press amiga keyboard key Z)
24+
* action_drive_0_insert_floppy_0 (insert disk from floppy image list)
25+
26+
I have put the list of available actions on its own page due to the large
27+
number of actions.
28+
29+
Mapping Joystick Events
30+
31+
Here are the different types of event names you can use. joystick_0 is the first joystick connected, joystick_1 is the second, etc. Similarly, you can use button_0 (first button), button_1 (second button) and so on:
32+
33+
joystick_0_button_0
34+
joystick_0_axis_0_neg
35+
joystick_0_axis_0_pos
36+
joystick_0_hat_0_up
37+
joystick_0_hat_0_down
38+
joystick_0_hat_0_left
39+
joystick_0_hat_0_right
40+
41+
For most game pads with a proper universal configuration, you can use universal event names instead and make the configuration work identically even with different types of game pads connected. The above configuration is not suited for this, because button numbers have generally no relation to the physical placement of the game pad buttons.
42+
43+
Universal Event Names
44+
45+
With universal event names, you can map these events instead:
46+
47+
joystick_0_dpad_left
48+
joystick_0_dpad_right
49+
joystick_0_dpad_up
50+
joystick_0_dpad_down
51+
joystick_0_lstick_left
52+
joystick_0_lstick_right
53+
joystick_0_lstick_up
54+
joystick_0_lstick_down
55+
joystick_0_lstick_button
56+
joystick_0_rstick_left
57+
joystick_0_rstick_right
58+
joystick_0_rstick_up
59+
joystick_0_rstick_down
60+
joystick_0_rstick_button
61+
joystick_0_south_button
62+
joystick_0_west_button
63+
joystick_0_north_button
64+
joystick_0_east_button
65+
joystick_0_start_button
66+
joystick_0_select_button
67+
joystick_0_left_shoulder
68+
joystick_0_right_shoulder
69+
joystick_0_left_trigger
70+
joystick_0_right_trigger
71+
72+
Matching a Joystick Device
73+
74+
To match a specific joystick device, you can either (as in the above examples) match joystick by number:
75+
76+
joystick_0
77+
joystick_1
78+
joystick_2
79+
etc...
80+
81+
Or you can match devices by name:
82+
83+
logitech_dual_action_usb
84+
85+
The device name is the name of the device as it appears in your operating system, converted to lower case and all characters other than letters and numbers converted to underscores. Adjacent underscores are merged into one, and trailing underscores are stripped.
86+
87+
For instance, a device named:
88+
89+
Controller (Xbox 360 Wireless Receiver)
90+
91+
will be matched by:
92+
93+
controller_xbox_360_wireless_receiver
94+
95+
If you have more than game pad of the same model connected, you can match the other ones with:
96+
97+
logitech_dual_action_usb_2 (the second connected of this model)
98+
logitech_dual_action_usb_3 (the third connected of this model)
99+
etc...
100+
101+
More Examples
102+
103+
If you want to play Pinball Dreams with the first connected game pad, instead of using keyboard controls, you might want to map something like this:
104+
105+
joystick_0_left_shoulder = action_key_shift_left
106+
joystick_0_right_shoulder = action_key_shift_right
107+
joystick_0_north_button = action_key_f1
108+
joystick_0_dpad_down = action_key_cursor_down
109+
110+
Along with a few more actions, such as mappings for amiga keys F2, F3, F4 and Space.
111+
112+
## Mapping keyboard keys
113+
114+
See [keyboard mapping](keyboard-mapping.md).

‎docs/keyboard-joystick-emulation.md

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
# Keyboard joystick emulation
2+
3+
FIXME: This document must be updated with more information
4+
FIXME: This document must updated with markdown formatting
5+
6+
7+
When you emulate an Amiga joystick with your keyboard, the following keys are used to control the joystick:
8+
9+
Cursor keys controls the joystick stick.
10+
Right Ctrl or Right Alt controls the fire button.
11+
12+
When the keys are used to emulate the joystick, they will not activate the corresponding Amiga keys while you use this feature. So to use all Amiga features at the same time, a connected real joystick or gamepad is recommended, though it is usually not a problem. Most joystick-controlled games do not require the keyboard cursor keys to be used also…
13+
14+
When playing CD32 games with the keyboard emulating a gamepad, additional keys are used to control the addition buttons on the gamepad:
15+
16+
Cursor Keys – Controls the directional pad.
17+
C – Red
18+
X – Blue
19+
D – Green
20+
S – Yellow
21+
Return – Play
22+
Z – Rewind
23+
A – Forward
24+
Right Ctrl or Right Alt also controls the red button.

0 commit comments

Comments
 (0)