Commit Graph

17550 Commits

Author SHA1 Message Date
Ryan Houdek
444d112df5 Merge pull request #2563 from Sonicadvance1/aarch64_disable_psql
[AArch64] Disable psq_l again.
2015-06-07 23:12:50 -04:00
Ryan Houdek
c8068e26fb Merge pull request #2527 from Sonicadvance1/aarch_multi_loadstore
[AArch64] Implement lmw/stmw.
2015-06-07 23:12:42 -04:00
Matthew Parlane
bfeb79620d Merge pull request #2565 from dolphin-emu/revert-2530-sdl_quit
Revert "SDL: handle SDL_QUIT event"
2015-06-08 12:09:52 +10:00
Lioncash
7b3932e5b5 Merge pull request #2564 from sigmabeta/android-refresh-library
Android: Add refresh library function.
2015-06-07 21:58:04 -04:00
Matthew Parlane
9e1aab663f Revert "SDL: handle SDL_QUIT event" 2015-06-08 13:43:39 +12:00
sigmabeta
8c843d98b6 Android: Add refresh library function. 2015-06-07 21:15:28 -04:00
Ryan Houdek
d29fd84249 [AArch64] Disable psq_l again.
Still causing issues with games.
Disable it again until I can spend enough time debugging it.
2015-06-07 19:55:27 -05:00
comex
5c7caf1f22 Merge pull request #2517 from comex/netplay-timebase-rb
[rebased] Compare timebase of netplay users to detect desyncs.
2015-06-07 17:47:53 -07:00
Lioncash
018bcaa01d Merge pull request #2560 from sigmabeta/android-dont-copy
Android: Run AssetCopyService only once.
2015-06-07 20:46:43 -04:00
sigmabeta
36d051d3f9 Android: Run AssetCopyService only once. 2015-06-07 20:42:30 -04:00
Markus Wick
cf7178b4c2 Merge pull request #2552 from sigmabeta/android-ndk-update
Android: Allow compilation using Android NDK r10e.
2015-06-07 23:27:56 +02:00
Markus Wick
e987383f6d Merge pull request #2537 from degasus/master
Config: Add SyncOnSkipIdle GameIni option
2015-06-07 23:02:12 +02:00
Ryan Houdek
588de63f9c Merge pull request #2141 from Tilka/position_cache
zfreeze: cache vertex positions
2015-06-07 16:44:40 -04:00
flacs
82fa01804c Merge pull request #2553 from AdmiralCurtiss/cpu-engine-selection-fix
Config: Fix incorrect array length detection for CPU Emulation Engine options.
2015-06-07 21:40:38 +02:00
Lioncash
62bcba3fb7 Merge pull request #2554 from JosJuice/hires-textures-translation
VideoConfigDiag: Translate cache_hires_textures_desc like other strings
2015-06-07 14:44:05 -04:00
JosJuice
b856849b1d VideoConfigDiag: Translate cache_hires_textures_desc like other strings
1aa829c made these strings use wxTRANSLATE by reverting 0004b60, but
cache_hires_textures_desc was left out because it was added after 0004b60.
2015-06-07 20:25:42 +02:00
Admiral H. Curtiss
3520a1d123 Config: Fix incorrect array length detection for CPU Emulation Engine options. 2015-06-07 19:39:54 +02:00
sigmabeta
e04778f9eb Android: Allow compilation using Android NDK r10e. 2015-06-07 13:36:59 -04:00
flacs
30db1959fa Merge pull request #2549 from Tilka/fma4
Revert "Jit64: add FMA4 support to fmaddXX"
2015-06-07 13:29:03 +02:00
Tillmann Karras
3513dd454f Revert "Jit64: add FMA4 support to fmaddXX"
This reverts commit 794a311b11.
2015-06-07 13:03:16 +02:00
Dolphin Bot
0245dd156d Merge pull request #2543 from JosJuice/remove-dsp-thread-reference
Remove reference to DSP on Dedicated Thread
2015-06-07 13:01:06 +02:00
Dolphin i18n Bot
5d5fceaa2d Automatic translation resources update from Transifex 2015-06-07 10:47:16 +00:00
flacs
cab9f7b4da Merge pull request #2548 from endrift/jit-nulls
Common: Add null checks when adding and removing breakpoints
2015-06-07 12:44:41 +02:00
Dolphin i18n Bot
fd391ca078 Automatic translation template update 2015-06-07 10:44:23 +00:00
Ryan Houdek
10bd68936c [AArch64] Implement ZFreeze cache 2015-06-07 12:13:01 +02:00
Tillmann Karras
5ddd2cef6c zfreeze: cache vertex positions
Suggested by degasus.
2015-06-07 12:13:00 +02:00
Tillmann Karras
9e2f4dd7da VertexLoaderX64: revert 9da86092ae
I can't reproduce that it's actually faster and it will definitely be
slower with position caching for zfreeze.
2015-06-07 12:13:00 +02:00
Matthew Parlane
cf8f049c4d Merge pull request #2518 from degasus/hotkeys
Hotkeys: Drop old GUI
2015-06-07 20:10:10 +10:00
Jeffrey Pfau
1214161ad9 Common: Add null checks when adding and removing breakpoints 2015-06-07 03:03:35 -07:00
Dolphin i18n Bot
0047985d35 Automatic translation template update 2015-06-07 09:17:57 +00:00
Matthew Parlane
d286c69ec4 Merge pull request #2546 from Parlane/fix_trans
Fixed translation of strings at runtime.
2015-06-07 19:17:08 +10:00
Matthew Parlane
1aa829c03c Fixed translation of strings at runtime.
Static strings can not be translated until wxLocale is initialised.

