Commit Graph

3962 Commits

Author SHA1 Message Date
flacs 34c020352f Merge pull request #3092 from JosJuice/compressed-blobs
Display all compressed formats in blue in GUI
2015-09-27 12:57:19 +02:00
Lioncash 457a398c33 MemoryWindow: Adjust control alignment
Aligns controls so that their widths remain the same with one another
2015-09-26 22:46:57 -04:00
Lioncash 5aa19ad051 MemoryWindow: Change the address search wxTextCtrl into a wxSearchCtrl 2015-09-26 22:46:53 -04:00
Lioncash 7ba171a497 CodeWindow: Ignore search error highlighting on empty string
Doesn't make sense to flag these as errors, since someone might search for another address.
2015-09-26 22:38:08 -04:00
Lioncash 6866373202 CodeWindow: Replace wxStaticText/wxTextCtrl combo with a wxSearchCtrl
Same thing, one control.
2015-09-26 22:38:07 -04:00
flacs 8ea9b07b59 Merge pull request #3093 from lioncash/header_shuffle
Common: Trim Common.h
2015-09-27 03:18:03 +02:00
Lioncash cc036ca86c Common: Remove other Common prefixed headers from Common.h 2015-09-26 18:51:58 -04:00
Lioncash 19ac565e0d Common: Move asserts to their own header 2015-09-26 18:51:27 -04:00
Ryan Houdek be667e7de8 Merge pull request #3035 from aserna3/SSAAImprovements
Improved OGL and D3D's AA options in UI
2015-09-26 09:27:39 -04:00
JosJuice 6935d28112 Display all compressed formats in blue in GUI
In the past, only GCZ was shown as compressed, not CISO and WBFS.
2015-09-26 15:24:29 +02:00
JosJuice 94ee720a07 Rename IsCompressedBlob to IsGCZBlob for clarity
GCZ is just one of the several compressed formats that Dolphin supports.
2015-09-26 14:46:53 +02:00
Anthony Serna df189c3ea3 Improved D3D and OGL AA option UI
Removed Quality Levels from D3D AA options

Dropdown text now shows whether you're applying MSAA or SSAA

Added a description for SSAA

Moved SSAA checkbox

Cleaned up AA in backends slightly. Supported modes is now a list of ints.
2015-09-25 09:05:18 -07:00
Tillmann Karras 063446c46f mbedTLS: run rename.pl script and fix errors 2015-09-25 03:46:41 +02:00
ghost 7c1565b201 VideoConfig/LocalConfig/HotkeyManager: Added hotkeys for switching stereo-3d presets.
Added 3 depth/convergence presets. They are adjustable via (existing) hotkeys - changes to depth and convergence are applied to current preset.
Added 3 hotkeys for activating presets. Added hotkey for toggle between first and second preset.
Added OSD message for convergence/depth changes.
Presets are saved into per-game configs.
2015-09-24 15:19:55 +03:00
Lioncash 4b9b82e000 DiscIO: Do swapping in GetTitleID implementations
Gets rid of external swaps at every usage.
2015-09-22 13:50:35 -04:00
JosJuice 42db9e2897 Remove odd way of getting ID in ISOProperties
Other code (like GameListItem) simply calls GetUniqueID,
and I've never seen that lead to any problems.
2015-09-21 17:46:05 +02:00
CastellaFactory 7ddfe713d5 [Netplay] Show error dialog if failed to connect to netplay server when Traversal and Force Listen Port is enabled 2015-09-20 20:15:13 +09:00
CastellaFactory 1f83a3d146 [Netplay:Traversal] Add "Force Netplay Listen Port" feature that was in old netplay branch 2015-09-20 20:15:13 +09:00
JosJuice 17edcc4fc7 Fix Cheat Manager not saving created codes 2015-09-19 17:20:16 +02:00
JosJuice e2e7fc9029 Fix 4.0-7767 regression: exception when handling short WAD IDs 2015-09-19 09:23:52 +02:00
Scott Mansell 3f56480903 Merge pull request #3037 from JosJuice/titles-txt-sort
DolphinWX: Fix sorting games by custom titles
2015-09-18 17:41:32 +12:00
degasus e3e0399af2 VideoSW: Drop HwRasterizer
I don't remember it being working, and nobody cares about performance of videosw.
2015-09-17 18:21:37 +02:00
flacs 6940fc5ab9 Merge pull request #2947 from Rukario/my_branch
Updated terms in Netplay window.
2015-09-17 03:02:59 +02:00
JosJuice 210aa774d5 DolphinWX: Only read titles.txt once
titles.txt is read into a map and passed to the GameListItem
constructor, making game list scanning a bit more efficient.

ISOPropreties's constructor is changed to take a GameListItem as an
argument instead of creating one on its own, because ISOPropreties
doesn't have the titles.txt map that the GameListItem constructor wants.
2015-09-13 14:17:58 +02:00
JosJuice 10aafff5b9 DolphinWX: Fix sorting games by custom titles
The custom title reading code is moved so that custom titles are
returned by GameListItem::GetName(). The comparison code is changed
to use GetName() instead of GetName(DiscIO::IVolume::ELanguage).

GetName(DiscIO::IVolume::ELanguage) must not return custom titles,
because netplay relies on it returning the same name for all players.
2015-09-13 12:45:06 +02:00
Scott Mansell 45c1cfa078 Merge pull request #2242 from Stevoisiak/Titles.txt
GameListCtrl: Improvements for reading custom game titles
2015-09-13 14:03:47 +12:00
JosJuice cbd539eb3d Use official names for GameCube controller sticks
Main Stick is changed to Control Stick and C-Stick is changed to C Stick.

A new ui_name variable is added to ControlGroup so that the UI strings
in DolphinWX can be updated without breaking backwards compatibility
with config INIs and other things that use names as IDs.
2015-09-12 22:45:06 +02:00
Tillmann Karras 38ae572203 Debugger: fix -Wunused-private-field warning 2015-09-12 10:01:26 +02:00
Ryan Houdek f121d7a8cd Merge pull request #3026 from lioncash/constexpr
MathUtil: Make Clamp and IsPow2 constexpr functions.
2015-09-12 02:28:38 -04:00
Lioncash b9e360df7b MathUtil: Convert Clamp into a constexpr function 2015-09-12 01:18:28 -04:00
Lioncash 113cc119de Merge pull request #2829 from JosJuice/fix-wii-fst-size-2
Fix reading Wii FST size (for real this time)
2015-09-12 00:50:00 -04:00
Lioncash fa62018c40 Merge pull request #2995 from endrift/tasinputdlg-threading
DolphinWX: TAS fixes, take three
2015-09-12 00:42:21 -04:00
Scott Mansell 02842cb34b Merge pull request #3006 from phire/deadlock
Fix deadlock with KHR_debug.
2015-09-12 16:19:58 +12:00
Jeffrey Pfau c08203b704 DolphinWX: TAS fixes, take three 2015-09-11 19:51:31 -07:00
Lioncash d7acf06505 Merge pull request #2985 from JosJuice/iselfordol
DolphinWX: Don't use IsElfOrDol outside of ISOFile
2015-09-11 12:28:57 -04:00
Lioncash 19459e827f Partially revert "General: Toss out PRI macro usage" 2015-09-11 09:49:00 -04:00
degasus 74b20e627c VideoCommon: Drop "Disable destAlpha" hack
This option has no use any more, neither performance nor driver workaround.
2015-09-09 21:31:54 +02:00
Scott Mansell b9b80191d5 Fix deadlock with KHR_debug.
An KHR_debug callback could end up waiting for a mutex
on a thread which calls windows system functions.

