Commit Graph

17057 Commits

Author SHA1 Message Date
f9dc8a39c0 Merge pull request #2350 from sigmabeta/master
Convert the Android source code to Gradle.
2015-05-03 22:01:02 -04:00
e0cfd934d2 Merge pull request #2364 from kayru/d3d_texture_bsf
D3D: StateManager::Apply no longer iterates through every texture and sampler slot
2015-05-03 21:39:33 +02:00
df5750edfd D3D: Replaced explicit _BitScanForward with LeastSignificantSetBit 2015-05-03 21:14:29 +02:00
a04ec46e40 Merge pull request #2363 from sigmabeta/android-build-instructions
Add Android build instructions to Readme.md.
2015-05-03 14:34:53 -04:00
609a72d90f Add Android build instructions to Readme.md. 2015-05-03 14:28:02 -04:00
5ac29e18ed Merge pull request #2360 from darkengine-io/ignore-vim-swp
Ignore vim swapfiles
2015-05-03 03:06:35 -04:00
8adaab6eea Ignore vim swapfiles 2015-05-02 23:34:23 -07:00
c80225ea4d Convert the Android source code to the directory structure of a Gradle-based Android Studio project. 2015-05-02 21:49:17 -04:00
a76bfb1f55 Merge pull request #2356 from Armada651/dump-efb
VideoCommon: Implement EFB dumping for both backends.
2015-05-02 13:27:38 +02:00
54f4443971 VideoCommon: Implement EFB dumping for both backends. 2015-05-02 13:23:33 +02:00
7410923197 Merge pull request #2355 from sjef/master
Fix dead link
2015-05-01 15:46:33 -04:00
5799824b22 Fix dead link 2015-05-01 21:42:50 +02:00
1eb901ff64 Merge pull request #2354 from mathieui/build-without-libusb
Add missing ifdefs around GCAdapter code in Controller config
2015-05-01 18:27:48 +02:00
7b45eae6e7 Add missing ifdefs around GCAdapter code in Controller config
Otherwise the build fails if libusb is not found
2015-05-01 17:56:15 +02:00
9348b2e1a6 Merge pull request #2330 from mathieui/background-gc-adapter-scan
Add a background thread to detect the GC adapter
2015-05-01 12:09:18 +10:00
5cdac0d826 Merge pull request #2351 from illuminatedgeek/about-page-static-text
Change about page branch info to wxStaticText
2015-04-30 20:39:06 -04:00
886e5c80dd Remove BanishBackground function
No longer needed
2015-04-30 17:33:24 -07:00
e6e046e37c Make revision text wxStaticText 2015-04-30 17:32:45 -07:00
df341ffba6 Change about page branch info to wxStaticText 2015-04-30 17:22:37 -07:00
ad6ed9a6bc Merge pull request #2348 from lioncash/about
DolphinWX: Fix branch information display in the about dialog.
2015-04-30 19:20:53 -04:00
9012ed18b1 AboutDolphin: Set the multi-line style for branch information
Without this, all the branch information would be put on one line, which isn't intended.
2015-04-30 18:07:58 -04:00
2b89350868 AboutDolphin: Remove unnecessary code 2015-04-30 18:05:30 -04:00
4b00ccbe4e Merge pull request #2342 from rohit-n/warnings
Silence -Wshadow and -Wsign-compare warnings.
2015-04-30 23:22:19 +02:00
d69a4697fa Merge pull request #2347 from JosJuice/fix-dol-crash
Fix DOL crash caused by VolumeHandler removal
2015-04-30 07:36:55 -04:00
f7d20204bb Fix DOL crash caused by VolumeHandler removal
Similar to the WAD crash (0b44d7c) but in another part of the boot code.
2015-04-30 13:29:09 +02:00
1fded22afa Merge pull request #2346 from illuminatedgeek/cpu-override-slider-enabled
Make OC slider match enabled state on window load
2015-04-30 05:38:09 -04:00
ec7445d66b GCAdapter: Add a setting to toggle rumble 2015-04-30 11:35:16 +02:00
57f458fe9b GCAdapter: Add a background thread to detect the adapter
This scanning thread either polls libusb or checks every 500ms for a
change depending on host capabilities. The GC Adapter can now be plugged
and unplugged at any time when dolphin is open, it will be used if the
direct connect option is set.
2015-04-30 11:35:16 +02:00
cd7466864e Make OC slider match enabled state on window load 2015-04-30 01:28:43 -07:00
989c0f427f Merge pull request #2344 from illuminatedgeek/cpu-override-slider-size
Add size to CPU clock override slider
2015-04-30 01:09:11 -04:00
6728f87677 Add size to CPU clock override slider
Fixes slider having 0 width on wxGTK
2015-04-29 21:49:58 -07:00
d46598e51a Merge pull request #2336 from lioncash/tl
FrameTools: Simplify some wx string translation marking
2015-04-30 14:03:21 +10:00
052162e6b9 Merge pull request #2332 from comex/fix-alerts-maybe
Fix some false positive ScheduleEvent alerts
2015-04-30 14:03:00 +10:00
e710812d88 Merge pull request #2329 from JosJuice/ini-inheritance
Inherit settings from region-free INIs to region-specific INIs
2015-04-30 14:02:45 +10:00
76181f9327 Silence -Wshadow and -Wsign-compare warnings. 2015-04-29 19:59:34 -05:00
bac4167ff5 Merge pull request #2319 from comex/linted-fix-qualcomm-fail
(lint issues fixed) Fix OpenGLES 3.0 on Qualcomm's crappy driver, it can't bitshift sometimes.
2015-04-29 17:09:56 -04:00
2b664f5d89 D3D: StateManager::Apply no longer iterates through every texture and sampler slot
Now using bit scan through dirty slot masks.
2015-04-29 20:08:00 +02:00
79dff19aa0 Merge pull request #2337 from illuminatedgeek/config-tabs
Config tabs
2015-04-28 04:24:52 -04:00
8f56138ec4 Use wxStaticText::Wrap rather than manually inserting newlines 2015-04-28 01:17:43 -07:00
df7c9664da Set minimum size on config window
To prevent tabs from getting a scrollbar
2015-04-27 22:55:08 -07:00
be3bd52bb5 FrameTools: Simplify some wx string translation marking 2015-04-28 00:02:35 -04:00
c58e94cf95 Merge pull request #2331 from lioncash/access
DolphinWX: Make some UI functions/members private
2015-04-28 15:42:52 +12:00
42ebf5b3bf Merge pull request #2333 from lioncash/virt
InputCommon/Core: Get rid of some virtual destructor warnings
2015-04-28 15:41:48 +12:00
1634f98953 Merge pull request #2335 from lioncash/header
TextureDecoder_Common: Add missing algorithm include
2015-04-28 15:41:31 +12:00
8e59987d46 TextureDecoder_Common: Add missing algorithm include
It was being indirectly included, causing VS to syntactically mark std::min/max usages as being undefined (however it still compiled fine, of course)
2015-04-27 23:17:41 -04:00
5091a18369 Merge pull request #2334 from lioncash/uninit
Interpreter_LoadStorePaired: Silence uninitialized variable warnings
2015-04-28 14:57:49 +12:00
9603fb6ccd Interpreter_LoadStorePaired: Silence uninitialized variable warnings 2015-04-27 22:54:58 -04:00
d39b519850 InputCommon/Core: Get rid of some virtual destructor warnings
These classes have virtual methods, but no virtual destructor, which causes warnings on some compilers.
2015-04-27 21:41:59 -04:00
65457628d7 Merge pull request #2324 from endrift/about-dialog-osx
Attempt to beautify About dialog on OS X.
2015-04-27 21:23:27 -04:00
a9fe0ec0ab Fix some false positive ScheduleEvent alerts:
- CEXIETHERNET::SendComplete is always called from the main thread, so
  drop the _Threadsafe.

- Mark the FIFO player thread as the "CPU thread" so it can call
  ScheduleEvent without complaints.  I haven't actually tested this,
  since I don't know how to use the FIFO player; it might break
  something.
2015-04-27 21:19:28 -04:00