preserve-emulation/ppsspp
1
0 Fork 0
mirror of https://github.com/hrydgard/ppsspp.git synced 2026-11-11 16:49:27 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,709 Commits 82 Branches 131 Tags
03c5c046e589683dff2fc98a21db34c94de4dba9
Commit Graph
18709 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
wuspring 3a495637e0 Merge pull request #3 from hrydgard/master 
sync
 2013-08-30 12:20:52 -07: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
Henrik Rydgård 8d6e6c527f Merge pull request #3510 from vnctdj/patch-2 
Rename "Delete Savedata" & "Delete Game"
 2013-08-30 11:47:58 -07:00
vnctdj 2b8d4685f6 Rename "Delete Savedata" & "Delete Game" 
I make that because "Delete Game" exists twice (line #69), so the translation can't work.

I rename "Delete Savedata" to looks like the new "Delete Game".
 2013-08-30 20:25:58 +02: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
Henrik Rydgard 685a1f7e6f Harmonize compiler options, warning fix 2013-08-30 20:18:39 +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
Henrik Rydgard bf6f8b6afb Add a translatable string "this translation by" to credits, fix #3507 2013-08-30 20:11:01 +02:00
wuspring 0f1cecc34d Merge pull request #2 from hrydgard/master 
sync
 2013-08-30 11:07:55 -07:00
Henrik Rydgård 80a6474e65 Merge pull request #3503 from vnctdj/patch-2 
["lang" .ini files] Move some translations in [Game]
 2013-08-30 10:56:02 -07:00
Henrik Rydgård dbfcecd4fe Merge pull request #3506 from Kingcom/RecentChanges 
Change recent list format in ini
 2013-08-30 10:55:21 -07:00
Henrik Rydgård c5745ac463 Merge pull request #3504 from thedax/master 
Win32: Allow user to specify a specific font in their language's ini file.
 2013-08-30 10:54:25 -07:00
The Dax 39db37cfd3 Add a comment. 2013-08-30 13:52:15 -04:00
Kingcom 13bbd44fe9 Change how the recent list is saved 2013-08-30 19:48:56 +02:00
The Dax e859b79948 Remove useless if. 2013-08-30 13:38:59 -04:00
The Dax 3426c9cb2c Allow user to specify what system font to use in their respective language's ini file. Fallback on Trebuchet MS if nothing is defined. 2013-08-30 13:33:12 -04:00
Henrik Rydgård 4fb9158b8d Merge pull request #119 from PewnyPL/master 
An (ugly) hack to make some Bluetooth Gamepads to work.
 2013-08-30 10:21:04 -07:00
vnctdj 3b57bf6fe2 ["lang" .ini files] Move some translations in [Game] 
Translations moved :
>> "Game = "
>> "MB = "
>> "SaveData = "
>> "Delete Savedata = "
>> "Cancel = "
>> "Delete Game = "

line 176 : Rename "DeleteGame" to "DeleteConfirmGame" to avoid confusion with "Delete Game".
 2013-08-30 19:00:25 +02:00
wuspring 6f630a7be3 Merge pull request #1 from hrydgard/master 
sync
 2013-08-30 09:45:17 -07:00
PewnyPL f12d369b51 An (ugly) hack to make some Bluetooth Gamepads to work. 
The problem with BT gamepads is the fact they tend to show up as multiple gamepads, while PPSSPP only recognises two. Until the whole gamepad code is reworked, this will allow them to work by always returning inputPlayerA in case of an additional recognised gamepad. Fixes issue #3314
 2013-08-30 18:34:21 +02:00
Henrik Rydgård 3860f6f5db Merge pull request #3502 from vnctdj/patch-1 
["lang" .ini files] Move "Language" translation in [Developer]
 2013-08-30 09:22:45 -07:00
vnctdj 692d4a91f3 ["lang" .ini files] Move "Language" translation in [Developer] 
@ Henrik >> I hope this one is OK :)
 2013-08-30 18:20:19 +02:00
Henrik Rydgard 7ea3544082 Crashfixes on non-windows, update native to eat & signs (so we can share strings with windows menus) 2013-08-30 18:16:29 +02:00
Henrik Rydgard ed48ad9c22 Eat lone ampersands, so that we can share strings with the top level Windows menus. 2013-08-30 18:14:44 +02:00
Henrik Rydgård 4b6ae7a54e Merge pull request #3500 from vnctdj/patch-3 
["lang" .ini files] Move some translations in [PSPCredits]
 2013-08-30 08:59:30 -07:00
Henrik Rydgard f4496fbc49 Buildfix 2013-08-30 17:57:33 +02:00
Henrik Rydgård 2361d0cea8 Merge pull request #3497 from thedax/master 
Win32 UI: Tiny cleanup and add a few comments to clarify a few things regarding the translation stuff.
 2013-08-30 08:53:14 -07:00
Henrik Rydgård edeabe42c5 Merge pull request #3498 from vnctdj/patch-1 
["lang" .ini files] Move the translation of "General" in [System] catego...
 2013-08-30 08:52:04 -07:00
Henrik Rydgård 36e2be1a5d Merge pull request #3496 from kaienfr/ppsspp_update_console 
Disable log console close button and ctrl+C effect
 2013-08-30 08:51:51 -07:00
vnctdj c7022cce90 ["lang" .ini files] Move some translations in [PSPCredits] 2013-08-30 17:51:08 +02:00
Henrik Rydgard 5374df64a5 Fix some line break issues in system font (windows) 2013-08-30 17:45:47 +02:00
Henrik Rydgard b505648c99 Fix issues with line breaks in system font 2013-08-30 17:44:44 +02:00
vnctdj 05ada2f234 ["lang" .ini files] Move the translation of "General" in [System] category 2013-08-30 17:10:14 +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
kaienfr 9ea27dd7ba Disable log console close button and ctrl+C effect 
Avoid closing the application when the log console is closed.
 2013-08-30 16:10:35 +02: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
Henrik Rydgard f47c6d534d Controlmapping: Show symbols on cross/circle/etc, make the rest translatable. See #76 
Will make more symbols in the future so might want to hold off translating.
 2013-08-30 16:02:57 +02: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
Henrik Rydgard 855fe05050 Update Android NDK compiler version (r9 required). Restore x86 and armeabi builds that I accidentally removed. 2013-08-30 15:45:32 +02: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 57b2deac4c Update native (fix wide text rendering) 2013-08-30 15:32:14 +02:00
Henrik Rydgard 00bc06e297 Win32: Increase size of temporary font rendering bitmap 2013-08-30 15:31:42 +02:00
Henrik Rydgard e8d0376090 Crashfix in menu translation code 2013-08-30 15:27:16 +02:00
Henrik Rydgård 2ee5683c35 Merge pull request #3478 from thedax/makeWin32UITranslatable 
Win32: Allow menu bar to be translated
 2013-08-30 06:06:49 -07:00