While this is not expressly forbidden by the standards,
it does forbid directy calling windows system functions
from a KHR_debug callback. Close enough.
2015-09-09 12:05:24 +12:00
Markus Wick 5585c5adc2 Merge pull request #2994 from aserna3/master
Properly implemented confirm on stop CLI switch
2015-09-07 14:00:17 +02:00
Ryan Houdek 99a7dfaf5e Merge pull request #2965 from Sonicadvance1/Android_config_changes
[Android] Fix multi-gamecube controller input, config changes
2015-09-06 20:07:32 -05:00
Anthony Serna a5d6072a45 Properly implemented confirm on stop CLI switch 2015-09-06 14:35:26 -07:00
Lioncash 1b026364bf Merge pull request #2992 from aserna3/master
Implemented CLI switch to disable confirm on stop
2015-09-06 16:55:11 -04:00
Anthony Serna ad1a8a1b31 Implemented CLI switch to disable confirm on stop 2015-09-06 13:08:29 -07:00
degasus 1c0366993a VideoBackends: Reimplement SSAA, now for D3D + OGL 2015-09-06 19:40:00 +02:00
JosJuice 4716c8ecf6 DolphinWX: Little simplification for game right-click menu 2015-09-06 13:33:23 +02:00
JosJuice cb3b1b6f44 DolphinWX: Don't use IsElfOrDol outside of ISOFile
It's redundant because GetPlatform can do the same thing.
2015-09-06 13:33:19 +02:00
Scott Mansell be4caa3dc0 Merge pull request #2961 from lioncash/printf
General: Toss out PRI macro usage
2015-09-06 21:02:22 +12:00
Lioncash 4fc71e9708 Common: Remove StdMakeUnique.h 2015-09-06 04:09:53 -04:00
comex 96e42dff52 Merge pull request #2977 from lioncash/unused
General: Remove unimplemented function prototypes
2015-09-05 22:20:47 -04:00
Lioncash 633be0387d General: Remove unimplemented function prototypes 2015-09-05 22:01:07 -04:00
Pierre Bourdon 6af8e00b66 Merge pull request #2813 from lioncash/updating_list
CheatSearchTab: Make the search results list auto update address values
2015-09-05 23:10:06 +02:00
Pierre Bourdon 8a993e1fbc Merge pull request #2958 from JosJuice/dol-elf-banners
DolphinWX: Support banners in Homebrew Channel format
2015-09-05 23:08:07 +02:00
Lioncash 8fdb013d54 General: Toss out PRI macro usage
Now that VS supports more printf specifiers, these aren't necessary
2015-09-05 16:02:35 -04:00
degasus 9187200de3 Android: Abort the screenshot after 2 seconds
If the emulation is crashed, this blocks forever. So there is no way to exit the emulation within a finite time.
2015-09-05 15:29:22 +02:00
Ryan Houdek 7650117c26 Properly support MSAA and SSAA as separate features(+GLES)
SSAA relies on MSAA being active to work. We only supports 4x SSAA while in fact you can enable SSAA at any MSAA level.
I even managed to run 64xMSAA + SSAA on my Quadro which made some pretty sleek looking games. They were very cinematic though.

With this, it properly fixes up SSAA and MSAA support in GLES as well. Before they were broken when stereo rendering was enabled.
Now in GLES they can properly support MSAA and also stereo rendering with MSAA enabled(with proper extensions).
2015-09-05 05:23:29 -05:00
Ryan Houdek 9bb63bf2eb [Android] Fix multi-gamecube controller input, config changes 2015-09-04 20:06:01 -05:00
JosJuice 41315b19f1 DolphinWX: Support banners in Homebrew Channel format
HBC uses files named icon.png for icons. This change makes Dolphin
support that file name, and also [executable file name].png
in case someone wants to have multiple files in one folder.

The HBC banner support is mainly intended for DOL and ELF files,
but it can also be used to override banners of disc images,
something that wasn't possible in the past.

There are currently issues with banner scaling not preserving
the aspect ratio and looking bad in general.
2015-09-04 19:08:30 +02:00
Lioncash a11ae2cf30 CommonFuncs: Remove SLEEP macro
There's already a function in Thread for this.
2015-09-04 02:43:38 -04:00
shuffle2 4218fb4eea Merge pull request #2916 from lioncash/wx
DolphinWX: Minor changes to Main
2015-09-03 22:59:29 -07:00
shuffle2 9a92ff5238 Merge pull request #2926 from lioncash/wx-mc
MemcardManager: Remove explicit delete and new
2015-09-03 22:58:06 -07:00
Rukario e939fba3e7 Updated terms in Netplay window. 2015-09-03 07:36:52 -07:00
Shawn Hoffman 399083ac8a Drop the old msvcrt files. 2015-09-03 06:10:01 -07:00
Shawn Hoffman aa7208e270 [windows] Update projects to vs2015. 2015-09-03 04:23:01 -07:00
Scott Mansell 368867dba0 Merge pull request #2922 from aserna3/SDBlock
Implemented ability to block writes to the SD card
2015-08-31 04:51:50 +12:00
Anthony Serna 0390bd61df Fixed introduced compiler warning in Linux 2015-08-29 20:41:59 -07:00
Lioncash e0aabc5f6c MemcardManager: Remove trivial explicit delete and new
Also gets rid of pointer casting.
2015-08-29 22:46:18 -04:00
Lioncash d58550e874 MemcardManager: Minor cleanup of header code 2015-08-29 05:19:51 -04:00
Lioncash 0f3e4c50e1 MemcardManager: Correct class indentation 2015-08-29 05:13:20 -04:00
Anthony Serna db7fe9507e Implemented ability to block writes to the SD card
Renamed variable to be more accurate
2015-08-28 17:32:29 -07:00
Anthony Serna faedf1bc5c Implemented .elf and .dol support in gamelist
Fixed a TON of structuring, formatting.

removed README.txt files from themes at MaJoR's request

Added platform icon for ELFs/DOLs
2015-08-28 11:10:03 -07:00
Lioncash 7fa0ecd046 Main: Make the wxLocale class member a unique_ptr 2015-08-27 08:36:01 -04:00
Lioncash 14ae1d23cf Main: Move unofficial build check to its own function
Removes the need to explicitly call exit.
2015-08-27 08:35:51 -04:00
Lioncash aafae49d24 Main: Move commandline parsing handling to appropriate override functions 2015-08-27 08:29:53 -04:00
Jeffrey Pfau 65ee5a1d36 DolphinWX: Finish removing bandaid from 704f787 2015-08-20 22:39:24 -07:00
Lioncash 9e9a293a85 Frame/TASInputDlg: Remove unused functions 2015-08-19 20:36:16 -04:00
Dominic Chen 09714f86c3 Fix some compilation warnings 2015-08-19 11:07:54 -04:00
Lioncash 291f857b0e Merge pull request #2859 from lioncash/netplay
NetPlay: Minor cleanup
2015-08-19 04:51:28 -04:00
Lioncash 761e087e52 NetWindow: Remove translation marker from empty string 2015-08-17 21:56:52 -04:00
Lioncash 65adf76698 NetWindow: non-ugly way to check for window focus 2015-08-17 21:56:51 -04:00
Lioncash 2b4a249dea NetWindow: Replace old wx event binding types 2015-08-17 21:56:50 -04:00
Lioncash ca0b9481ea ChangeGameDialog: Internally set the chosen game name
Passing in a reference to an empty string is unnecessary and
overcomplicates design.
2015-08-17 21:56:48 -04:00
Lioncash af35f38491 NetWindow: Minor simplifications 2015-08-17 21:56:46 -04:00
Lioncash 11f3ded296 NetPlay: Return mapping arrays and player list vectors directly
Simplifies pad map dialog initialization
2015-08-17 21:56:25 -04:00
Lioncash a824f6a74c Debugger: Remove unused instance variables 2015-08-16 18:30:07 -04:00
Lioncash c593bd226c Frame: Remove an unused enum and array 2015-08-16 18:24:58 -04:00
Lioncash 7aa76a84ef DolphinWX: Fix memory leaks occurring in ISOProperties
This would only occur for Wii discs. While the tree data itself would be deleted, the allocated contents of it were not.
2015-08-16 05:40:07 -04:00
Lioncash 5aa5a100fa CheatSearchTab: Simplify functionality
With auto-updating lists, searching for the previous value isn't
necessary. Also, this breaks out specific functionality into their own
functions, which helps separate UI code from the data processing code.

	modified:   Source/Core/DolphinWX/Cheats/CheatSearchTab.h
