Commit graph

228 commits

Author SHA1 Message Date
Ted Moseley
26d0cc010e Change setup.py to Setuptools and refactor bits of code
Earlier today I got a warning from Pip saying that ability to uninstall
programs that were installed using the Distutils module is going to be
depricated. So I decided to update everything over to Setuptools, which
is the new Python standard. While doing so, I ran the script through
flake8 and pylint a bit and took care of warnings not dealing with line
length or the lack of docstrings. I also took a bit of creative license
when I felt comfortable doing so to make the script more readable.
2017-03-17 00:13:44 -04:00
Milan Nikolic
f2a459bf39 Merge pull request #99 from HaraldB/master
Sanitize joystick names
2017-03-08 22:07:57 +01:00
Harald Brinkmann
791a10c9c4 Sanitize joystick names 2017-03-08 21:11:36 +01:00
Milan Nikolic
90b4aa16c4 Update README.md 2017-02-23 10:41:06 +01:00
Milan Nikolic
cb6be65751 Remove sdl2 lib 2017-01-19 05:22:48 +01:00
Milan Nikolic
6815bf9816 Prepare release 2017-01-19 05:22:02 +01:00
Milan Nikolic
a771c8b2b7 Move nvidia hack before import from QtOpenGL 2017-01-15 15:45:14 +01:00
Milan Nikolic
588fda8cd6 More input fixes 2017-01-15 15:34:55 +01:00
Milan Nikolic
1ec5358a2c Unbundle PySDL2 but keep a copy in src dir 2017-01-15 14:04:38 +01:00
Milan Nikolic
68e6f392cf Drop support for SDL1 2017-01-15 13:43:29 +01:00
Milan Nikolic
0efcbd72d6 Merge pull request #76 from water-works/alexgolec-fix-decode-null-input-tooltip
Handle null tooltips in the input plugin view
2016-07-06 09:12:35 +02:00
Alexander Golec
46480cd384 Handle null tooltips in the input plugin view 2016-07-05 23:43:06 -04:00
Milan Nikolic
80555dfbda Merge pull request #73 from jamezmoran/master
Fixing 'Unhandled Exception' issue when closing input config dialog.
2016-05-03 23:56:06 +02:00
James Moran
f1cc572d03 Fixing 'Unhandled Exception' issue when closing input config dialog. 2016-05-03 22:00:39 +01:00
Milan Nikolic
171bf9b795 fix indent 2016-04-23 19:25:34 +02:00
Milan Nikolic
39892f4c8d Merge pull request #72 from soreau/master
Assign input values from button widget text
2016-04-20 21:13:01 +02:00
Scott Moreau
6fe186e09d Assign input values from button widget text
After assigning values with a joystick in the input plugin configuration window,
none of the joystick values were written to the config file because the code
assumed the value to be a key and wrote the parameter only if the key value was
successfully decoded. This sets the button parameters from the widget text if
the value could not be decoded as an sdl key and fixes the problem mentioned
in issue #2 regarding joysticks:

"I just installed and tried the latest release and I can confirm that it still
occurs, but only for USB controller inputs. That is: It will save my settings
if I assign keyboard keys to the N64 controller buttons, but not if I assign
USB controller buttons to N64 controller buttons. Those will revert to their
previous values as soon as I close the input configuration window."
2016-04-20 12:59:38 -06:00
Milan Nikolic
010b279fea Merge pull request #65 from conchurnavid/debian
import debian package from Debian's pkg-games team
2015-12-19 22:33:53 +01:00
Conchúr Navid
1ed857fcea import debian package from Debian's pkg-games team
The pkg-games team in debian prepared a package under
https://anonscm.debian.org/cgit/pkg-games/mupen64plus-ui-python.git/ - this
one can be also be used to build the m64py*.deb from the upstream
repository. The Debian specific patches were dropped and the code to create
a version number based on the version number in the code was readded.
2015-12-19 17:40:27 +01:00
Milan Nikolic
3a2a39fba7 Merge pull request #61 from alexhenrie/master
fix QKeySequence crash
2015-10-23 07:26:23 +02:00
Alex Henrie
6179216d89 fix QKeySequence crash 2015-10-22 20:00:15 -06:00
Milan Nikolic
56be5ba946 Merge pull request #51 from milseg/master
UnicodeDecodeError corrected
2015-06-02 09:04:44 +02:00
milseg
837ab480eb UnicodeDecodeError corrected
I've got an UnicodeDecode error for the ascii codec while logging a message while running m64py on Ubuntu versions 14.04+. Adding two lines corrected the problem
2015-05-14 23:27:05 -03:00
Milan Nikolic
ebf5dd44ec prepare release 2015-05-04 21:54:27 +02:00
Milan Nikolic
0ca8f8a677 update authors 2015-05-04 14:39:06 +02:00
Milan Nikolic
786b41a481 portable zip build 2015-05-04 14:04:15 +02:00
Milan Nikolic
758fb9f4a1 add vsync option 2015-04-27 12:49:26 +02:00
Milan Nikolic
33eda07d38 update ui files 2015-04-27 12:38:09 +02:00
Milan Nikolic
7c426c8101 always add glwidget to stack 2015-01-02 19:06:33 +01:00
Milan Nikolic
2a06f5088f handle custom resolutions 2015-01-02 19:01:33 +01:00
Milan Nikolic
aea77ba059 toggle vidext without restart 2015-01-02 18:00:52 +01:00
Milan Nikolic
f1188bfe52 encode devicename 2015-01-02 15:58:56 +01:00
Milan Nikolic
a84d0a9301 Merge pull request #39 from conchurnavid/semi-auto
save input-sdl device name to allow correct auto-configuration
2015-01-01 13:15:10 +01:00
Conchúr Navid
7b58bfa213 save input-sdl device name to allow correct auto-configuration 2015-01-01 10:53:26 +01:00
Milan Nikolic
63147f26da force ini file on windows and osx 2014-12-26 13:18:20 +01:00
Milan Nikolic
e6c9ed2d11 build exe with python3/pyqt5 2014-12-21 16:27:11 +01:00
Milan Nikolic
3e23697c43 fix file_path 2014-12-21 02:56:40 +01:00
Milan Nikolic
2c21ef546a handle better paths change 2014-12-21 00:39:33 +01:00
Milan Nikolic
3bd350d52f clean __pycache__ dir 2014-12-20 23:04:46 +01:00
Milan Nikolic
1c6983a611 remove main() function per recommendation http://pyqt.sourceforge.net/Docs/PyQt5/pyqt4_differences.html#object-destruction-on-exit 2014-12-20 22:37:56 +01:00
Milan Nikolic
e59fcb73a3 xlib XinitThreads is no longer needed 2014-12-20 22:32:18 +01:00
Milan Nikolic
dd737d1c01 sip.setapi is no longer needed 2014-12-20 22:20:14 +01:00
Milan Nikolic
2c1ec337a5 don't import all from PyQt5 2014-12-20 22:03:03 +01:00
Milan Nikolic
95198d2a68 remove unused import 2014-12-20 21:57:09 +01:00
Milan Nikolic
20ecf25ca0 move romreader to separate file 2014-12-20 21:12:29 +01:00
Milan Nikolic
8c393c96aa truncate label in statusbar 2014-12-20 20:52:21 +01:00
Milan Nikolic
6eca049a0f adapt QFileDialog for Qt5 2014-12-20 19:55:35 +01:00
Fayvel Victor
0751e24e35 pyqt5
Signed-off-by: Milan Nikolic <gen2brain@gmail.com>
2014-12-20 19:52:40 +01:00
Milan Nikolic
6ea9a7a8e7 select first row after refreshing romlist 2014-12-20 18:12:05 +01:00
Milan Nikolic
84fce23417 Python 3 support 2014-12-20 18:04:01 +01:00