Commit graph

17038 commits

Author SHA1 Message Date
mathieui
bb622836b2 Traversal: Add a read-only text for server:port with a "reset to default" button
Clicking it will set the config file back to stun.dolphin-emu.org with
port 6262.
2015-05-11 01:10:27 +02:00
mathieui
df8b86ed63 Traversal: use the defaults if empty or space-only config entries are detected 2015-05-01 03:11:28 +02:00
mathieui
c452e72ca7 Netplay: don’t show traversal server/port options (INI config only) 2015-05-01 02:03:53 +02:00
Lioncash
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
Lioncash
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
Lioncash
2b89350868 AboutDolphin: Remove unnecessary code 2015-04-30 18:05:30 -04:00
Markus Wick
4b00ccbe4e Merge pull request #2342 from rohit-n/warnings
Silence -Wshadow and -Wsign-compare warnings.
2015-04-30 23:22:19 +02:00
Lioncash
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
JosJuice
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
Lioncash
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
Simon McFarlane
cd7466864e Make OC slider match enabled state on window load 2015-04-30 01:28:43 -07:00
Lioncash
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
Simon McFarlane
6728f87677 Add size to CPU clock override slider
Fixes slider having 0 width on wxGTK
2015-04-29 21:49:58 -07:00
skidau
d46598e51a Merge pull request #2336 from lioncash/tl
FrameTools: Simplify some wx string translation marking
2015-04-30 14:03:21 +10:00
skidau
052162e6b9 Merge pull request #2332 from comex/fix-alerts-maybe
Fix some false positive ScheduleEvent alerts
2015-04-30 14:03:00 +10:00
skidau
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
Rohit Nirmal
76181f9327 Silence -Wshadow and -Wsign-compare warnings. 2015-04-29 19:59:34 -05:00
comex
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
Lioncash
79dff19aa0 Merge pull request #2337 from illuminatedgeek/config-tabs
Config tabs
2015-04-28 04:24:52 -04:00
Simon McFarlane
8f56138ec4 Use wxStaticText::Wrap rather than manually inserting newlines 2015-04-28 01:17:43 -07:00
Simon McFarlane
df7c9664da Set minimum size on config window
To prevent tabs from getting a scrollbar
2015-04-27 22:55:08 -07:00
Lioncash
be3bd52bb5 FrameTools: Simplify some wx string translation marking 2015-04-28 00:02:35 -04:00
Matthew Parlane
c58e94cf95 Merge pull request #2331 from lioncash/access
DolphinWX: Make some UI functions/members private
2015-04-28 15:42:52 +12:00
Matthew Parlane
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
Matthew Parlane
1634f98953 Merge pull request #2335 from lioncash/header
TextureDecoder_Common: Add missing algorithm include
2015-04-28 15:41:31 +12:00
Lioncash
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
Matthew Parlane
5091a18369 Merge pull request #2334 from lioncash/uninit
Interpreter_LoadStorePaired: Silence uninitialized variable warnings
2015-04-28 14:57:49 +12:00
Lioncash
9603fb6ccd Interpreter_LoadStorePaired: Silence uninitialized variable warnings 2015-04-27 22:54:58 -04:00
Lioncash
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
comex
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
comex
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
Lioncash
899fd55ea8 DolphinWX: Make some general UI functions/vars private 2015-04-27 21:04:05 -04:00
Lioncash
263e64e939 DolphinWX: Make some debugger functions/vars private
Some classes expose things that aren't used outside of them (and in some cases, shouldn't be exposed).
2015-04-27 20:42:18 -04:00
skidau
4bf4778cd7 Merge pull request #2312 from comex/shutdown-race-condition
Exit ReadDataFromFifoOnCPU, PushFifoAuxBuffer early if shutting down (GpuRunningState=false)
2015-04-27 19:47:00 +10:00
skidau
b8eecff5c9 Merge pull request #2325 from JosJuice/isoproperties-zero-files
ISOProperties: Correctly handle partitions with 0 files
2015-04-27 19:45:21 +10:00
skidau
472e281445 Merge pull request #2316 from comex/fix-watch
Fix watchpoints ("memory breakpoints") with JIT
2015-04-27 19:42:13 +10:00
Lioncash
b457c61b3e Merge pull request #2328 from rohit-n/format
Silence -Wformat warnings in debug builds.
2015-04-26 16:19:08 -04:00
Lioncash
3af11ef309 Merge pull request #2327 from rohit-n/qt-critical
Qt: Check if game filename is null before loading it.
2015-04-26 16:18:20 -04:00
JosJuice
d287fad01e Inherit settings from region-free INIs to region-specific INIs
Having settings for each game in more than one file is redundant.
Now, region-free INIs are now only for settings, and region-specific
INIs are only for AR codes and patches. Exceptions are made for
titles that share the first three characters of their IDs with
unrelated titles (mostly unlicensed titles and Triforce titles).
2015-04-26 21:24:34 +02:00
Rohit Nirmal
fb46afd5c3 Silence -Wformat warnings in debug builds. 2015-04-26 13:45:06 -05:00
Rohit Nirmal
10aa6488d9 Qt: Check if game filename is null before loading.
This is so that the error message box does not
appear if the user simply cancels loading a game.
2015-04-26 11:13:16 -05:00
Jeffrey Pfau
af20e7498c Only wxMac supports scaleFactor, so only use it on OS X 2015-04-25 14:53:37 -07:00
Jeffrey Pfau
4a97045d81 Add hack for removing background from text controlers, per comex 2015-04-25 14:52:53 -07:00
JosJuice
fbed0b4a9c ISOProperties: Correctly handle partitions with 0 files 2015-04-25 15:33:20 +02:00
Jeffrey Pfau
addbafcfda Attempt to beautify About dialog on OS X.
Added a 2x version of the logo, and cleaned up layout a bit.
2015-04-25 04:22:32 -07:00
Matthew Parlane
392b9abece Merge pull request #2016 from RisingFog/splash
Update About Dolphin Screen
2015-04-25 21:50:40 +12:00
magumagu
645aa5af8b Merge pull request #2323 from dolphin-emu/itym
ITYM PowerPC::Write_U{8,16}, not Memory::
2015-04-24 22:19:37 -07:00
comex
7fe13d9af8 Merge pull request #2175 from RachelBryk/oc
Disable oc setting while netplay or movie is active.
2015-04-25 00:58:16 -04:00
comex
9d8c347e8d Merge pull request #2290 from RachelBryk/cc-tasinput
Implement classic controller tas input.
2015-04-25 00:44:29 -04:00
comex
38a14b73a4 Merge pull request #2321 from JosJuice/wiimote-battery-fix
Fix emulated Wii Remote battery level being low when not configured
2015-04-24 22:43:05 -04:00