2015-08-12 17:49:21 -04:00
Lioncash 00a4184893 CheatSearchTab: Make the search results list auto update address values 2015-08-12 17:49:20 -04:00
Jeffrey Pfau adf6e46200 DolphinWX: Ensure TASInputDlg only gets modified on the main thread 2015-08-11 22:05:18 -07:00
JosJuice e0a47c11f5 Fix reading Wii FST size (for real this time)
04fcb72 fixed an issue with reading the Wii FST size, but I found a second
issue when working on PR #2820 - the size must be shifted left by 2.
DiscScrubber and Boot already do this correctly using separate code.
2015-08-10 16:35:23 +02:00
flacs 6f2400ebc0 Merge pull request #2807 from aserna3/master
Removed audio shortcut from toolbar
2015-08-09 07:55:37 +02:00
Ryan Houdek d9037d6c4a Remove perf_dir Dolphin WX option.
Move the option for the directory to the Dolphin.ini
This way more than DolphinWX can take advantage of it.
2015-08-07 01:59:29 -05:00
Anthony Serna d51267d13c Removed audio shortcut from toolbar
Removed audio.png
2015-08-06 22:35:59 -07:00
Lioncash bef7af1158 CheatSearchTab: Display floating point equivalent results 2015-08-06 10:09:12 -04:00
Lioncash 5882d76a6c CheatSearchTab: Convert wxListBox into a wxListView
Allows us to give the list view columns. This allows removal of monospace font use, as it's now a properly formatted list.
2015-08-06 10:09:00 -04:00
Tillmann Karras 5a05187b3b Fix some warnings
reorder, sign-compare, pessimizing-move
2015-08-04 10:58:24 +02:00
Scott Mansell 8dd9d35689 Merge pull request #2653 from AdmiralCurtiss/netplay-video-mode-sync
Netplay: Sync Video Mode settings. (Progressive Scan and PAL60)
2015-08-02 12:42:21 +12:00
mirrorbender 0faba3b018 Changed the aspect ratio settings to account for NTSC/PAL pixel aspect ratios and VI scaling. 2015-07-31 19:58:02 -04:00
Lioncash 7ee0e75633 Remove unnecessary virtual keywords 2015-07-30 10:33:08 -04:00
Markus Wick 0c4209a0f9 Merge pull request #2716 from degasus/jitgeneric
CachedInterpreter: New kind of jit which always fallback to interpreter.
2015-07-28 16:37:25 +02:00
Ryan Houdek e805e05ff5 Merge pull request #2773 from sigmabeta/android_wiimote_main
Android: Add Wiimote support, including configuration UI.
2015-07-26 16:54:45 -05:00
Jules Blok 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
Jules Blok 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
Lioncash 0babb80652 PostProcessingConfigDialog: Remove an unnecessary format call 2015-07-23 14:39:05 -04:00
Jules Blok 8eee13e7af FrameTools: Disable hotkeys while a modal dialog is shown. 2015-07-23 09:09:01 +02:00
Jules Blok ed50d61287 Merge branch 'stable' 2015-07-23 08:12:57 +02:00
degasus 1c9b5efb4c CachedInterpreter: New kind of jit which always fallback to interpreter. 2015-07-22 23:19:20 +02:00
Jules Blok 703b1e8654 CFrame: Ignore "Pause on Focus Lost" when not started. 2015-07-22 19:31:23 +02:00
Markus Wick deef164c7b Merge pull request #2761 from lioncash/unused
DolphinWX: Remove unused code from MemcardManager
2015-07-22 09:39:53 +02:00
Jules Blok b6c4d5792b Revert "Join the emu thread in Core::Stop. Get rid of Core::Shutdown which did that before."
This reverts commit ba664b3293.

Added documentation to Core::Shutdown() to prevent breaking changes.
2015-07-22 09:15:19 +02:00
flacs 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
Ryan Houdek a8227ad9b1 Add Wiimote support to the Android backend.
Not actually wired up to the Android UI for configuration.
2015-07-21 21:33:23 -05:00
Lioncash fe2f57361e DolphinWX: Remove unused code from MemcardManager 2015-07-21 00:12:40 -04:00
skidau 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
Jules Blok 809e480973 Merge branch 'stable' 2015-07-20 16:04:18 +02:00
Jules Blok ccb56ddf97 CFrame: Claim all keyboard events on OS X. 2015-07-20 10:11:11 +02:00
skidau 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
skidau 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
Lioncash 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
Lioncash 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
Jeffrey Pfau e948aec6cd DolphinWX: Fix build if libusb is disabled 2015-07-17 22:41:12 -07:00
Lioncash 57ca783b72 PathConfigPane: Use shortened variants of the browse buttons 2015-07-16 18:03:14 -04:00
Admiral H. Curtiss 935292c6fc DolphinWX: In Host_ConnectWiimote(), instead of calling CFrame::ConnectWiimote() directly, dispatch an event that will call it for us in the GUI thread.
This eliminates a possible stutter/short freeze that can happen during PowerPC::Pause().
2015-07-16 02:35:57 +02:00
mathieui ac8621ccab GCAdapter: Disable the scanning thread when direct connect is disabled
The goal of this commit is to let people who experience driver issues
with libusb and windows disable the scanning thread (to avoid mouse
issues, keyboard issues, and audio issues).

