Commit Graph

479 Commits

Author SHA1 Message Date
raven02
0216f52359 Merge remote-tracking branch 'upstream/master'
Conflicts:
	UI/GameSettingsScreen.cpp
	UI/MenuScreens.cpp
	Windows/ppsspp.rc
2013-07-22 00:03:54 +08:00
raven02
87fc81e56d Consolidate Rendering Mode 2013-07-21 23:17:42 +08:00
Unknown W. Brackets
8717e745a8 Call SetCursor always on the UI thread.
Fixes #2862.
2013-07-21 02:21:50 -07:00
Unknown W. Brackets
6086b9f5e4 Allow selecting a range of in the debugger.
This way you can copy a bunch of diasm'd instructions.

Just quick range selection, not really proper.
2013-07-21 01:07:26 -07:00
raven02
39c6c7f634 Merge items to new UI 2013-07-20 22:03:52 +08:00
The Dax
ab59235367 Win32 UI: Fix minor texture filtering bug. Someone changed the default value from 0 to 1, so auto didn't actually do anything. 2013-07-20 08:52:46 -04:00
The Dax
28af84ba89 Capitalise all phrases in the key; I forgot it's a key value, eheh. 2013-07-19 20:36:58 -04:00
The Dax
0dd12765f8 Fix typos. 2013-07-19 20:27:34 -04:00
The Dax
9e535717f9 UI on all platforms(including NewUI!): Add options to change FramebufferCPUConvert without manual editing of INI file. 2013-07-19 19:23:17 -04:00
Henrik Rydgård
8f84907543 Merge pull request #2810 from papel/master
Check version of savestates and allow to open another game when we are not in the main menu
2013-07-18 12:08:50 -07:00
Henrik Rydgard
28ad8dc230 Lots of NewUI stuff (still experimental), fix back bug with x360 controllers 2013-07-17 22:27:50 +02:00
papel
99754bcd7a Merge branch 'master' of https://github.com/hrydgard/ppsspp 2013-07-17 02:33:53 -03:00
papel
9b6f1abed8 Version to savestate and open other game in other screens. 2013-07-17 02:33:26 -03:00
sum2012
76621d78d2 Fix for PPSSPP auto logging mode for Windows 64-bit
Thanks @pal1000
Fix https://github.com/hrydgard/ppsspp/issues/2785
2013-07-16 06:42:46 +08:00
Henrik Rydgard
09a7bd08fa Assorted UI cleanups. Add a bunch of little image files that may be used in the Ouya port later. 2013-07-15 17:41:24 +02:00
raven02
fa0af3c150 Back to use "Read Framebuffers to Memory" 2013-07-11 08:12:19 +08:00
The Dax
32bb4d7db5 Windows UI: Add INI option to allow emulator to start in fullscreen mode on launch. 2013-07-10 14:22:22 -04:00
Henrik Rydgård
4930c26082 Merge pull request #2723 from papel/master
More shortcuts for the Windows version
2013-07-10 10:30:04 -07:00
papel
abf2faec67 Put back savestate error message. 2013-07-10 13:45:26 -03:00
papel
1e0c0dbab9 Fix shortcuts in pause menu. 2013-07-10 11:49:48 -03:00
Henrik Rydgård
1edce69608 Merge pull request #2732 from Kingcom/Debugger
Highlight disabled breakpoints and use font sizes in more controls
2013-07-10 02:16:26 -07:00
Kingcom
f9f9429980 Make memory viewer and register list use the configurable font size 2013-07-10 11:10:08 +02:00
Kingcom
0eeebf5221 -display disabled breakpoints with separate icon
-toggling disabled breakpoints will enable them
-confirmation on toggling breakpoints with a custom condition
2013-07-10 10:56:03 +02:00
papel
314d286e37 Changed pause and speed shortcuts. Fixed disabled run on load. 2013-07-09 21:54:42 -03:00
Henrik Rydgard
34d1643213 Minor improvements to mouse handling in Windows.
* Don't lock the input_state mutex too much
* Capture the cursor so that the joystick follows the mouse even if you leave the window when holding down the mouse button.
2013-07-09 22:51:02 +02:00
papel
22de16d178 Improving shortcuts of Windows version. 2013-07-09 17:25:29 -03:00
Henrik Rydgard
43205362fd Fix mouse issues with newUI stuff in 1x mode 2013-07-09 14:46:48 +02:00
Kingcom
9a65263230 Merge branch 'master' of https://github.com/hrydgard/ppsspp into Debugger 2013-07-09 11:19:31 +02:00
Kingcom
98289b624a Make disassembly font size configurable 2013-07-09 11:17:57 +02:00
Henrik Rydgård
b25c85f135 Merge pull request #2709 from Kingcom/Debugger
Move breakpoint list to separate class
2013-07-08 09:04:46 -07:00
Kingcom
007e03a4d7 Move breakpoint list to separate class 2013-07-08 17:59:34 +02:00
Henrik Rydgard
f2e739992d More mousewheel support 2013-07-08 12:35:08 +02:00
Henrik Rydgård
476382d2cc Merge pull request #2692 from unknownbrackets/keymap-axis
Do axis keymap as well (should replace right stick bind)
2013-07-08 01:14:02 -07:00
Unknown W. Brackets
9d50579aa9 Add a context menu to play with threads. 2013-07-07 23:47:22 -07:00
Unknown W. Brackets
7f858d7263 Add a context menu to enable/disable breakpoints.
Probably it could edit or etc. too...
2013-07-07 23:28:35 -07:00
Unknown W. Brackets
d39662f291 Don't change the selected line when scrolling.
With the mouse wheel or otherwise, it's confusing.
2013-07-07 22:55:57 -07:00
Unknown W. Brackets
cb1b1164d1 Only send XInput analog on change. 2013-07-07 17:18:02 -07:00
Unknown W. Brackets
d9bfcce0de Switch to buttons instead of A/B/X/Y for dinput.
This way people don't say "but my X button shows up as L1."
2013-07-07 17:05:03 -07:00
Unknown W. Brackets
4f93d57186 Add a few more dinput axises since it's easy. 2013-07-07 16:28:36 -07:00
Unknown W. Brackets
4541a79d54 Send only changed analog sticks in dinput. 2013-07-07 16:10:21 -07:00
Unknown W. Brackets
3852e26558 Remove the force device setting, map instead. 2013-07-07 13:44:21 -07:00
Unknown W. Brackets
b3b2269536 Remove some dead code. 2013-07-07 13:43:53 -07:00
Unknown W. Brackets
e6f4f3a9ac Fix POV so it resets, cooperates with kbd.
Only resends on change.  DirectInput is all about polling, unfortunately.
We could use a separate thread and wait on events...
2013-07-07 13:43:28 -07:00
The Dax
0003b4d4dd Layout ApplyButtons to more closely resemble the XInput code. 2013-07-07 16:33:15 -04:00
The Dax
175223118a Make coding style consistent across entire DinputDevice.cpp file. 2013-07-07 16:28:42 -04:00
The Dax
82b3afe923 Fix more styling issues. 2013-07-07 16:25:23 -04:00
The Dax
d182a3388e Fix some styling issues, remove some old and irrelevant comments. 2013-07-07 16:19:55 -04:00
The Dax
c65a2eeda3 Fix default button mappings and incorrect axes(they are wrong on my controller, at least..).
TODO: Fix comments.

Also, is there no way to remove the hack for the special buttons..?
2013-07-07 16:19:55 -04:00
The Dax
c5ffd23fb1 Fix inverted buttons, and allow the special keys to be remapped[hopefully..]. 2013-07-07 16:19:55 -04:00
The Dax
9aaf4e5e08 Add RightStickBind support. It's still not 100% bug free... 2013-07-07 16:19:55 -04:00