Commit Graph

3353 Commits

Author SHA1 Message Date
skidau 5da3375bf1 Merge pull request #2245 from lioncash/tables
DolphinWX: Get rid of wxGrid-based casts in the debugger.
2015-03-30 12:20:20 +11:00
Rachel Bryk d4fa8de35a Fix enable cheats checkbox. 2015-03-29 20:43:51 -04:00
skidau 731e4a3a65 Merge pull request #2250 from RachelBryk/tasinput-home
Fix home button in tas input.
2015-03-29 16:40:57 +11:00
Rachel Bryk 35bdfd5ec9 Fix home button in tas input. 2015-03-28 07:40:21 -04:00
skidau 4f965da4f1 Revert the recent changes related to updating hwnd 2015-03-28 11:08:25 +11:00
skidau 74f25ad8ec Merge pull request #2234 from lioncash/config
DolphinWX: Break up ConfigMain into separate classes.
2015-03-28 10:11:29 +11:00
mathieui 666c06dce7 NetPlay: Disable some UI elements when a game is running
because it makes dolphin crash, and it doesn’t make sense to change them
at runtime
2015-03-27 18:43:06 +01:00
Lioncash 5ada887f94 DolphinWX: Get rid of wxGrid-based casts in the debugger.
This technically also fixes a memory leak in WatchView.cpp, because the table setting was done such that the grid wouldn't take ownership of the table, which means said table wouldn't be deleted in the grid's destructor.
2015-03-24 14:09:33 -04:00
Lioncash eacf741051 DolphinWX/Common: Change some find_first_of usages to find
It's unnecessary to use find_first_of when all you're searching for is a single character.
2015-03-24 08:32:44 -04:00
Lioncash 7dcb6a3e6c DolphinWX: Initialize the HotkeyManager after input backends are initialized
Previously OSX would crash upon loading. This is because the UI would be polling for hotkey inputs but was doing so before the inputs backends were initialized.
2015-03-23 08:36:13 -04:00
skidau 63c4bd665e Merge pull request #2230 from skidau/Mouse-In-Separate-Window
Updated the input plugins reference of hwnd on game start.
2015-03-21 12:46:37 +11:00
skidau 87bffb5972 Added event.Skip() to the OnFocusChange event. Fixes the pulldown menus. 2015-03-20 22:01:23 +11:00
skidau 98dce11f8c Updated the input plugins reference of hwnd on game start. Fixes the emu wiimotes mouse IR when rendering the game to a separate window. 2015-03-19 21:31:05 +11:00
Lioncash b459a8ec61 DolphinWX: Propagate event to refresh the game list
Prior to this refactor, certain options would cause the game list to refresh when the config modal dialog is closed (such as adding a folder to the path list). This restores that functionality.
2015-03-18 22:48:05 -04:00
Lioncash febd3909c6 DolphinWX: Eliminate remnants of the event table in ConfigMain 2015-03-18 22:48:03 -04:00
Lioncash 086ec7a9b7 DolphinWX: Break up ConfigMain.cpp into separate classes
Prior to this, ConfigMain.cpp was a large (52KB) cpp file that contained all of the UI setting code.

This breaks up the config code into subclasses of wxPanel, which are then just instantiated to add to the settings wxNoteBook. This keeps all the settings categories separated from one another and also cleans up the code in general.
2015-03-18 22:47:49 -04:00
skidau 7d800b6180 Merge pull request #2224 from gerikkub/AutoFocus
Pause the emulator based on mouse focus
2015-03-19 12:48:03 +11:00
mathieui 849922881d NetPlay: Select a game only if enet connected successfully 2015-03-18 10:16:11 +01:00
Gerik Kubiak ae4e8b6358 Changed screen to window. Moved UpdateGUI to a more general scope. 2015-03-17 12:14:14 -07:00
Gerik Kubiak 0a28f7de13 Added checkbox under Config > Interface. 2015-03-16 22:13:27 -07:00
Gerik Kubiak 88fb8edf8e Change behavior so emulation is paused when window focus is lost. 2015-03-16 21:31:13 -07:00
Gerik Kubiak 341e7e9d8f Added the ability to pause the emulator by moving the mouse outside the window. 2015-03-16 20:28:17 -07:00
magumagu 4b7748f3c0 Merge pull request #2205 from Stevoisiak/FormattingCleanup
Formatting Cleanup
2015-03-16 17:47:29 -07:00
magumagu adb8bbed90 Merge pull request #2217 from shuffle2/quiet-warnings
quiet some warnings which appear on vs2015.
2015-03-16 11:50:42 -07:00
Lioncash c73cac3ee9 Merge pull request #2220 from shuffle2/win-con-listener
[windows] Replace ConsoleListener, which was not actually used.
2015-03-16 02:03:27 -04:00
Shawn Hoffman 78be0ab9ad [windows] Just kill ExtendedTrace.
The code is not really worth saving, and afaik it has never actually been helpful.
2015-03-15 22:30:38 -07:00
Shawn Hoffman 0a79b6d5a7 [windows] Remove ConsoleListener, which was not actually used.
Replace it with the DebuggerLogListener.
2015-03-15 22:11:18 -07:00
Shawn Hoffman ad64336137 quiet some warnings which appear on vs2015.
quieted warnings include shadowed variable names and integer extensions.
2015-03-15 19:28:47 -07:00
Ryan Houdek aaf04aeaca Fix user directories at times doing stupid things.
With my previous changes Dolphin would fail to create the user directory if it didn't exist, and would dump all the configuration options in to the cwdir.
This was a bit more complicated to fix in a clean fashion, so I took to moving around code concerning user directories.
Instead of having GetUserPath serve a dual purpose of both getting and setting our user directories, break out to a new SetUserPath function.