Also disable the rumble setting when the adapter driver is not detected,
and don’t do anything if libusb can’t init for some reason.
2015-07-14 12:35:40 +02:00
Anthony Serna 18685e2aef Added some warning text about fractional IRs. 2015-07-13 23:33:21 -07:00
Jeffrey Pfau 2eb553fdb7 Fix FreeBSD build 2015-07-11 23:09:11 -07:00
Admiral H. Curtiss 5c0033e6d9 DolphinWX: ParseHotkeys() should use the State::NUM_STATES constant instead of a hardcoded 10. 2015-07-12 05:18:54 +02:00
Admiral H. Curtiss 878629a2bf DolphinWX: GetCmdForHotkey() should have Load Last Slot 9/10 as well. 2015-07-12 05:16:42 +02:00
Admiral H. Curtiss b3471e0abc DolphinWX: Add options to Load Last Slot 9/10 to menu. 2015-07-12 04:14:22 +02:00
Lioncash 81878d7b56 DolphinWX: Get rid of some magic numbers in MemoryView and MemoryWindow 2015-07-09 07:59:34 -04:00
Lioncash b8706791d5 DolphinWX: Pass string by const reference in CISOProperties constructor 2015-07-08 09:48:07 -04:00
Stevoisiak afc1398fbd Fix reading custom titles from WAD files 2015-07-05 15:45:39 -04:00
Stevoisiak 90167abe0f Improve parsing custom game titles from titles.txt
Read game ID based on position of the "=" sign, rather than assuming game IDs are 6 characters in length.
2015-07-05 15:45:27 -04:00
Stevoisiak c2bbcdd16c Read custom titles from wiitdb.txt if titles.txt is not found 2015-07-05 15:45:17 -04:00
Lioncash eb3c5a240f Merge pull request #2696 from RisingFog/tasinput
Fix random hangs when loading savestates with TAS Input
2015-07-04 03:52:40 -04:00
Fog 10f50f33fb Fix random hangs when loading savestates with TAS Input 2015-07-03 21:56:14 -04:00
RGamma 3639755120 Fix TASInput Crash When Stick Bitmap Is Null
Patch provided by RGamma
2015-07-03 18:37:35 -04:00
Anthony Serna 9b95faaed7 Small changes to description to "Store EFB Copies to Texture Only" 2015-07-01 15:48:19 +02:00
Anthony Serna 8d69c2b4b7 Small changes to description to "Store EFB Copies to Texture Only" 2015-07-01 15:46:16 +02:00
Markus Wick 134a18fdad Merge pull request #2674 from lioncash/emplace
Use emplace() instead of insert() where applicable for maps.
2015-06-29 17:19:08 +02:00
Jules Blok c06342c3cf Merge branch 'stable' 2015-06-29 11:04:17 +02:00
Lioncash daa205990f Use emplace() instead of insert() where applicable for maps. 2015-06-28 19:52:40 -04:00
Jules Blok 3f39e38372 CheatSearchTab: Check Core state instead of checking a memory pointer. 2015-06-28 18:28:55 +02:00
Jules Blok 1120132d26 Merge branch 'stable' 2015-06-28 13:28:23 +02:00
JosJuice 66136fc710 Fix more game list name encoding errors caused by 4.0-6419 (d7900b4)
4.0-6442 (a26cf63) didn't fix names read from INIs or titles.txt.
2015-06-28 10:39:24 +02:00
Admiral H. Curtiss c5b81b1aff GameCubeConfig: Case insensitive compare & absolute path compare for the part-of-exe-dir check. 2015-06-27 18:34:54 +02:00
Admiral H. Curtiss 583e3fd9e0 GameCubeConfig: If the user selects a memcard file path within Dolphin's directory, store the path relative to it.
This makes Dolphin more portable in portable mode, since the memory card file is still found if the directory is moved somewhere else.

This also means that we have to explicitly compare absolute paths if we want to check for both slots containing the same file.
2015-06-27 01:11:44 +02:00
Admiral H. Curtiss 84e42904a2 Netplay: Sync Video Mode settings. (Progressive Scan and PAL60)
Must match so that Wii games don't desync, especially PAL games.
2015-06-24 12:41:10 +02:00
sigmabeta a028805626 Android: Save screenshot at end of an emulation session. 2015-06-23 22:22:01 -04:00
comex afaa0d92df Merge pull request #2613 from AdmiralCurtiss/netplay-sram-sync
Netplay: Sync GameCube SRAM.
2015-06-22 12:48:38 -04:00
comex 6d2631a173 Merge pull request #2639 from rukai/master
Translations fix for Linux & Mac OS X
2015-06-21 17:10:07 -04:00
comex 700b850acd Fix misc. clang warnings - mostly complaints about inconsistent use of override.
Previously, MacOpenFile only overrode anything on OS X; otherwise it was
just a useless method, which is presumably why it wasn't marked override
in the first place.  Address this more sanely by wrapping it in #ifdef
__APPLE__.
2015-06-21 15:42:49 -04:00
rukai c9e8179c5a Added namespace to GetBundleDirectory to compile on Mac OSX 2015-06-21 20:41:41 +10:00
rukai bbde9cbeae Swapped out spaces for tabs 2015-06-21 20:41:41 +10:00
rukai cc22151495 Fixes translation on Linux and potentially Mac OSX, by specifying location of *.gmo files 2015-06-21 20:41:41 +10:00
rukai f91a228697 OpenGL exclusive fullscreen OSD notification is made consistent with the one used for D3D. 2015-06-20 00:18:13 +10:00
Lioncash 458378528b DolphinWX: Remove the Toggle IR hotkey.
This isn't necessary since Increase IR and Decrease IR are present.
2015-06-19 05:10:40 -04:00
skidau 3df28a4ea0 Merge pull request #2598 from JosJuice/cache-games-without-banners
Cache games without banners
2015-06-18 09:56:03 +10:00
skidau c6f72115e9 Merge pull request #2596 from AdmiralCurtiss/pal60-config-option
PAL60 improvements: Allow setting in GameINI, disable for NTSC games, store in Movie files.
2015-06-16 14:44:31 +10:00
Fiora c68bb0bdec Merge pull request #2456 from aserna3/master
UI improvements to Add AR Code and Add Patch windows.
2015-06-14 18:53:49 -07:00
Admiral H. Curtiss abb65515b9 Netplay: Sync GameCube SRAM. 2015-06-14 16:52:08 +02:00
JosJuice a7d374bcb9 Cache games without banners
Games without banners were not cached before, because a banner could
become available at any time, making the cache outdated without it
becoming invalidated. Instead of not caching anything, this change makes
Dolphin check for a banner every time a cache that lacks a banner is read.
This is faster than reading all metadata, because reading a Wii banner
only reads from the game's save file, not the volume and its filesystem.

The cache revision is incremented, because otherwise banners will be
missing if a cache without a banner is created in the new version and
the user switches to an old version and creates a savefile.
2015-06-14 12:23:48 +02:00
Matthew Parlane 6d9711c02c Merge pull request #2599 from Sonicadvance1/aarch64_clean_cpudetect
[AArch64] Clean up our CPUDetect.
2015-06-14 15:19:03 +10:00
Matthew Parlane b39014eac5 Merge pull request #2590 from endrift/fix-freebsd-build
Fix FreeBSD
2015-06-14 15:18:26 +10:00
Jeffrey Pfau 7085fcc8d6 Fix FreeBSD build 2015-06-13 21:52:47 -07:00
JosJuice 01e324eed0 Move GetCompany() to ISOFile.h/GameFile.h
For consistency with the other Get methods.
2015-06-13 18:43:10 +02:00
Ryan Houdek 0af5bdcf1d [AArch64] Clean up our CPUDetect.
Drops ARMv7 feature detection.
2015-06-13 08:04:23 -05:00
Admiral H. Curtiss 92447fb052 Config: Add a boolean for PAL60, like the Progressive Scan one.
This decouples the Dolphin PAL60 option from the currently set value in the Wii SYSCONF file.
2015-06-13 02:09:19 +02:00
degasus c375111076 Options: merge SCoreStartupParameter into SConfig 2015-06-12 19:07:45 +02:00
Admiral H. Curtiss 33f5aaf956 GameCube Config: Add option to override the NTSC auto language change.
Some NTSC games have translations on the game disc that can be accessed via the system language byte.
2015-06-11 18:40:41 +02:00
Markus Wick be1d1e2798 Merge pull request #2024 from RisingFog/irgui
Add UI Support for up to 8x Internal Resolutions
2015-06-11 15:47:39 +02:00
Fog 6e7fedd4d0 Add UI Support for up to 8x Internal Resolutions 2015-06-10 20:17:30 -04:00
degasus 640b81a19f Hotkeys: Fix "Select State Slot"
This was a copy&paste issue from dfc951fbbb.

