Commit Graph

1018 Commits

Author SHA1 Message Date
Unknown W. Brackets
f5ee058fbc Oops, fix debug build. 2013-09-28 12:21:20 -07:00
Henrik Rydgård
98f0f2692b Merge pull request #3948 from thedax/win32DeadlocksTake2
Win32 Deadlocks Part 2: Stop should do the same things Reset does.
2013-09-28 12:18:03 -07:00
Henrik Rydgård
b0189b9557 Merge pull request #3942 from Kingcom/GEDebugger
Add tab control to GEDebugger (and more)
2013-09-28 12:08:27 -07:00
Kingcom
72faf8c8ab Move tab control into separate class 2013-09-28 20:57:02 +02:00
Kingcom
c4dbe37444 Add function to add a Dialog tab 2013-09-28 17:23:14 +02:00
Kingcom
478962ae2c Resize GEDebugger and save position 2013-09-28 16:04:56 +02:00
Kingcom
513223ea4f -Step through display list with F10/F11
-accelerator changes
2013-09-28 14:34:08 +02:00
Unknown W. Brackets
da1d700904 Attempt to support rendering depth/stencil.
But no interface yet.  I can't tell if it works, I just get black...
2013-09-28 02:38:05 -07:00
Kingcom
b6d49f09bc Merge branch 'master' of https://github.com/hrydgard/ppsspp into GEDebugger
Conflicts:
	Windows/GEDebugger/GEDebugger.cpp
	Windows/GEDebugger/GEDebugger.h
	Windows/ppsspp.rc
	Windows/resource.h