This reverts commit 0004b6004b.

Conflicts:
	Source/Core/DolphinWX/VideoConfigDiag.cpp
2015-06-07 20:38:36 +12:00
comex
9f2d684802 Merge pull request #2539 from mimimi085181/gecko-codes-line-ending-fix
Fix line ending bug for downloaded gecko codes
2015-06-06 23:12:39 -04:00
Jules Blok
b0afb08170 Merge pull request #2541 from Armada651/revert-revert
Revert "Revert "OGL: Switch depth buffers to GL_DEPTH_COMPONENT32F format.""
2015-06-07 00:26:01 +02:00
JosJuice
b61f41e698 Remove reference to DSP on Dedicated Thread 2015-06-07 00:01:57 +02:00
Jules Blok
026d07e7c9 D3D: Remove obsolete comment. 2015-06-06 23:26:52 +02:00
Lioncash
8707d68ddb Merge pull request #2542 from JosJuice/how-to-not-print-variables
DVDInterface: Fix newFileName variable not being printed correctly
2015-06-06 16:20:49 -04:00
JosJuice
23f9ccf59b DVDInterface: Fix newFileName variable not being printed correctly 2015-06-06 21:29:43 +02:00
Jules Blok
37dc8661ab Revert "Revert "OGL: Switch depth buffers to GL_DEPTH_COMPONENT32F format.""
This reverts commit 9ef1ca4141.
2015-06-06 20:10:23 +02:00
Jules Blok
8cc271516d Revert "Revert "OGL: Change the depth buffer type to GL_FLOAT.""
This reverts commit 05d60f4fef.
2015-06-06 20:09:22 +02:00
Jules Blok
5650b9e970 Revert "OGL: Use floating point arithmetic to scale the depth value."
This reverts commit 05f42f94a0.
2015-06-06 20:07:49 +02:00
mimimi085181
bd5e55bc59 Fix line ending bug for downloaded gecko codes 2015-06-06 19:15:15 +02:00
flacs
d3e47dfcf5 Merge pull request #2496 from Tilka/fma4
Jit64: add FMA4 support to fmaddXX
2015-06-06 17:31:55 +02:00
Jules Blok
f9b5571ddd Merge pull request #2534 from Armada651/depth-clamp
VideoBackends: Allow the viewport to use the full depth range.
2015-06-06 12:32:56 +02:00
degasus
12b469b417 Config: Add SyncOnSkipIdle GameIni option 2015-06-06 11:19:58 +02:00
comex
9c63b78397 Fix indeterminism in GPU thread mode. 2015-06-06 02:14:06 -04:00
comex
f2631a835e Simplify and improve.
Note - I removed a SleepCurrentThread(1) the patch added which seemed to
be unrelated to the actual job at hand.  If there was a real need for it
(which sounds like it would be an enet-related bug - enet_host_service
is supposed to *sleep*), that needs to be dealt with...
2015-06-06 01:28:01 -04:00
comex
95d682dfd5 Merge pull request #2519 from JosJuice/volume-type-enum
Volume: Return volume type as an enum
2015-06-06 01:23:52 -04:00
flacs
726fc58b49 Merge pull request #2531 from lioncash/vs
Common: Fix a typo in the VS project file.
2015-06-06 07:18:22 +02:00
Rachel Bryk
04ca54623c Compare timebase of netplay users to detect desyncs. 2015-06-06 00:52:02 -04:00