Fixes https://code.google.com/p/dolphin-emu/issues/detail?id=8645
2015-06-09 21:05:54 +02:00
comex 9ed7e3bd3e Merge pull request #2536 from endrift/deploy-mac
Tools: Use non-CMake tool for fixing up OS X bundles
2015-06-08 17:33:17 -07:00
Anthony Serna 57f7129295 Changed AR Code Window and Patch Window
Text fields no longer have redundant text.
Blank text variables no longer have redundant translation syntax.
Removed redundant else condition.
Fixed bug with cheat name deleting itself on edit.
2015-06-08 17:02:16 -07:00
JosJuice ec0370d2d1 Volume: Add prefer_long parameter to GetNames
GC games with long names store two variations of the name in
opening.bnr. This makes the shorter of those names available.
For volumes other than GC discs, prefer_long is ignored.
2015-06-08 12:00:34 +02:00
Ryan Houdek 881f6db2ab Merge pull request #2509 from comex/fix-ar-codes
Fix subdialogs of the ISO props dialog... sort of
2015-06-08 04:13:16 -04:00
Ryan Houdek 59e2225f7d Remove ARMv7 support. 2015-06-07 22:44:13 -05:00
Ryan Houdek 51b440fbcf Merge pull request #2449 from sigmabeta/android-decouple-surfaceview
\Android: Decouple SurfaceView initialization and emulation start.
2015-06-07 23:18:56 -04:00
Ryan Houdek 9521bc1fc6 Merge pull request #2558 from sigmabeta/android-panic-alerts
Android: Display Panic Alerts on-screen as a Toast message.
2015-06-07 23:14:34 -04:00
Matthew Parlane 9e1aab663f Revert "SDL: handle SDL_QUIT event" 2015-06-08 13:43:39 +12:00
sigmabeta d752ee73c0 Android: Remove old panic alert messsaging flags. 2015-06-07 20:16:55 -04:00
sigmabeta 3038368128 Android: Display Panic Alerts on-screen as an Android Toast message. 2015-06-07 20:13:52 -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
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
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
Matthew Parlane cf8f049c4d Merge pull request #2518 from degasus/hotkeys
Hotkeys: Drop old GUI
2015-06-07 20:10:10 +10: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
JosJuice b61f41e698 Remove reference to DSP on Dedicated Thread 2015-06-07 00:01:57 +02:00
Jeffrey Pfau c1c472958e Tools: Use non-CMake tool for fixing up OS X bundles 2015-06-06 12:44:47 -07:00
mimimi085181 bd5e55bc59 Fix line ending bug for downloaded gecko codes 2015-06-06 19:15:15 +02: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
Tillmann Karras 9ec5a4544f SDL: handle SDL_QUIT event
Using SDL_INIT_JOYSTICK implies SDL_INIT_EVENTS which installs a signal
handler for SIGINT and SIGTERM. There will be a way to prevent this in
2.0.4 but for now we'll need to handle SDL_QUIT.
2015-06-05 19:34:06 +02:00
JosJuice 0ed3118141 Volume: Return volume type as an enum
ISOFile and GameFile were using IsWiiDisc() and IsWadFile() to set
an enum value. The volume might as well return an enum directly.

I increased the Qt CACHE_REVISION because m_platform now is saved as u32
instead of int, but increasing the wx CACHE_REVISION is not necessary.
2015-06-04 16:26:36 +02:00
JosJuice 95a2abc1ce Use PanicAlertT instead of PanicAlert when appropriate
I tried to change messages that contained instructions for users,
while avoiding messages that are so technical that most users
wouldn't understand them even if they were in the right language.
2015-06-04 13:25:06 +02:00
degasus dfc951fbbb Hotkey: move some code into ParseHotkey 2015-06-04 10:44:20 +02:00
Jasper St. Pierre c84cefa990 Remove wx-based Hotkey stuff
The core InputCommon Hotkeys interface does all of this for us.
2015-06-04 10:44:20 +02:00
degasus 501ebdb471 Hotkeys: Fix duplicated called hotkeys. 2015-06-03 19:26:43 +02:00
comex 349f9d5493 Merge pull request #2484 from JosJuice/volume-return-types
Volume: Use more appropriate types for some returned values
2015-06-02 20:29:08 -04:00
comex 2ae6fb9240 Merge pull request #2338 from JosJuice/getfilelist-return
Filesystem: Return file list reference instead of modifying argument
2015-06-02 20:28:25 -04:00
comex 36b554613c Merge pull request #2494 from Sonicadvance1/common_disassembler
Break out the disassembler code from the WXWidgets UI.
2015-06-02 20:26:26 -04:00
comex 3af30d12ed Fix subdialogs of the ISO props dialog... sort of
On OS X, if you close a subdialog of the ISO Properties dialog, such as
the one to add a new AR code, the main Dolphin window would magically
get raised above ISO Properties.  This is confusing, to say the least;
when I encountered this the other day, I thought the dialog was actually
getting closed.

I *think* the diagnosis looks like this:
Cocoa expects NSPanel (not to be confused with wxPanel) to be for things
like find dialogs, font dialogs with the little title bars, sheets, etc.
See:
https://developer.apple.com/library/mac/documentation/Cocoa/Conceptual/WinPanel/Concepts/ChangingMainKeyWindow.html
Therefore, NSPanels return NO for canBecomeMainWindow, which is
documented; and when [NSWindow orderOut:] is called to hide a window,
Cocoa seems to want to make the window it focuses in its place a main
window, which, as far as I can tell, is not.  So if the next highest
window is a panel, it gets skipped over.  (I tested this by overriding
wxNSPanel's canBecomeMainWindow to return YES, in which case the right
window gets focused, but this isn't a correct fix.)

The ISO Properties dialog does have grounds to be a dialog/panel - the
close button, whose positioning is provided by the wxDialog class.  This
is arguably simply a roundabout discovery that our UI sucks for an OS X
app and that to be consistent with other nonmodal preferences dialogs,
it shouldn't have such a button on OS X (though ESC to close is still
kosher).  However, I'm not willing to make that change right now, so...

Hack around the problem by calling Raise (on this) after each call to
ShowModal in CISOProperties.  The resulting behavior is slightly
glitchy, and I'd like to revisit it, but for now it fixes the issue.
2015-06-02 20:15:12 -04:00
comex 97d6b71f3f fix duplicate variable definition 2015-06-02 18:49:53 -04:00
comex a3b3f0522b Merge pull request #1556 from comex/project-moration
Rudimentary version of Wii IPC determinism.  Ported from my old udpnet branch.
2015-06-02 18:38:19 -04:00
aerisarn f403bb09b0 MainNoGUI: support real Wiimotes
This should be restructured to move the connection logic into Core
instead of duplicating it in every Host, but alas, I'm too lazy for
that right now. ~flacs
2015-06-01 14:59:22 +02:00
Lioncash 2cb073291c Merge pull request #2490 from endrift/fix-tas-threading
DolphinWX: Fix threading issues with TAS pad updates
2015-05-31 23:24:40 -04:00
Ryan Houdek d0ae3f7d24 Break out the disassembler code from the WXWidgets UI.
This cleans up some of the code between core and UI for disassembling and dumping code blocks.
Should help the QT UI in bringing up its debug UI since it won't have to deal with this garbage now.
2015-05-31 18:16:59 -05:00
Jeffrey Pfau 704f787c5a DolphinWX: Fix threading issues with TAS pad updates 2015-05-31 03:08:07 -07:00
degasus ef3ed682a1 DolphinWX: Also evaluate Hotkeys while stopped. 2015-05-31 10:00:07 +02:00
degasus 19f753de6b HotKey: Allow more than one hotkey at the same time. 2015-05-31 09:27:04 +02:00
JosJuice 301218a103 Volume: Use more appropriate types for some returned values
Disc number is changed from bool to u8, and revision is changed from
int to u16 (WADs can use all 16 bits, but discs can only use 8 bits).
2015-05-29 21:14:02 +02:00
comex dc91e8b607 Add a mode to use a dummy Wii NAND.
Eventually, netplay will be able to use the host's NAND, but this could
still be useful in some cases; for TAS it definitely makes sense to have
a way to avoid using any preexisting NAND.

