3801f89125
Merge branch 'stable'
2015-07-25 14:09:02 +02:00
4d5f693d88
Merge pull request #2777 from Armada651/hotkey-down
...
HotkeyManager: Activate hotkey when key is pressed.
2015-07-25 14:08:03 +02:00
3814b5b702
HotkeyManager: Activate hotkey when key is pressed.
...
As opposed to activating the hotkey when it is released.
2015-07-25 13:53:27 +02:00
75fc213359
FrameTools: Disable hotkeys while a modal dialog is shown.
2015-07-25 13:05:00 +02:00
0092f5207b
Core: Don't return true on IsRunning() when stopping emulation.
2015-07-25 13:04:37 +02:00
59eb7a864d
Revert "Join the emu thread in Core::Stop. Get rid of Core::Shutdown which did that before."
...
This reverts commit ba664b3293
2015-07-25 13:04:22 +02:00
dfe5ed54a4
Merge pull request #2770 from Armada651/modal-hotkeys
...
FrameTools: Disable hotkeys while a modal dialog is shown.
2015-07-25 13:02:13 +02:00
fbd5bb815c
Merge pull request #2538 from Armada651/thread-revert
...
Revert "Join the emu thread in Core::Stop. Get rid of Core::Shutdown which did that before."
2015-07-25 13:02:04 +02:00
96b77aaa81
Merge pull request #2720 from booto/efb-copy
...
[WIP] Video: respect stride of efb copies to xfb
2015-07-25 12:03:03 +02:00
efd250494d
Video: stride in bytes rather than pixels
2015-07-25 02:48:56 +08:00
c43ae67b3b
RealXFB sizes don't get scaled by IR
...
When calculating the size of the undisplayed margin in the case where
fbWidth != fbStride for RealXFB for displaying in the output window,
we do not scale by IR - RealXFB is implicitly 1x.
2015-07-25 01:52:13 +08:00
2e28ed3291
Video: respect stride of efb copies to xfb
2015-07-25 01:52:12 +08:00
9e4dae4a03
Merge pull request #2771 from lioncash/fmt
...
PostProcessingConfigDialog: Remove an unnecessary format call
2015-07-23 20:43:45 +02:00
0babb80652
PostProcessingConfigDialog: Remove an unnecessary format call
2015-07-23 14:39:05 -04:00
8eee13e7af
FrameTools: Disable hotkeys while a modal dialog is shown.
2015-07-23 09:09:01 +02:00
ed50d61287
Merge branch 'stable'
2015-07-23 08:12:57 +02:00
2c7ae7787d
Merge pull request #2768 from Armada651/focus-pause
...
CFrame: Ignore "Pause on Focus Lost" when not started.
2015-07-23 08:11:45 +02:00
8bd108426e
Merge pull request #2759 from Sonicadvance1/pvr_workaround2
...
Work around PowerVR's shader compiler.
2015-07-22 16:51:48 -05:00
6ee5ce32cf
Merge pull request #2757 from Sonicadvance1/pvr_workaround
...
Work around slow glBufferSubData on PowerVR.
2015-07-22 16:48:40 -05:00
c81bd32720
Merge pull request #2764 from Sonicadvance1/pvr_workaround3
...
Work around devices that choose to only return the default EGL_RENDERABLE_TYPE
2015-07-22 16:47:11 -05:00
703b1e8654
CFrame: Ignore "Pause on Focus Lost" when not started.
2015-07-22 19:31:23 +02:00
6bcdae616b
Merge pull request #2679 from Tinob/master
...
Implement scaled partial texture updates
2015-07-22 19:04:04 +02:00
c4f0515141
Work around devices that choose to only return the default EGL_RENDERABLE_TYPE
...
The default EGL_RENDERABLE_TYPE is GLES1, so vendors have the ability to choose between returning only the bits requested, or all of the bits
supported in addition to the one requested.
PowerVR chose to take the route where they only return the bits requested, everyone else returns all of the bits supported.
Instead of letting the vendor have control of this, let's incrementally go through each renderable type and make sure it supports everything we want.
This will cover all devices for now, and for the future.
2015-07-22 11:11:23 -05:00
5535c5c54c
Core: Don't return true on IsRunning() when stopping emulation.
2015-07-22 09:44:39 +02:00
deef164c7b
Merge pull request #2761 from lioncash/unused
...
DolphinWX: Remove unused code from MemcardManager
2015-07-22 09:39:53 +02:00
b6c4d5792b
Revert "Join the emu thread in Core::Stop. Get rid of Core::Shutdown which did that before."
...
This reverts commit ba664b3293
2015-07-22 09:15:19 +02:00
40162fdfc1
Merge pull request #2743 from aserna3/master
...
Added some warning text about fractional IRs to IR selection description
2015-07-22 08:25:05 +02:00
03f45fd3f5
Merge pull request #2763 from endrift/update-gtest
...
Externals: Update gtest to r733
2015-07-21 21:16:50 -05:00
c8d1824eb0
Merge pull request #2754 from sigmabeta/readme-reword
...
Change "Installation' headers to say 'Building' in Readme.md
2015-07-21 12:56:30 -05:00
3163602157
Merge pull request #2688 from sigmabeta/android-tv-ingame-menu
...
Android TV: Replace toolbar on EmulationActivity with a full-screen menu
2015-07-21 12:52:21 -05:00
9ae8e38a8a
Merge pull request #2717 from phire/fix-reordering
...
PPCAnalyst: Don't swap instruction which might cause interrupts.
2015-07-22 05:16:51 +12:00
53bc147b45
Merge pull request #2756 from Sonicadvance1/fix_glextensions
...
Fix an oversight in GLExtensions
2015-07-21 10:30:06 -05:00
67d0e81cf3
Externals: Update gtest to r733
2015-07-20 22:53:28 -07:00
fe2f57361e
DolphinWX: Remove unused code from MemcardManager
2015-07-21 00:12:40 -04:00
c1df6d7b4e
Work around PowerVR's shader compiler.
...
This bug has been reported to IMGTec at https://pvrsupport.imgtec.com/ticket/472
The basic idea of the bug is that if you're doing a bitwise and of a constant value vector with a constant scalar value, this causes PowerVR's shader
compiler to fail out with a very non-descriptive message.
Working around the issue by making the value a vector that it is being masked by.
2015-07-20 22:04:16 -05:00
012a9afdb6
Work around slow glBufferSubData on PowerVR.
...
As with all tiled renderers, glBufferSubData is terribly slow.
Use glBufferData as typical.
2015-07-20 22:02:58 -05:00
dc46ae0380
Fix an oversight in GLExtensions
...
I only wanted to erase the first character in the string, not the entire thing.
Fixes Qualcomm and PowerVR devices crashing out immediately.
2015-07-20 22:01:23 -05:00
3d6ee7313d
Merge pull request #2689 from RisingFog/patch-1
...
Fix TASInput Crash When Stick Bitmap Is Null
2015-07-21 11:41:38 +10:00
d2c827ec47
Change "Installation' headers to say 'Building' in Readme.md
2015-07-20 13:55:42 -04:00
cd95a53ff4
Merge pull request #2737 from sigmabeta/android-how-to
...
Android: Improve build instructions, fix bugs in build scripts.
2015-07-20 12:39:33 -05:00
caa2f15105
DiscIO: Check if m_Disc is null in ParsePartitionData()
2015-07-20 16:21:34 +02:00
809e480973
Merge branch 'stable'
2015-07-20 16:04:18 +02:00
b5fe028e18
Merge pull request #2752 from Armada651/osx-beep
...
CFrame: Claim all keyboard events on OS X.
2015-07-20 13:55:05 +02:00
ccb56ddf97
CFrame: Claim all keyboard events on OS X.
2015-07-20 10:11:11 +02:00
ad68de59bc
Merge pull request #2665 from AdmiralCurtiss/relative-memory-card-paths
...
GameCube Config: Store paths relatively when selected file is within Dolphin's directory. (Windows)
2015-07-20 14:09:36 +10:00
654c44b870
Merge pull request #2714 from lioncash/clamp
...
Core: Use clamps for nunchuk and wiimote x,y,z values
2015-07-20 14:08:00 +10:00
4b260fbd66
Merge pull request #2724 from AdmiralCurtiss/wiimote-reconnect-on-button-press
...
Wiimote: Reconnect a disconnected Wiimote when a button is pressed.
2015-07-20 14:06:48 +10:00
d3a19fa62c
Merge pull request #2750 from Streetwalrus/dspspy_gc
...
DSPSpy: support dumping to SD Gecko in slot B on GameCube
2015-07-20 14:06:30 +10:00
ca703e6499
Merge pull request #2751 from lioncash/title
...
JitWindow: Use TitleCase for the JIT block viewer tab
2015-07-19 22:32:28 -04:00
40b89627f1
JitWindow: Use TitleCase for the JIT block viewer tab
...
Makes the title consistent with all other tabs.
2015-07-19 18:20:24 -04:00
Jules Blok