GetUserPath will know only get the configured user path.
SetUserPath will set our user paths and setup the internal user path state.

This ending up being a lot cleaner overall, which is nice. Also less mind bending when attempting to read the code.

So now we won't dump all of our configuration in to the cwdir if ~/.dolphin-emu isn't found.

Fixes issue 8371.
2015-03-15 09:19:48 -05:00
Stevoisiak 4f71b717cc ConfigMain: Change _NTSC to ForceNTSCJ
This is consistent with the name of the setting in dolphin.ini
2015-03-13 17:59:30 -04:00
Stevoisiak efb64c1885 Change OnGameListCtrl_ItemActivated to OnGameListCtrlItemActivated 2015-03-13 16:47:06 -04:00
Stevoisiak 2f0e3d239d DolphinWX: Changed "OnShow_CheatsWindow" to "OnShowCheatsWindow" 2015-03-13 15:20:19 -04:00
Lioncash 899a5078a0 Merge pull request #2200 from Stevoisiak/CheatManagerRename
Rename "Cheats Manager" to "Cheat Manager"
2015-03-12 15:27:52 -04:00
Stevoisiak fbe11aefbb Rename "Cheats Manager" to "Cheat Manager" 2015-03-12 15:24:00 -04:00
skidau c76008b4b9 Removed the controller update lock as it is no longer needed. 2015-03-12 23:41:30 +11:00
skidau 2c6eaf9c76 Cleaned up the controls lock that is not needed with 780eef68f6 2015-03-12 23:33:30 +11:00
Markus Wick 43b2f790fd Merge pull request #2197 from RachelBryk/paren
Fix missing parenthesis.
2015-03-12 07:58:05 +01:00
skidau 9063f0d16f Merge pull request #2150 from Tilka/gamelist_searching
DolphinWX: fix searching the game list in GTK
2015-03-12 13:32:50 +11:00
Rachel Bryk 71bc1f39e0 Fix missing parenthesis. 2015-03-11 20:09:33 -04:00
Dolphin Bot 647cd3c8e0 Merge pull request #2171 from JosJuice/nonmodal-regression
Fix 4.0-5689 regression (AR codes, patches)
2015-03-11 08:15:02 +01:00
skidau 9ccc236b9c Merge pull request #2179 from RachelBryk/sort
Consistently sort games with the same name but different revision or reg...
2015-03-11 12:31:25 +11:00
skidau d92efc4a3e Merge pull request #2190 from skidau/wiimote-profiles
Fixed the wiimote profiles not taking effect.
2015-03-09 11:30:33 +11:00
skidau 07251b7c57 Merge pull request #2177 from skidau/debugger-split-window
Added the ability to split the Debugger window horizontally and vertically
2015-03-09 10:58:16 +11:00
skidau b200e83b02 Fixed the wiimote profiles not taking effect. 2015-03-09 08:32:14 +11:00
Ryan Houdek c2b2e03f73 [Android] Support arguments from Activity Monitor.
Activity Monitor can start activities by using adb to invoke it.
This will allow us to set the user directory and autostart file from adb.

adb shell am start -n org.dolphinemu.dolphinemu/.gamelist.GameListActivity -e AutoStartFile /sdcard/AC.gcz -e UserDir /sdcard/dolphin-emu2/