In terms of implementation: remove D_WIIUSER_IDX, which was just WIIROOT
+ "/", as well as some other indices which are pointless to have as
separate variables rather than just using the actual path (fixed, since
they're actual Wii NAND paths) at the call site.  Then split off
D_SESSION_WIIROOT_IDX, which can point to the dummy NAND directory, from
D_WIIROOT_IDX, which always points to the "real" one the user
configured.
2015-05-28 19:14:42 -04:00
comex a225426510 Rewrite FileSearch and improve ScanDirectoryTree.
- FileSearch is now just one function, and it converts the original glob
  into a regex on all platforms rather than relying on native Windows
  pattern matching on there and a complete hack elsewhere.  It now
  supports recursion out of the box rather than manually expanding
  into a full list of directories in multiple call sites.

  - This adds a GCC >= 4.9 dependency due to older versions having
  outright broken <regex>.  MSVC is fine with it.

- ScanDirectoryTree returns the parent entry rather than filling parts
  of it in via reference.  The count is now stored in the entry like it
  was for subdirectories.

- .glsl file search is now done with DoFileSearch.

- IOCTLV_READ_DIR now uses ScanDirectoryTree directly and sorts the
  results after replacements for better determinism.
2015-05-28 19:14:42 -04:00
Fog c767813c0c Fix adding additional Disc 2 to certain multi-disc games 2015-05-27 11:08:57 -04:00
JosJuice f1580a4c91 Fix game list name encoding error caused by 4.0-6419 (d7900b4)
The UTF-8 std::strings were being interpreted as the default encoding.
2015-05-27 12:28:23 +02:00
skidau 8944e07f84 Merge pull request #2457 from degasus/master
DolphinWX: Drop dead hotkey button.
2015-05-26 23:53:46 +10:00
degasus b64301d65c DolphinWX: Drop dead hotkey button. 2015-05-26 15:50:15 +02:00
Markus Wick d7900b4423 Merge pull request #2006 from RisingFog/disc2
Append Disc 2 to Titles for Multi-Disc Games
2015-05-26 15:39:42 +02:00
Markus Wick a6412fb41e Merge pull request #2162 from degasus/prefetch_tex
CustomTexture: prefetch all available textures
2015-05-26 13:30:26 +02:00
Ryan Houdek b0b5f4d10d Merge pull request #2326 from JosJuice/isoproperties-config-block
ISOProperties: Don't block when opening default INI in text editor
2015-05-25 23:42:26 -04:00
Ryan Houdek c88d6c804a Merge pull request #2430 from Sonicadvance1/android_panic_handler
[Android] Add support for panic alerts to the JNI.
2015-05-25 23:37:48 -04:00
Ryan Houdek 4ba430951a Merge pull request #2439 from JosJuice/company-from-id
Use an ID-to-name map when volume has no company string
2015-05-25 23:32:55 -04:00
Ryan Houdek d789d8d75f [Android] Add support for panic alerts to the JNI. 2015-05-25 22:13:00 -05:00
Ryan Houdek 0c5f5c4519 Merge pull request #2394 from Sonicadvance1/android_block_profiling_api
[Android] Block profiling JNI interface
2015-05-25 23:06:37 -04:00
Ryan Houdek 69963dc4b0 Merge pull request #2274 from degasus/disable_bbox
Disable bbox
2015-05-25 08:46:12 -04:00
Tillmann Karras 30ebb2459e Set copyright year to when a file was created 2015-05-25 13:22:31 +02:00
Tillmann Karras cefcb0ace9 Update license headers to GPLv2+ 2015-05-25 13:22:31 +02:00
Tillmann Karras 268f52e054 Add missing license headers 2015-05-25 13:11:47 +02:00
Tillmann Karras 6d9986846c Simplify some more license headers 2015-05-25 13:11:41 +02:00
degasus acd074e291 VideoCommon: Make BBox emulation optional 2015-05-25 09:33:34 +02:00
Eder Bastos 4faff3cf62 Android: Decouple SurfaceView initialization and emulation start. 2015-05-24 19:40:11 -04:00
JosJuice d2e6adb045 Use an ID-to-name map when volume has no company string
This is written so that the result of GetCompanyFromID never is cached
(except on Android?). Caching is unnecessary because the string can be
obtained quickly at runtime, and not caching it means that the cache
doesn't have to be invalidated when GetCompanyFromID is edited.
2015-05-24 17:41:53 +02:00
Lioncash 5c3fecc8e5 DolphinWX: Add missing breaks to a switch in RegisterView
Technically the fallthrough would never happen, as the row numbers correspond to the grid view (which will always be zero or greater). However, it gets rid of compiler warnings on higher warning levels.
2015-05-23 22:16:39 -04:00
Lioncash 474188d606 Merge pull request #2432 from lioncash/android
ButtonManager: Pass strings by const reference
2015-05-21 22:37:47 -04:00
Lioncash 8a2f70b2ef ButtonManager: Pass strings by const reference 2015-05-21 22:22:52 -04:00
Eder Bastos 3e5e352fee Android: Implement an SQLite database-based game library. 2015-05-20 19:55:55 -04:00
Eder Bastos 5b0c047e0b Android: Remove inheritance from Game model, and improve the relevance of its content 2015-05-20 19:46:19 -04:00
Eder Bastos 4c786cb70c Android: Implement reading country value from game files. 2015-05-20 19:44:31 -04:00
Lioncash 8dc2909c00 JitWindow: Add missing virtual destructor to HostDisassembler
HostDisassemblerLLVM has a destructor, but the class uses a pointer to the base class.
2015-05-20 12:27:47 -04:00
degasus 242f7d964d CustomTexture: prefetch all available textures 2015-05-16 15:12:07 +02:00
skidau 132ae5f457 Merge pull request #2349 from mathieui/remove-traversal-options-ui
Netplay: don’t show traversal server/port options (INI config only)
2015-05-15 12:34:05 +10:00
skidau bdeb067597 Merge pull request #2402 from JosJuice/internal-title
Volume: Rename GetName to GetInternalName
2015-05-13 13:19:41 +10:00
skidau a6739c0960 Merge pull request #2386 from mathieui/irhotkeys
Add hotkeys to increase/decrease the IR
2015-05-12 13:05:53 +10:00
Ryan Houdek 5bbaa85f25 Merge pull request #2389 from sigmabeta/lollipop-ui-tweaks
Android: Add file browser screen to new UI, and several tweaks.
2015-05-11 11:35:51 -04:00
Lioncash af2daf6c5c WiiConfigPane: Handle switch cases explicitly
Gets rid of a warning on higher warning levels (switching on an enum type should handle cases explicitly)
2015-05-11 06:37:07 -04:00
JosJuice bad09fc358 Volume: Rename GetName to GetInternalName
This is intended to better separate it from GetNames and to clarify
that this name originally wasn't meant to be shown to users.
The ISOProperties GUI is also updated, mainly because labeling
the long banner name "short name" was confusing.
2015-05-11 11:19:30 +02:00
Tillmann Karras cdf6d185f6 Fix -Wswitch warning 2015-05-11 10:17:36 +02:00
Ryan Houdek a36dc19d9b Add JNI interface for enabling writing block profile results. 2015-05-10 20:03:34 -05:00
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
Eder Bastos ca4bec3539 Don't show "Error" when a blank string is returned from a native method. 2015-05-10 10:46:46 -04:00
Lioncash fcaaa9f649 HotkeyDlg: Fix keypress event binding
Previously no keypresses would be recognized during the button press phase.
2015-05-10 03:35:01 -04:00
mathieui ea709b6c12 Add hotkeys to increase/decrease the IR 2015-05-10 02:02:47 +02:00
Lioncash 76bbd46829 Core: Remove some header inclusions in header files
Replaces them with forward declarations of used types, or removes them entirely if they aren't used at all. This also replaces certain Common headers with less inclusive ones (in terms of definitions they pull in).
2015-05-08 22:38:59 -04:00
Lioncash a7d5084e1f Merge pull request #2375 from sigmabeta/lollipop-ui-update
Implement first few screens of Android 5.0-based UI.
2015-05-08 12:57:00 -04:00
Lioncash a7e9aea797 DolphinWX: Remove unnecessary includes 2015-05-08 12:39:26 -04:00
Lioncash cb20589d7f Merge pull request #2341 from lioncash/fwd
DolphinWX: Remove unnecessary forward declarations
2015-05-08 09:54:23 -04:00
Chris Burgener 5af98db8c3 Append Disc 2 to Titles for Multi-Disc Games
Fixes issue 5799

https://code.google.com/p/dolphin-emu/issues/detail?id=5799
2015-05-07 22:59:16 -04:00
Eder Bastos b47835fc07 Implement first few screens of Android 5.0-based UI. 2015-05-07 22:27:42 -04:00
shuffle2 94995503aa Merge pull request #2374 from randomstuff/fix-unpn
Fix build without UPnP
2015-05-07 18:36:02 -07:00
Lioncash f77587506f Merge pull request #2345 from lioncash/tl
VideoConfigDiag: Simplify string translation handling
2015-05-07 05:05:48 -04:00
Gabriel Corona 469ea24717 Fix build without UPnP
There is no checkbox.
2015-05-06 20:59:19 +02:00
Ryan Houdek 80fe5e0a55 Merge pull request #2370 from sigmabeta/native-libs-task-removal
Remove the "nativeLibsToJar" gradle task.
2015-05-06 09:16:43 -04:00
Eder Bastos 2fe4b9ce68 Remove the "nativeLibsToJar" gradle task. 2015-05-05 22:34:56 -04:00
skidau 571cdcddd8 Merge pull request #2340 from dibas/testing
Show the cursor in os x fullscreen by default. Fixes issue 8376.
2015-05-06 12:28:45 +10:00
comex 6414cdabb2 Merge pull request #2286 from JosJuice/wii-opening-bnr
Read opening.bnr to get names from Wii discs
2015-05-05 16:20:04 -04:00
Ryan Houdek f9dc8a39c0 Merge pull request #2350 from sigmabeta/master
Convert the Android source code to Gradle.
2015-05-03 22:01:02 -04:00
JosJuice df8e768b77 wx: Now that Wii doesn't support descriptions, rename Notes to Maker
I'm not sure if Maker is the best name (Developer? Publisher?
Company? Copyright?) but I went with it because it's
what the game properties window uses. For the sake of
backwards compatibility, the INI option wasn't renamed.
2015-05-03 16:13:55 +02:00
Eder Bastos 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
mathieui 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
skidau 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
mathieui df8b86ed63 Traversal: use the defaults if empty or space-only config entries are detected 2015-05-01 03:11:28 +02:00
Simon McFarlane 886e5c80dd Remove BanishBackground function
No longer needed
2015-04-30 17:33:24 -07:00
Simon McFarlane e6e046e37c Make revision text wxStaticText 2015-04-30 17:32:45 -07:00
Simon McFarlane df341ffba6 Change about page branch info to wxStaticText 2015-04-30 17:22:37 -07:00
mathieui c452e72ca7 Netplay: don’t show traversal server/port options (INI config only) 2015-05-01 02:03:53 +02: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
mathieui ec7445d66b GCAdapter: Add a setting to toggle rumble 2015-04-30 11:35:16 +02:00
mathieui 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
Simon McFarlane cd7466864e Make OC slider match enabled state on window load 2015-04-30 01:28:43 -07:00
Lioncash 0004b6004b VideoConfigDiag: Simplify string translation handling
Explicit wxGetTranslation usage isn't necessary
2015-04-30 04:18:13 -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
Rohit Nirmal 76181f9327 Silence -Wshadow and -Wsign-compare warnings. 2015-04-29 19:59:34 -05:00
JosJuice ee694e327a Get rid of banner loaders and move their functionality to volumes
Having some data available in banner loaders and some other data
data available in volumes gets messy, especially with GetNames(),
which is available in both but returns different results
depending on which one is used. This change drops support
for reading names and descriptions from Wii save data.
2015-04-28 23:44:29 +02:00
Lioncash 88f7536d81 DolphinWX: Remove unnecessary forward declarations
These are all fully defined
2015-04-28 17:32:38 -04:00
dibas 441976e09b Show the cursor in os x fullscreen by default. Fixes issue 8376. 2015-04-28 22:12:39 +02:00
JosJuice d43a920924 Filesystem: Return file list reference instead of modifying argument 2015-04-28 12:48:05 +02: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
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
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 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
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 db1d81ebf8 ISOProperties: Don't block when opening default INI in text editor
The purpose of blocking is to reload user INIs after they
have been edited. However, ISOProperties never reloads
default INIs, because they aren't meant to be edited.
Blocking on default INIs is thus useless, and it's
rather annoying for games that have two default INIs,
because it makes it impossible to see both at once.
2015-04-25 22:15:48 +02: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
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 3499f2c2d0 To make up for it, make pressing enter on the value textbox set the value. 2015-04-24 22:19:21 -04:00
comex 0c18e5886d Remove mnemonics in MemoryWindow.
On OS X, this broke Cmd-V to paste in the text boxes.  Apparently wx
thinks having mnemonics (which are Alt-* on Windows) be Cmd-* on OS X,
even if this disables standard shortcuts, is a good idea.