2013-09-28 10:39:28 +02:00
Unknown W. Brackets
4b9056fa02 Shutdown cleanly even when GE debugger is paused. 2013-09-28 00:32:45 -07:00
Unknown W. Brackets
2a75ad2ebf Ignore framebuffer alpha in preview, often 0. 2013-09-27 23:52:06 -07:00
Unknown W. Brackets
6f6013a6f8 Add a separate button to step by op/cmd. 2013-09-27 23:46:04 -07:00
Unknown W. Brackets
ba289c1e73 Show alpha in textures in the GE debugger. 2013-09-27 23:36:23 -07:00
Unknown W. Brackets
d734b59904 Add a preview for the current texture as well. 2013-09-27 22:46:09 -07:00
Henrik Rydgård
05fda6e8c7 Merge pull request #3936 from thedax/win32ReduceOSMSpam
Win32: Only show the resolution information at certain times.
2013-09-27 15:29:08 -07:00
The Dax
1427aefccb Make fullscreen info conditional. Don't show it if the Resolution Mode isn't Auto. 2013-09-27 15:34:13 -04:00
The Dax
ab71517fd0 Rename StopEmulation to WaitForCore. 2013-09-27 13:34:22 -04:00
The Dax
586ca3e838 Stop should do the same things reset does(in terms of core stepping and stopping), so let's re-factor that code into a function. 2013-09-27 12:32:15 -04:00
Kingcom
c86d3b81d9 Some more changes 2013-09-27 18:03:08 +02:00
Kingcom
7945f5cb7f Make GEDebugger the parent, not the tab control 2013-09-27 15:38:20 +02:00
Kingcom
68edc4ffcf Add tab control to GEDebugger 2013-09-27 13:11:11 +02:00
The Dax
adead8ea31 Fix deadlocks when games hang with Stop, Reset, and Enable Cheats. 2013-09-26 22:44:29 -04:00
The Dax
7fde11af5f Don't show resolution info when entering/exiting fullscreen. It's not really necessary. 2013-09-26 19:44:06 -04:00
The Dax
e4a1d02f4e Make savestate slot message translatable, and shorten it so it can be more language neutral in word order("Using savestate slot %d" -> "Savestate slot: %d"). 2013-09-26 19:00:30 -04:00
The Dax
24d587c991 Adjust a few calls. Display fullscreen/normal resolution mode info only one time. 2013-09-26 17:50:30 -04:00
The Dax
83a168c25e Win32: Only show the resolution information when selecting resolution sizes or window sizes from the Settings menu. 2013-09-26 17:46:11 -04:00
Henrik Rydgård
49a72a4bfa Merge pull request #3926 from Kingcom/GEDebugger
Highlight stall address
2013-09-26 03:34:11 -07:00
Kingcom
94b04d7326 Highlight stall address with a red background 2013-09-26 12:31:58 +02:00
Kingcom
124b11f29d Highlight stall address 2013-09-26 10:24:41 +02:00
The Dax
a15ba1322d Move GetLangValuesMapping out of MiscScreens.cpp so it can be used globally. 2013-09-25 21:06:58 -04:00
shenweip
eb33037f3c Fix a bug that mouse cannot work correctly when maximize the window from 1x window size. 2013-09-26 00:19:13 +08:00
Kingcom
98f4273dcc Simple display list view 2013-09-25 15:24:53 +02:00
Kingcom
443f9bdfd5 Fix spaces 2013-09-24 20:11:42 +02:00
Kingcom
312f957963 Change how SimpleGLWindow is constructed and move it to the resource file 2013-09-24 20:06:25 +02:00
Henrik Rydgård
216ccbb94b Merge pull request #3901 from thedax/win32FixFullScreenAgain
Win32: Fix 2 fullscreen bugs
2013-09-24 01:12:17 -07:00
Unknown W. Brackets
4cae7bf8d3 Defer initialization of the GE dbg preview.
Maybe it's causing slowdown on some cards to init a new context?
2013-09-23 23:45:37 -07:00
Unknown W. Brackets
a528f797b1 32-bit warning fixes in the debugger/win UI. 2013-09-23 23:44:58 -07:00
The Dax
5b1a2cbafd Bring factor back, but only apply it in windowed mode. 2013-09-23 23:56:32 -04:00
The Dax
f9ed9928a9 Fix mouse events not working when switching from 1x window size to fullscreen mode. 2013-09-23 23:08:46 -04:00
The Dax
d5478af3c7 Remove redundant _ViewFullScreen call. 2013-09-23 23:01:26 -04:00
The Dax
f989b3daf8 Use g_Config.bFullScreen, not a global variable in WndMainWindow.cpp. Also, fix backward logic. 2013-09-23 17:45:43 -04:00
Henrik Rydgård
2a16b9d3bb Merge pull request #3889 from unknownbrackets/debugger
Initially usable GE debugger
2013-09-23 02:07:40 -07:00
Unknown W. Brackets
2b28bdbea0 Fix 32-bit ge debugger (broken cond vars.) 2013-09-23 01:19:13 -07:00
Unknown W. Brackets
6a313ac204 Support flipped and not flipped buffers. 2013-09-22 22:37:37 -07:00
Unknown W. Brackets
47b43e997f Support 16 bit buffers in the GE debugger too. 2013-09-22 22:25:55 -07:00
Unknown W. Brackets
0ad5bcf1df Center the display on top of the checkerboard. 2013-09-22 20:40:13 -07:00
Unknown W. Brackets
4021acd3f8 Draw a checkerboard pattern behind the image. 2013-09-22 20:36:58 -07:00
Unknown W. Brackets
6073317591 Support render res. above 1x in ge debugger. 2013-09-22 20:14:31 -07:00
Unknown W. Brackets
a7f9723528 Warning fixes. 2013-09-22 19:06:01 -07:00
Unknown W. Brackets
d38916dea7 Add a quick and dirty render preview.
Now it's actually semi useful already.
2013-09-22 19:05:33 -07:00
Henrik Rydgård
e7d906c8f7 Merge pull request #3886 from thedax/win32FixOffscreenBug
Win32: Move PPSSPP back onto the screen if it's offscreen when opening.
2013-09-22 15:17:51 -07:00
The Dax
17afe43ce5 Make the changes more multi-monitor friendly. Credit goes to [Unknown]. 2013-09-22 16:05:17 -04:00
The Dax
bb7e6f2494 If WindowWidth or WindowHeight are <= 0, fix them. 2013-09-22 15:01:58 -04:00
The Dax
8ccb4cc863 Move PPSSPP back onto the primary monitor if it's offscreen when opening. 2013-09-22 14:44:35 -04:00
Unknown W. Brackets
2ad5167f75 Better to have its own directory. 2013-09-22 11:03:29 -07:00
Unknown W. Brackets
18b70c89ef Add an initial GE debugger interface on Windows. 2013-09-22 10:27:09 -07:00
Kingcom
595693cacb Scan after assembling 2013-09-22 13:04:31 +02:00
Kingcom
86cba76bb2 Crash fix and more scanning 2013-09-22 13:00:25 +02:00
Kingcom
1c219e9b65 Remove useless comment... 2013-09-22 12:24:12 +02:00
Kingcom
2d496791ab Sort branch lines to prevent conflicts 2013-09-22 12:20:33 +02:00
Kingcom
d56ade56ae -don't use typedefs
-clear functions on NotifyMapLoaded
2013-09-22 11:09:11 +02:00
Kingcom
ea397351c3 Better branch lines 2013-09-22 11:00:44 +02:00
Unknown W. Brackets
eba903f9db Stop jumping to pc after setting a breakpoint. 2013-09-21 08:24:24 -07:00
The Dax
3c1c7aade8 Just call ResizeDisplay(true) inside SetInternalResolution. 2013-09-19 23:27:25 -04:00
The Dax
3eedc9cb6d Eliminate some magic numbers, and make several functions more consistent with each other. 2013-09-19 21:18:26 -04:00
The Dax
30da5d1ba2 Fix Rendering Resolution mode bug where the shortcut(currently CTRL + 1) wouldn't be synchronized with its DesktopUI(win32 menu bar) counterpart. First discussed in https://github.com/hrydgard/ppsspp/pull/3834. 2013-09-19 14:32:56 -04:00
The Dax
01ab8b7555 Fix x64 debug build. 2013-09-17 10:27:06 -04:00
The Dax
d102baacd0 Prep PPSSPP for Visual Studio 2013. 2013-09-17 10:27:06 -04:00
Henrik Rydgård
db92f26e56 Merge pull request #3806 from thedax/win32UITranslation
Win32 UI: Rewrite most of the menu translation code to be cleaner and simpler.
2013-09-17 06:43:24 -07:00
danyalzia
7c0292f466 Update ppsspp.rc 2013-09-17 13:07:24 +05:00
danyalzia
b17ce7bfb1 Update resource.h 2013-09-17 13:05:19 +05:00
danyalzia
46b022ac98 Update WndMainWindow.cpp 2013-09-17 13:02:34 +05:00
The Dax
e6d85cfb39 Rename Config::languageIni to Config::sLanguageIni for consistency. 2013-09-16 19:47:25 -04:00
The Dax
283599c7f1 Remove unneeded lines. 2013-09-16 19:24:49 -04:00
The Dax
ee3f9a6979 Use consistent pointer names. 2013-09-16 18:55:06 -04:00
The Dax
426e6630d9 Rewrite most of the translation stuff to be cleaner.
Also fix a bug where in-game only menu items become enabled after selecting a language when we're in various NewUI menus.
Rename Config::ilanguage to Config::iLanguage for consistency with other Config variables.
2013-09-16 18:45:09 -04:00
Henrik Rydgård
9f063fcbe9 Merge pull request #3798 from unknownbrackets/dx9
Fix directx9 so it builds on Windows (but doesn't work)
2013-09-15 23:28:05 -07:00
Unknown W. Brackets
5617f07462 Fix dx9 so it builds on Windows (DOES NOT WORK.) 2013-09-15 23:22:10 -07:00
kaienfr
c3904ef873 Windows: Update g_Config.ilanguage for ppsspp.ini [SystemParam] Language key
This key is important to be updated for multilang game.
2013-09-16 03:30:54 +02:00
Henrik Rydgård
a4d040beff Merge pull request #3785 from thedax/moreCommandLineOptions
Win32: Add command-line arguments to allow different ppsspp/control ini files.
2013-09-15 15:21:45 -07:00
Henrik Rydgård
a500ff3191 Merge pull request #3781 from shenweip/master
Fix some double semicolon.
2013-09-15 15:07:25 -07:00
Unknown W. Brackets
2251b0dd59 Avoid a "pure call" issue. 2013-09-15 10:36:19 -07:00
The Dax
11a49c05fe Build fix. 2013-09-15 13:12:55 -04:00
The Dax
35c434165b Correct copy & paste-happiness. 2013-09-15 12:55:49 -04:00
The Dax
5cdfb6c4f9 Add command-line argument to allow a path to be specified for configuration files and control mapping files. Also fix a possible crash when loading ini files. 2013-09-15 12:50:42 -04:00
Unknown W. Brackets
8902e85f0a Enable the debug windows always, disable buttons.
This way you can close them/whatever, and hopefully should avoid crashes.

Only downside is you can't pause the game now and then hit stop in the
debugger.
2013-09-15 09:35:58 -07:00
shenweip
03197c376c Fix some double semicolon. 2013-09-15 23:17:22 +08:00
Henrik Rydgard
8c4503c638 Add a micro version of the DX SDK as submodule, to keep the buildbot running. 2013-09-15 16:15:12 +02:00
Henrik Rydgard
9f99815121 Must detect language before loading config. Should fix #3763 broken by #3750 . 2013-09-15 11:05:05 +02:00
Henrik Rydgård
f26dfcb382 Merge pull request #3755 from thedax/win32RememberWindowPosSize
Win32: Don't allow SavePosition to execute if we're entering fullscreen.
2013-09-15 00:27:15 -07:00
Henrik Rydgård
588d3e3c4f Merge pull request #3758 from thedax/win32Cleanup
Win32 UI: Some cleanups and simplifications, fix some small bugs.
2013-09-15 00:26:07 -07:00
The Dax
efa2c1c500 Use consistent directory slashes. We'll just replace all backslashes with forward slashes, eliminating the chance of duplicat recents. Fixes #3352. 2013-09-15 00:08:53 -04:00
The Dax
0f0df36180 Don't SavePosition if we're entering fullscreen. 2013-09-14 12:51:15 -04:00
The Dax
877ea42125 Re-apply the top-most state to its previous value when exiting fullscreen. 2013-09-14 12:49:51 -04:00
The Dax
8092a9c67c Using SetWindowText should be safe now since we use UNICODE..thanks Gigaherz & Unknown. 2013-09-14 12:49:50 -04:00
The Dax
975b8cf7e7 Post a message when the window title's text needs to change. This resolves #3282. 2013-09-14 12:49:50 -04:00
The Dax
670d0c35fe Remove a few more unused things. 2013-09-14 12:49:50 -04:00
The Dax
e8fd5881b8 Move global UI status out of WndMainWindow.cpp, simplify the menu translation code(it doesn't need to dictate checked or enabled items, the UI already does it later on anyway), and clear out a few old menu items that have been removed. 2013-09-14 12:49:50 -04:00
Unknown W. Brackets
606e2f2802 Small warning fixes in Windows UI. 2013-09-14 07:44:01 -07:00
The Dax
e4079fb81c Remove the System Menu(the menu that appears when alt is pressed) in fullscreen, and re-instate it when exiting fullscreen. 2013-09-12 17:27:48 -04:00
The Dax
9dbf2b9d90 Add proper fullscreen and windowed launch arguments. Remove bFullScreenOnLaunch. 2013-09-12 16:56:18 -04:00
Henrik Rydgard
c88920be4b Bail more gracefully if no real OpenGL driver is installed on XP 2013-09-11 21:35:44 +02:00
wuspring
85baa92504 Make new keys in "Window Size" translatable and fix Ctrl+1, thanks to @thedax 2013-09-11 11:41:30 +08:00
Henrik Rydgard
2745744d99 Split the resolution setting into Window Size and Rendering Resolution (internal resolution).
Gets rid of our "antialiasing" (simply crank up internal resolution to 2x your window size).

Proper MSAA is coming later.
2013-09-11 00:19:34 +02:00
Unknown W. Brackets
035f5660e4 Silence a minor warning. 2013-09-08 11:59:51 -07:00
Henrik Rydgård
b711d66f6e Merge pull request #3690 from Kingcom/Reset
Reset while stepping improvements
2013-09-08 02:09:29 -07:00
Kingcom
2ecbabd815 Reset while stepping improvements 2013-09-08 10:04:39 +02:00
The Dax
ac88cbd894 Let NewUI's Antialiasing option be instant so a game reboot isn't required. 2013-09-08 00:27:39 -04:00
The Dax
062e803f03 Make More Settings and Control Mapping translatable. 2013-09-07 18:04:16 -04:00
The Dax
79846abcbd Set the UI state to MENU so that the pause/reset/stop buttons disable appropriately. 2013-09-07 17:54:12 -04:00
The Dax
e7add9fac6 Update the menus after translating them. Should fix the pause/reset/stop options when exiting out of the game settings screen. 2013-09-07 17:22:40 -04:00
The Dax
f594157374 Overhaul the Win32 UI. New things include:
-File -> Savestate Slot: Lets the user pick the savestate slot to be used.
-Game Settings -> More Settings...: Opens the main settings screen from anywhere.
-Game Settings -> Control Mapping...: Opens the key mapping screen from anywhere.
-Infrequently changed options were removed.
-Organised menus; nothing is out of place anymore.
-Simplified menus: as some options were removed or moved, it's easier to find what you're looking for, now.
2013-09-07 17:05:23 -04:00
Henrik Rydgård
9fa83981ce Merge pull request #3677 from unknownbrackets/logging
Move some things to G3D, enable G3D by default on Windows
2013-09-07 13:49:31 -07:00
Unknown W. Brackets
ca1168df3c Enable the G3D log on Windows by default. 2013-09-07 13:43:07 -07:00
Kingcom
31a8a04675 Fix BrowseForFolder 2013-09-07 22:32:29 +02:00
Unknown W. Brackets
08b41df6a2 Change a few more log types. 2013-09-07 13:31:14 -07:00
Unknown W. Brackets
f97794136c Use a UI event for clearing recents.
This way it builds on Android, and is cross platform too.
2013-09-07 09:44:28 -07:00
Henrik Rydgård
f24a7c83f5 Merge pull request #3636 from kaienfr/fix_recent_gamelist
Update recent games list & remove redundant recent games from ini file
2013-09-07 02:18:30 -07:00
Henrik Rydgård
119bbcbe1f Merge pull request #3654 from papel/patch2
Change encoding of ppsspp.rc
2013-09-06 05:02:46 -07:00
shenweip
314ff14e87 Typo 2013-09-06 11:15:38 +08:00
papel
942cf9a57f Change encoding of ppsspp.rc 2013-09-05 21:48:32 -03:00
shenweip
c27d248c9a Add check mark in language menu item 2013-09-06 07:57:52 +08:00
kaienfr
137df18a00 Update recent games list & remove redundant recent games from ini file 2013-09-05 18:23:28 +02:00
papel
0d5994c4df Fix number 2013-09-04 22:06:05 -03:00
papel
2e48f5d32b Fix frameskip in Windows UI 2013-09-04 21:37:41 -03:00
The Dax
137628e0ba Translate "PPSSPP Chinese Forum" from [DesktopUI], not [PSPCredits].
This will let the text have a keyboard shortcut. I forgot about that part.
2013-09-04 12:44:12 -04:00
The Dax
24ead6c9c4 Append by command, not position. Seems to have no functional difference, but I'm correcting it more
for semantics.
2013-09-04 11:14:39 -04:00
The Dax
45902894ba Rename a few variables relating to the Language menu. 2013-09-04 11:11:18 -04:00
The Dax
802cb7d194 Win32 UI: Create Help menu dynamically.
Allows for menu items to be added easily at run-time(for things like the Chinese forum, etc.).
2013-09-04 11:03:13 -04:00
kaienfr
27816f9d93 Show accelerator Ctrl+M for menu Memory viewer. 2013-09-04 15:55:52 +02:00
The Dax
a582ca2034 Move a few things around. 2013-09-04 08:41:57 -04:00
The Dax
55de73d05d Move Language up to be a main menu item. It doesn't really belong anywhere else currently, but it could be moved later after the upcoming DesktopUI reorganization. 2013-09-04 08:28:04 -04:00
The Dax
3f6361831e Rename "System Language" to just "Language". 2013-09-04 08:00:50 -04:00
The Dax
e0b33d818f Create the separator one position above the System Language menu instead of appending it. 2013-09-04 08:00:50 -04:00
The Dax
ece5173b82 memset the MENUITEMINFO just to be safe. 2013-09-04 08:00:50 -04:00
The Dax
02a4079540 Clarify a comment. 2013-09-04 08:00:50 -04:00
The Dax
7452a54e1b Reorder the enum slightly. 2013-09-04 08:00:50 -04:00
The Dax
aebd5156a5 Win32 UI: Add a System Language menu that's dynamically created. Also fix several small bugs where the UI wouldn't switch languages on the Pause screen, and in a couple other spots. 2013-09-04 08:00:50 -04:00
Henrik Rydgard
18c2342ea9 Move unicode text out to assets/langregion.ini . Gah. 2013-09-04 13:25:57 +02:00
Henrik Rydgard
ad620e463a Detect language on first boot on Windows (Vista+) and Android 2013-09-04 12:08:22 +02:00
Henrik Rydgard
ae92e75281 Windows: Create opengl context with stencil buffer 2013-09-04 11:31:59 +02:00
Henrik Rydgard
c845da2887 Switch System_GetName to System_GetProperty 2013-09-04 11:31:40 +02:00
Henrik Rydgård
728e1a559a Merge pull request #3533 from kaienfr/fix_disasm_memview
Fix disasm windows and mem windows who have not been enabled on show
2013-09-03 05:46:23 -07:00
The Dax
19f33b9404 Win32: Fix rc file by correcting Henrik's surname, and properly setting PPSSPP's version to 0, 0, 9, 1. 2013-09-02 15:22:51 -04:00
Kingcom
e1b23dacfb Fix ppsspp.rc encoding 2013-09-02 18:51:27 +02:00
danyalzia
05a6c48069 Update ppsspp.rc 2013-09-02 18:36:48 +05:00
danyalzia
ca99a33ccf Update WndMainWindow.cpp 2013-09-02 18:33:00 +05:00
Henrik Rydgård
2bc373eaa0 Merge pull request #3558 from unknownbrackets/reporting
Disable reporting w/ "Read Framebuffers" and refresh UI on lang change
2013-09-01 14:58:09 -07:00
Kingcom
76379fd2d2 Fix "stuck" control key in memory view 2013-09-01 23:13:19 +02:00
Unknown W. Brackets
110f9513ca Fix multiple windows UI translations.
Just keep track of the original values used as keys.
2013-09-01 14:06:24 -07:00
Unknown W. Brackets
24ecf9416c Update language immediately in UI. 2013-09-01 13:29:23 -07:00
Kingcom
8e07f83a71 Forgot to revert that. 2013-09-01 18:47:58 +02:00
Kingcom
9e28febfe4 Search in memory view 2013-09-01 18:43:41 +02:00
Kingcom
2a56694626 Display proper error messages when assembling failed 2013-09-01 10:21:05 +02:00
Unknown W. Brackets
b558189c37 Just invalidate blocks on ClearCacheAt().
This makes it safe to call from a jitted syscall, etc.
2013-09-01 00:32:43 -07:00
Unknown W. Brackets
0c93baa1df Prevent a crash in debugger without jit. 2013-09-01 00:32:42 -07:00
kaienfr
cfad59591e fix disam windows and mem windows who are not been enabled on show
This block the windows on screen and can not be closed.
2013-08-31 19:33:49 +02:00
Unknown W. Brackets
65c3206da4 Oops, fix reversed paused menu item. 2013-08-30 22:51:49 -07:00
Unknown W. Brackets
c23e904a1b Use consistent conventions on default menu names. 2013-08-30 22:44:36 -07:00
Unknown W. Brackets
5dea33baa1 Put all Windows UI translation strings in same cat.
Rationale: non-English may often need to use "NON-ENGLISH (&X)" for menus,
to get shortcuts properly identified.  Ignoring ampersands makes this
"NON-ENGLISH ()", which is a poor experience.

Also, it should allow better consistency in the menu capitalization.
2013-08-30 22:40:50 -07:00
Unknown W. Brackets
0e7aa6fc6d Fix debug counter, not supported in wsprintfW. 2013-08-30 22:25:12 -07:00
Unknown W. Brackets
2ce6f7121b Fix an appverif warning with an unused item. 2013-08-30 22:18:37 -07:00
Unknown W. Brackets
831c6c28f1 Fix bad bitwise precedence, wrong checking. 2013-08-30 22:16:41 -07:00
Unknown W. Brackets
92c4c5825f Update ui menus AFTER loading lang ini. 2013-08-30 22:12:04 -07:00
The Dax
6f213b3bfc Reinstate some ampersand shortcuts in the RC file, and move TranslateMenuItemByText up with the other translation stuff. A lang pullrq will follow shortly to re-instate the rest. 2013-08-30 17:29:22 -04:00
Henrik Rydgard
73dd1c4b8d Remove accidentally added return from TranslateMenus 2013-08-30 23:07:42 +02:00
Kingcom
faf28a17a2 Merge branch 'master' of https://github.com/hrydgard/ppsspp
Conflicts:
	Windows/ppsspp.rc
2013-08-30 20:57:52 +02:00
Kingcom
42c30d521c -new accelerators for the Debugger
-copy address on right click in memory view
-don't change status bar text after activating the breakpoint window
2013-08-30 20:55:58 +02:00
Henrik Rydgård
30d8d5cdff Merge pull request #3509 from kaienfr/ppsspp_fix_translation_1
Fix mune translation from ini (run/pause) button translation
2013-08-30 11:49:02 -07:00
kaienfr
a29464f451 add s to "Read Framebuffer To Memory (CPU)", "Read Framebuffer To Memory (GPU)" in rc
Unified two keys:
"Read Framebuffer To Memory (CPU)", "Read Framebuffer To Memory (GPU)"
as  "Read Framebuffers To Memory (CPU)" and "Read Framebuffers To Memory
(GPU)"
used in ini file.
2013-08-30 20:19:40 +02:00
Henrik Rydgard
9ac2cb92ba android buildfix 2013-08-30 20:19:03 +02:00
kaienfr
7c3f7a2324 Fix mune translation from ini (run/pause) buttion 2013-08-30 20:15:13 +02:00
Henrik Rydgard
0d0b43818c Warning fixes and stuff 2013-08-30 20:14:16 +02:00
The Dax
6ddccae5b9 Win32 UI: Tiny cleanup and add a few comments to clarify a few things regarding the translation stuff. 2013-08-30 10:42:00 -04:00
Henrik Rydgård
5b027fec96 Merge pull request #3495 from thedax/master
Fix yet another small error. This time it's Rendering Resolution.
2013-08-30 07:04:37 -07:00
The Dax
546075198f Fix yet another small error. This time it's Rendering Resolution. 2013-08-30 09:52:45 -04:00
Henrik Rydgård
b99be482bf Merge pull request #3494 from thedax/master
Win32 UI: Fix incorrect translation of Atrac3+ sound, and some accelerator key strings.
2013-08-30 06:47:23 -07:00
The Dax
272598fbf5 Fix Read Framebuffer To Memory (CPU)/(GPU). 2013-08-30 09:45:57 -04:00
The Dax
afea54f3dc Fix incorrect translation of Atrac3+ sound, and some accelerator key strings. 2013-08-30 09:39:34 -04:00
Henrik Rydgard
e8d0376090 Crashfix in menu translation code 2013-08-30 15:27:16 +02:00
The Dax
5120a6ee73 Fix some incorrect things. 2013-08-30 09:01:51 -04:00
The Dax
d765d8783b Tidy the code. 2013-08-30 09:01:50 -04:00
The Dax
a42b780141 Change a few menu texts so that they don't need to be translated. 2013-08-30 09:01:50 -04:00
The Dax
64984c5991 Use a timer to translate PPSSPP, then turn it off. 2013-08-30 09:01:50 -04:00
The Dax
a6e21bd85a Make submenus(Rendering Mode, Rendering Resolution, etc.) translatable. 2013-08-30 09:01:50 -04:00
The Dax
2f2c313b54 Make Win32 UI translatable. Remove all ampersand accelerators; they're not really needed, however, some can of course be added back in. 2013-08-30 09:01:50 -04:00
Henrik Rydgård
20de318acd Merge pull request #3491 from wuspring/master
Update about "Read Framebuffers To Memory (CPU) " setting string.
2013-08-30 02:42:09 -07:00
wuspring
bda50e4401 About "Read Framebuffers To Memory (CPU) "
make sure the source and ini have the same keyword
2013-08-30 17:22:29 +08:00
wuspring
1b74211872 delete tmp 2013-08-30 16:06:34 +08:00
wuspring
453b7d60cf shorten key. 2013-08-30 15:08:17 +08:00
papel
d22e555e4f Fix volume and name of Latin American languages. 2013-08-29 13:25:29 -03:00
Unknown W. Brackets
49dc9803bb Avoid a debug warning with wstrings. 2013-08-29 00:41:43 -07:00
Kingcom
8a5ba1e406 Fix clipboard type 2013-08-28 09:59:08 +02:00
Henrik Rydgård
5002979fc6 Merge pull request #3447 from thedax/master
Cleanup: Remove some unused options, and move some out of the "These are broken" section.
2013-08-27 14:42:47 -07:00
The Dax
d583732e0e Remove some unused options, and move one out of the "These are broken" section. 2013-08-27 17:36:04 -04:00
Henrik Rydgard
ee6f2613a8 Win32: Ask for destination alpha in the OpenGL context. Fixes some issues in non-buffered rendering, see #3436.
This apparently still happens on Android so will need to fix it separately there.
2013-08-27 16:25:44 +02:00
The Dax
05b860c167 Win32: Update OSK bypass with Unicode/wchar/wstring support. 2013-08-27 07:36:46 -04:00
Henrik Rydgård
87c1dc3dd9 Merge pull request #3420 from Kingcom/Debug
Don't recreate debug windows
2013-08-27 01:48:01 -07:00
Unknown W. Brackets
8ccd3773d9 Open files using wide functions on win32.
Fixes #3432.
2013-08-27 00:28:46 -07:00
Unknown W. Brackets
18792f64f9 Fix debugger wstring usage. 2013-08-26 23:54:48 -07:00
Henrik Rydgard
b6ce0b3d3b Fix some unicode bugs (open file dialog) 2013-08-26 21:32:35 +02:00
Henrik Rydgård
09baf1f4f6 Merge pull request #3426 from Kingcom/MemView
Highlight invalid addresses in memory view
2013-08-26 11:52:48 -07:00
Henrik Rydgard
af1ae8fde7 Win32: Set current directory at startup to where the exe is.
Fixes the "out-of-the-box" experience in MSVC.
2013-08-26 20:49:33 +02:00
Kingcom
bcad8e285b Merge branch 'master' of https://github.com/hrydgard/ppsspp into MemView
Conflicts:
	Windows/Debugger/CtrlMemView.cpp
2013-08-26 20:41:51 +02:00
Kingcom
4b3d4db43f Display ?? in memory view for invalid addresses 2013-08-26 20:29:24 +02:00
Henrik Rydgard
55aa3d13c7 Win32: Switch to a UNICODE build. This took quite a bit of fixing. 2013-08-26 19:00:16 +02:00
Kingcom
7d9964c5d9 Don't enable memory window at the start 2013-08-26 17:41:31 +02:00
Kingcom
d6009d9e3d Create a single instance of the debug windows and keep them 2013-08-26 14:19:46 +02:00
The Dax
e843f3955f Fix Windows build. 2013-08-24 06:00:50 -04:00
Henrik Rydgard
955ad2a6e4 swap_control_tear doesn't seem to work out for our timing or something. Let's do regular vsync. 2013-08-24 11:56:41 +02:00
Henrik Rydgard
70f7443453 Restore F11 keyboard shortcut for fullscreen (in addition to alt+enter)
Now that the debugger has its own keymap, this should be okay.
2013-08-24 11:56:40 +02:00
Steven Cherry
761186ec4c Rebase 2013-08-23 22:28:21 -05:00
The Dax
e97def9c66 Win32: Simplify Change Nickname code and slightly change InputBox_GetString to take a const default value. We don't modify it. 2013-08-23 06:37:47 -04:00
Unknown W. Brackets
46c5a48a86 Clean up some minor aliasing. 2013-08-22 23:31:49 -07:00
Unknown W. Brackets
1ed8edb0d3 Avoid some dangerous hex constant widths. 2013-08-22 23:23:48 -07:00
The Dax
ad2368001b Use the correct "Frame Skipping" translation string. 2013-08-21 13:47:21 -04:00
The Dax
3e081f170c Keep it simple, stupid..heh. 2013-08-21 13:35:26 -04:00
The Dax
b642ceea9a Check frameskipStr too. 2013-08-21 13:22:13 -04:00
The Dax
be5e250ca2 Avoid possible crashes with 0 delimiters, more than 2 delimiters, or any delimiters that aren't for integers or strings. 2013-08-21 12:25:30 -04:00
The Dax
27fb798bf4 Make Win32 Frameskipping OSMs more translator-friendly. 2013-08-21 11:48:14 -04:00
The Dax
6150c6157d Fix minor bug in NewUI and make frameskipping strings translatable. 2013-08-21 08:32:06 -04:00
The Dax
c9447fbe67 Win32: Fix frameskip menu and reinstate removed frameskip strings. They're all correct, now. 2013-08-21 08:19:25 -04:00
Henrik Rydgard
ab872d2266 PgUp/PgDn/Home/End in scrollviews 2013-08-20 18:58:22 +02:00
Henrik Rydgård
dc161b1937 Merge pull request #3270 from thedax/prepareResourceForNextRelease
Win32: Prepare ppsspp.rc for 0.9 release.
2013-08-20 09:34:49 -07:00
The Dax
9cf8094448 Prepare ppsspp.rc for 0.9 release. 2013-08-20 11:22:17 -04:00
Henrik Rydgard
87e51a5c04 Fix some window title issues, etc. 2013-08-20 17:21:25 +02:00
Henrik Rydgard
e5c6cea6f1 Disable Run/Stop/Pause in windows menu when in pausemenu 2013-08-20 17:07:01 +02:00
Henrik Rydgard
a902146d7d Remove wrong OSM message 2013-08-20 01:14:17 +02:00
Henrik Rydgard
b186294132 UI tweaks. Change to cleaner background image. 2013-08-20 00:49:25 +02:00
The Dax
fa31951ca2 Fix C4800 warnings. 2013-08-19 07:37:49 -04:00
The Dax
01e84df852 Don't spam KEY_UP messages. 2013-08-19 07:28:31 -04:00
The Dax
72c9887fc6 Small bug fix. 2013-08-19 07:17:11 -04:00
The Dax
4f76c3f4fb Win32: Allow right mouse button to be bound to anything. 2013-08-19 07:05:32 -04:00
Unknown W. Brackets
342bad8402 Fix audio crash on shutdown, log thread names more. 2013-08-18 23:25:14 -07:00
Henrik Rydgard
0265ab874f Change FPS limit to "alternate speed", expressed in a percentage.
Fix it so it works correctly for 30fps games.

Some menu tweaks.
2013-08-18 18:55:42 +02:00
Henrik Rydgard
71404c3d13 Fix checkmark for multithreaded I/O, fixes #3216 2013-08-18 00:45:10 +02:00
Henrik Rydgard
47f2efb0e5 Fixes to default key mappings, add default button, fix saving of mapped controls on Android, fixes #3213 2013-08-18 00:41:19 +02:00
Henrik Rydgård
7cb6dcaf5d Merge pull request #3214 from Kingcom/Debug
Assemble opcode by typing
2013-08-17 13:15:57 -07:00
Kingcom
c7c826b7b6 Assemble opcode by typing 2013-08-17 21:20:24 +02:00
The Dax
7f26d17cc6 Adjust rendering options position slightly. 2013-08-17 08:08:39 -04:00
The Dax
66641f2891 Fix some text. 2013-08-17 07:52:17 -04:00
The Dax
229c0f16ab Eliminate most of the popup menus as per Henrik's request, and fix a minor bug with AT3+ in NewUI. 2013-08-17 07:52:17 -04:00
The Dax
ef88f78aab Win32 UI improvements: Improve the Emulation menu by consolidating down the sound, threading, CPU modes, and GPU modes into pop-out menus. 2013-08-17 07:52:17 -04:00
Henrik Rydgård
d83a6e74a6 Merge pull request #3202 from hrydgard/better-controlmap
Better control mapping
2013-08-17 03:11:52 -07:00
Henrik Rydgard
edb0614a59 Fix analog axis names. Make L2/R2 on x360 controllers analog.
Also slightly nicer behaviour - don't create empty mapping, instead ask for mappings immediately.
2013-08-17 11:18:45 +02:00
Kingcom
e308ef59f5 Add step out feature and button 2013-08-17 11:18:03 +02:00
Kingcom
b3cd95ec68 Remove Skip button 2013-08-17 10:59:43 +02:00
Kingcom
984a038b36 Merge stop and go buttons 2013-08-17 10:57:29 +02:00
Kingcom
4e8bca7549 Move step into, step out and run to line into accelerators 2013-08-17 10:49:07 +02:00
Kingcom
537ab396e7 Change the bottom control of the disassembly with Ctrl+1-4 2013-08-16 14:19:04 +02:00