This allows more automated testing to be done with Dolphin on Android.
2015-03-08 08:43:25 -05:00
skidau 8f0bc1cd3a Slowed down the freelook speed keys and allowed the depth/convergence keys to be held down. 2015-03-08 20:27:13 +11:00
skidau 9c133c0509 Readded the Key Shortcut function. 2015-03-08 20:27:13 +11:00
skidau 12ecc537e9 Renamed the Menu Accelerators to Key Shortcuts.
Cleared the default mapping of hotkeys as they were conflicting with the key shortcuts.
Removed the Open, Change Disc, Refresh List and Exit hotkeys as they work only when driven from the menu.
2015-03-08 20:27:13 +11:00
skidau 780eef68f6 Fixed the crash that would occur when the Refresh button was pressed in the controllers config.
- Simplified the locking mechanism when controllers were updated
- Reloaded the config of the controls instead of re-initialising the control plugins
- Fixed controls being unresponsive after the Refresh button was pressed
- Disables the hotkeys while the controller config is open
2015-03-08 20:27:13 +11:00
skidau b446ea0132 Made the freelook keys work while held down 2015-03-08 20:27:13 +11:00
skidau 099876782f Made the "Frame Advance" hotkey work while the key is held 2015-03-08 20:27:13 +11:00
skidau a83d27b9c2 Increased the performance of the hotkey code by:
* Halving the number of hotkeys checked for (there were extra for future use)
* Gets the controller status once before parsing hotkeys
* Checks for the GUI lock once before parsing hotkeys
* Removed some redundant memsets
2015-03-08 20:27:12 +11:00
skidau d2abbcd353 Removed the requirement to have the Freelook option enabled for the freelook hotkeys to work. 2015-03-08 20:27:12 +11:00
skidau d080632527 Ignore the File Open command if a game is running 2015-03-08 20:27:12 +11:00
skidau 679d9351ea Fixed the Connect Wiimote hotkeys from getting activated while a GameCube game is running. 2015-03-08 20:27:12 +11:00
skidau cc6b55ee2a Fixed the save state hotkeys so that they work with the Render to Main Window option. 2015-03-08 20:27:12 +11:00
Rachel Bryk 11b437ffd1 Consistently sort games with the same name but different revision or region. 2015-03-07 05:17:46 -05:00
skidau 12155ddee4 Added the ability to split the Debugger window horizontally and vertically via the Add Panes menu. 2015-03-07 12:33:33 +11:00
JosJuice 4a41ab1715 Fix 4.0-5689 regression (AR codes, patches)
CreateCodeTab, ARCodeAddEdit and PatchAddEdit
need to be able to modify arCodes/onFrame.
2015-03-06 12:26:40 +01:00
skidau a3f6cbfe6b Merge pull request #2167 from JosJuice/language-selection-regression
Call SetUserDirectory before InitLanguageSupport
2015-03-06 15:25:51 +11:00
Lioncash 47c8955248 Merge pull request #2168 from JosJuice/language-selection-untranslated
Display languages untranslated in GUI language selection
2015-03-05 18:05:23 -05:00
Lioncash b7514955e5 Merge pull request #2113 from Stevoisiak/VolumeCleanup
Basic volume code cleanup
2015-03-05 12:18:53 -05:00
skidau 4cf4cee30e Removed the GC Adapter "Use Thread" option as it was not useful. 2015-03-05 23:30:43 +11:00
JosJuice c40e1d972a Sort language list alphabetically by new names 2015-03-04 20:36:04 +01:00
JosJuice a8a9dafb1f Display languages untranslated in GUI language selection 2015-03-04 20:35:19 +01:00
JosJuice 2cb4a3efbc Call SetUserDirectory before InitLanguageSupport
Fixes a regression from 4.0-5692 where only the system language was used.
2015-03-04 14:45:36 +01:00
magumagu b4a586f84a Merge pull request #2161 from Tilka/fix_warnings
Fix some warnings
2015-03-01 13:02:37 -08:00
Tillmann Karras 4304648a05 Fix -Wreorder warning 2015-03-01 14:54:22 +01:00
Lioncash 3981212031 DolphinWX: Allow input subsystems to correctly deinitialize
Previously InitControllers() would be called every poll duration, setting this boolean to false which would prevent said sybsystems from deinitializing correctly.
2015-03-01 01:23:21 -05:00
Ryan Houdek d3c9701eb6 Merge pull request #2156 from Stevoisiak/EFB-Copies-To-Texture
VideoConfigDiag: Rename EFB Copies to RAM option
2015-02-28 22:28:11 -06:00
Stevoisiak cb7b96009d VideoConfigDiag: Rename EFB Copies to RAM option 2015-02-28 23:00:49 -05:00
Lioncash 4cc19ac926 DolphinWX: Clean up some wxTimer code
Technically fixes a memory leak (which wouldn't matter because the timer is only created once and destroyed on shutdown).

Also starting and stopping the timer does not cause leaks.
2015-02-28 20:32:37 -05:00
Tillmann Karras baf732b48b DolphinWX: fix searching the game list in GTK 2015-02-28 16:43:31 +01:00
Markus Wick 4f9fcbaba9 Merge pull request #2120 from JosJuice/show-default-gameini
ISOProperties: Allow opening region-free INIs with "Show Defaults" button
2015-02-27 17:58:42 +01:00
skidau 1dcd0ad879 Merge pull request #2129 from Sonicadvance1/shuffle_user_dir
Move user directory detection location to UICommon.
2015-02-27 14:07:06 +11:00
skidau 2a41ac4072 Merge pull request #2123 from RachelBryk/nonmodal-isoprops
Make iso properties non modal.
2015-02-27 13:25:46 +11:00
Stevoisiak 06cb85991e De-capitalized CountryCode 2015-02-26 16:57:31 -05:00
Lioncash d50c56c2e4 DolphinWX: Remove an unnecessary sizer from the watch window
The AUI manager already has the grid in place. Setting the sizer isn't needed.
2015-02-26 09:58:38 -05:00
Ziek 779f275486 Added TraversalServer.cpp to Core/Common 2015-02-25 18:28:27 -08:00
Ziek a629555e6b Added Gui elements in Netplay Setup Diag so a person can choose a traversal server
Fixed bug with UPnP so that it will grab the proper address and protocal
Fixed bug that caused dolphin to freeze when host codes were to large
2015-02-25 18:28:26 -08:00
Ziek 074d688884 Change netplay initial gctime to be determined by the hosts initial time 2015-02-25 18:28:26 -08:00
Ziek 4cdc307b87 Moved Traversal Client code over from old netplay
Moved over gui code for copying host code
added gui to netplay diag setup to switch between direct and traversal connection
2015-02-25 18:28:25 -08:00
skidau f71f376371 Merge pull request #2117 from lioncash/id
DolphinWX: Remove unnecessary control IDs
2015-02-26 12:49:07 +11:00
Lioncash 7408de7e79 Merge pull request #2058 from Stevoisiak/Codemaid-Cleanup-Take2
Basic Formatting/Whitespace Cleanup
2015-02-25 18:07:56 -05:00
Ryan Houdek d6fcd85110 Merge pull request #2127 from lioncash/aui
DolphinWX: Relocate the address search into the code window
2015-02-25 10:36:07 -06:00
Stevoisiak 93b16a4a2d Formatting/Whitespace Cleanup
Various fixes to formatting and whitespace
2015-02-25 10:48:21 -05:00
Ryan Houdek db06f058e4 Move user directory detection location to UICommon.
The UI should decide on where it wants the user directory, not our core system.
This is in anticipation of some upcoming work on Android which will need proper user directory setting.
2015-02-25 03:31:59 -06:00
Lioncash ce4b73388a DolphinWX: Relocate the address search into the code window
It's only function is in this pane. Leaving it on the main application toolbar not only looks gross, but subverts what a user might think it applies to.
2015-02-25 00:16:17 -05:00
Lioncash 792e166f87 Merge pull request #2118 from lioncash/aui
DolphinWX: Use AUI in the code window.
2015-02-24 21:45:16 -05:00
Lioncash fd11f8fd29 DolphinWX: Use AUI in the code window.
Allows for resizing of the callstack, function call/callers windows etc.
First step in slightly improving the code window.
2015-02-24 21:31:28 -05:00
Tony Wasserka ec47be7884 VideoConfigDiag: Use consistent spelling of nouns. 2015-02-25 01:58:47 +01:00
Rachel Bryk 2df8190e1a Make iso properties non modal. 2015-02-24 19:11:03 -05:00
degasus 967eaad8df VideoCommon: rename efb2tex and efb2ram 2015-02-24 23:10:13 +01:00
degasus 1313d3461f VideoCommon: always enable efb copy 2015-02-24 23:01:01 +01:00
Fiora 0e34737390 Merge pull request #2121 from JosJuice/remove-sudtr-note
Remove "Needed for a few games." from fast disc speed description
2015-02-24 13:12:48 -08:00
magumagu e9e1a2c2dc Merge pull request #2110 from lioncash/tl
DolphinWX: Make RAM watch strings translatable
2015-02-24 11:42:14 -08:00
JosJuice 2247bfa9bc Remove "Needed for a few games." from fast disc speed description
There are no longer any games that are known to require this.
The last one was Rogue Leader, fixed in PR #1778.
2015-02-24 20:06:38 +01:00
JosJuice 021f6d0f72 ISOProperties: Allow opening region-free INIs with "Show Defaults" button 2015-02-24 20:04:19 +01:00
Lioncash 30c91a3003 DolphinWX: Remove unnecessary control IDs
These don't need to be specifically identified.
2015-02-24 08:31:52 -05:00
Ryan Houdek 29fc52cfa1 [Android] Stop eating button events we don't handle.
We were eating /all/ button events except the back button. This would cause issues where Android wouldn't receive button press events for things like
volume rockers. So you couldn't change the audio ingame, even if that button isn't bound to an input.

Now we return to Android if we've handled that button press, so it works fine.
2015-02-24 05:38:16 -06:00