Lioncash suggested just getting rid of the accelerators on non-menu
controls, so I'm doing that rather than disabling them only on OS X.
2015-04-24 22:06:03 -04:00
comex 37d00cceda Fix wx bullshit which made the watch view assert on my machine.
1) Apparently wxString::Format is type safe, and passing a u32 to it
with the format "%lu" crashes with a meaningless assertion failure.
Sure, it's the wrong type, but the error sure doesn't help...

2) "A MenuItem ID of Zero does not work under Mac".  Thanks for the
helpful assert message, no thanks for making your construct have random
platform-specific differences for no reason (it's not like menu item IDs
directly correspond to a part of Cocoa's menu API like they do on
Win32).
2015-04-24 22:04:46 -04:00
JosJuice 2e10a71dcd Fix extracting files from Wii discs
I broke it for individual files but not folders in 4.0-6016.
2015-04-24 22:08:15 +02:00
JosJuice 235ecfbed7 Return GetNames languages, to avoid hardcoded language lists in callers
This makes the code cleaner and also leads to some user-visible changes:

The wx game properties will no longer let the user
select WAD languages that don't have any names.

The Qt game list will now display names using the languages
set in the configuration instead of always using
English for PAL GC games and Japanese for WADs.

If a WAD doesn't have a name in the user's preferred language,
English is now selected as a fallback before Japanese.
2015-04-23 08:14:39 +02:00
Lioncash 819f4d994c DolphinWX: Remove superfluous code in FrameTools 2015-04-22 19:56:50 -04:00
Rachel Bryk 5047cf562a Implement classic controller tas input. 2015-04-22 16:19:13 -04:00
comex 31ea8d0834 Merge pull request #2310 from lioncash/fsmenu
FrameTools: Use AppendRadioItem for constructing the frameskip menu
2015-04-22 00:39:17 -04:00
Markus Wick 4340927b7f Merge pull request #2308 from Stevoisiak/FrameToolsMath
FrameTools: Remove redundant 'i-1'
2015-04-21 16:17:02 +02:00
Lioncash ebe0222265 FrameTools: Use AppendRadioItem for constructing the frameskip menu
Same thing, less code.
2015-04-20 21:51:30 -04:00
Stevoisiak c3cf43f064 FrameTools: Remove redundant 'i-1' 2015-04-20 20:24:37 -04:00
Matthew Parlane a86f2fe2e7 Merge pull request #2199 from skidau/remove-controls-lock
Cleaned up the controller locking mechanism
2015-04-21 11:13:30 +12:00
Lioncash d27b8673f5 Merge pull request #2306 from Stevoisiak/MoveUndoSaveState
FrameTools: Move "Undo Save State" to save state menu
2015-04-19 20:45:41 -04:00
Stevoisiak 83ec7a1e78 FrameTools: Move "Undo Save State" to save state menu 2015-04-19 20:18:11 -04:00
Stevoisiak 8adf8b16bc Globals.h: Added comments for menu sections 2015-04-19 18:51:55 -04:00
degasus 8c209b3bc9 no-gui: fix help string 2015-04-18 15:03:42 +02:00
skidau 7063886520 Merge pull request #2289 from lioncash/netplay
DolphinWX: Break the netplay UI controls into separate classes.
2015-04-16 12:35:41 +10:00
skidau f0593095b4 Merge pull request #2295 from comex/fix-usb-threading
Fix threading issues
2015-04-16 12:33:20 +10:00
skidau 70605cae5c Merge pull request #2300 from lioncash/update
Debugger: Update the registers/watches before refreshing grids.
2015-04-16 12:30:24 +10:00
skidau c895e4504a Merge pull request #2298 from JosJuice/partitions-no-string-parsing
Fix extracting Wii disc partitions numbered 10 or higher
2015-04-16 12:00:40 +10:00
skidau 221d37ae83 Merge pull request #2287 from lioncash/hkbinds
HotkeyDlg: Get rid of application-wide event bindings.
2015-04-16 11:59:24 +10:00
skidau 6b82b31640 Merge pull request #2285 from linkmauve/nogui-no-x11
NoGUI: Don’t segfault when the DISPLAY environment variable isn’t set
2015-04-16 11:58:15 +10:00
Emmanuel Gil Peyrot 1e7ca7f579 NoGUI: Don’t segfault when the DISPLAY environment variable isn’t set 2015-04-16 01:10:57 +02:00
JosJuice 86ceb54c38 Fix extracting Wii disc partitions numbered 10 or higher
Instead of trying to get the partition number from the
(localized!) item name, the partitions are now stored as item data.
2015-04-15 09:29:24 +02:00
Lioncash 2cddb8f480 Debugger: Update the registers/watches before refreshing grids. 2015-04-15 00:13:13 -04:00
Lioncash a6970b3744 Merge pull request #2288 from lioncash/unnecessary
ISOProperties: Remove unnecessary/unused variables & controls.
2015-04-14 10:42:29 -04:00
Lioncash 882080c282 Merge pull request #2284 from lioncash/leaks
DolphinWX: Fix memory leaks relating to the TAS dialog
2015-04-14 10:38:48 -04:00
comex 8ebe3d3478 Remove unused field. 2015-04-13 02:27:08 -04:00
comex ba664b3293 Join the emu thread in Core::Stop. Get rid of Core::Shutdown which did that before.
Core::Shutdown was only called on app exit, yet the emu thread exits
whenever emulation stops; if you launched a new game it would just join
via the destructor when s_emu_thread was set to a new thread.
(Incidentally, the destructor also makes explicitly joining on app exit
rather pointless.)

Because the GUI thread wasn't waiting for the CPU thread to fully shut
down, Core::IsRunning would remain true briefly after CFrame::DoStop
which, given Dolphin's penchant for accessing variables belonging to
other threads, can only mean trouble... In my case, because the previous
commit caused UpdateGUI, which is called at the end of DoStop, to call
PauseAndLock, which checks IsRunning, pressing stop at the right time
would cause strange behavior.
2015-04-13 02:17:38 -04:00
comex e000aaaf5d Have the UI thread do PauseAndLock before messing with GetUsbPointer.
Since its lifetime is managed on the CPU thread, this (or a refactoring)
is absolutely required.  One of the functions with a PauseAndLock call
added is CFrame::UpdateGUI; this is fine now, since it's called only
after important events happen, so just make sure not to call it every
frame or something :)
2015-04-13 01:49:24 -04:00
JosJuice bd680aa3b5 Main: Remove unnecessary shellapi.h include
The include was introduced by bcf1f54c and made unnecessary by 611f3494.
2015-04-12 10:22:18 +02:00
Rachel Bryk 48a1d97fe7 Disable oc setting while netplay or movie is active. 2015-04-11 03:54:11 -04:00
Lioncash bd28d260ce DolphinWX: Break the netplay UI controls into separate classes. 2015-04-11 01:35:54 -04:00
Lioncash 5d7cd29a8b ISOProperties: Remove unnecessary/unused variables & controls. 2015-04-10 19:53:58 -04:00
Lioncash 9cc244e913 HotkeyDlg: Get rid of application-wide event bindings.
This dialog is used as a modal dialog, so making the key-press event bindings application-wide is unnecessary.
2015-04-10 19:31:37 -04:00
Lioncash 00943b1ef4 DolphinWX: Fix memory leaks relating to the TAS dialog
Initially, the dialogs construct in the background when Dolphin initializes. However, it waits until the user actually makes the dialogs visible to decide on whether to create the Wii or GC control layouts.

Therefore, the call to CreateBaseLayout() essentially creates a sizer that isn't actually attached to a main sizer that is set as the sizer for the dialog to use. So upon destruction, these controls would never actually be destroyed if the user didn't open and then close the TAS dialogs.
2015-04-09 23:33:33 -04:00
Lioncash 1a18cad178 Merge pull request #2281 from Stevoisiak/MoveCountryWorld
Re-sort Country_World
2015-04-09 12:15:18 -04:00
Lioncash 2c2409fee4 Merge pull request #2278 from lioncash/leak
Debugger: Fix memory leaks related to grid tables
2015-04-09 11:07:27 -04:00
Stevoisiak 7c1ab2911a Move down Country_World
The countries are sorted alphabetically. This should have been changed
when the variable was renamed from Country_International to
Country_World
2015-04-08 18:55:16 -04:00
Lioncash 180854c617 Debugger: Fix memory leaks related to grid tables
Incrementing the reference count here isn't necessary, as they construct with a count of 1. Incrementing again results in the attributes not being freed.
2015-04-07 23:16:29 -04:00
skidau ff891394e8 Merge pull request #2248 from mathieui/netplay-disable-ui
NetPlay: Disable some UI elements when a game is running
2015-04-08 11:56:06 +10:00
Lioncash ec96119f8c TASInputDlg: Remove unnecessary explicit bools 2015-04-07 21:44:51 -04:00