Commit graph

227 commits

Author SHA1 Message Date
Jules Blok
ed50d61287 Merge branch 'stable' 2015-07-23 08:12:57 +02:00
Jules Blok
703b1e8654 CFrame: Ignore "Pause on Focus Lost" when not started. 2015-07-22 19:31:23 +02: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
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
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
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
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
degasus
c375111076 Options: merge SCoreStartupParameter into SConfig 2015-06-12 19:07:45 +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
Matthew Parlane
9e1aab663f Revert "SDL: handle SDL_QUIT event" 2015-06-08 13:43:39 +12:00
Matthew Parlane
cf8f049c4d Merge pull request #2518 from degasus/hotkeys
Hotkeys: Drop old GUI
2015-06-07 20:10:10 +10: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
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
97d6b71f3f fix duplicate variable definition 2015-06-02 18:49:53 -04: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
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
mathieui
ea709b6c12 Add hotkeys to increase/decrease the IR 2015-05-10 02:02:47 +02:00
Lioncash
a7e9aea797 DolphinWX: Remove unnecessary includes 2015-05-08 12:39:26 -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
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
87bffb5972 Added event.Skip() to the OnFocusChange event. Fixes the pulldown menus. 2015-03-20 22:01:23 +11: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
Gerik Kubiak
ae4e8b6358 Changed screen to window. Moved UpdateGUI to a more general scope. 2015-03-17 12:14:14 -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
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
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
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
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
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
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
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
Lioncash
7408de7e79 Merge pull request #2058 from Stevoisiak/Codemaid-Cleanup-Take2
Basic Formatting/Whitespace Cleanup
2015-02-25 18:07:56 -05:00
Stevoisiak
93b16a4a2d Formatting/Whitespace Cleanup
Various fixes to formatting and whitespace
2015-02-25 10:48:21 -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
skidau
69381580f3 Merge pull request #2096 from lioncash/wx
DolphinWX: Remove unnecessary Windows-specific code in Frame.cpp
2015-02-24 13:11:39 +11:00
Lioncash
d48ad19b8d DolphinWX: Remove unnecessary Windows-specific code in Frame.cpp
wx's version of SetFocus internally calls the Windows one.
2015-02-22 04:09:37 -05:00
Buddybenj
265a21a565 Replace Country Names With No-Intro Names 2015-02-17 18:50:10 -06:00
skidau
3709a1ce3a Fixed the crash which occurred when opening Wiimote configuration before a game was started. 2015-02-04 18:48:19 +11:00
skidau
fc8ea9c3b3 Ignore hotkeys if the game has not started. 2015-02-04 18:06:20 +11:00
skidau
b9fb6ad3e8 Initialised all controller interfaces together on CFrame construction to fix the crash that would occur if the controller config were opened before a game was started. 2015-02-04 18:05:22 +11:00
skidau
61c04de7ee Added the ability to map gamepad buttons to hotkeys. 2015-01-27 12:24:47 +11:00
Ryan Houdek
e4b04c64f0 Merge pull request #1870 from Stevoisiak/countryFilters
Country filter fixes/consistency
2015-01-21 13:48:35 -06:00
Ryan Houdek
80e6367e46 Merge pull request #1869 from Stevoisiak/GeneralConsistency
Minor consistency changes
2015-01-21 13:46:53 -06:00
Ryan Houdek
4c9fd63562 Merge pull request #1932 from Buddybenj/freelook
Fix Default Freelook Hotkey to Match Description (For Real This Time)
2015-01-21 13:41:29 -06:00
Ryan Houdek
b8b537d96e Merge pull request #1934 from Buddybenj/change-order
Change Order of Some Hotkeys
2015-01-21 13:38:10 -06:00
Benjamin Przybocki
a25b07ec56 Change Order of Some Hotkeys 2015-01-20 18:16:36 -06:00
Benjamin Przybocki
9291d61d98 Fix Default Freelook Hotkey to Match Description (For Real This Time) 2015-01-20 16:46:38 -06:00
Jules Blok
332d5888eb VideoConfig: Add exclusive mode flag.
Allows the UI to easily check the current exclusive mode state.
This simplifies a few checks and prevents the user from ever getting stuck in fullscreen.
2015-01-19 22:55:21 +01:00
Jules Blok
8d69658a9d Add exclusive mode OSD messages. 2015-01-17 16:11:17 +01:00
Jules Blok
b87fddb027 D3D: Allow borderless fullscreen to be turned on/off during gameplay. 2015-01-17 16:11:12 +01:00
Stevoisiak
f31b688cf5 More minor consistency changes 2015-01-12 22:28:12 -05:00
Stevoisiak
e871add5f5 Country filter fixes/consistency 2015-01-11 00:39:53 -05:00
skidau
25c6f6e6a1 Merge pull request #1782 from FL-dolphinemu/master
Issue 7968: Added keybinds for increasing, decreasing, and muting audio.
2015-01-08 14:09:18 +11:00
Pierre Bourdon
1b4b836731 Merge pull request #1743 from Stevoisiak/variableNamingConsistency
Globals.h: Variable naming consistency
2015-01-04 22:45:30 +01:00
FL.dolphinemu
5de43536ba Update pull request 1782. Reordered header and corrected text case.
Feedback from Antidote and lioncash.
2014-12-29 11:00:03 +01:00
FL.dolphinemu
78f8bf7423 Issue 7968: Added keybinds for increasing, decreasing, and muting audio. 2014-12-28 22:03:21 +01:00
Jules Blok
70b898e2c6 VideoConfig: Rename Separation to Depth and update descriptions.
More accurate since it's not a real IPD and Nvidia also calls it depth.
2014-12-24 23:28:23 +01:00
Jules Blok
bcfd431e9a Frame: Fix a crash-on-exit on Mac OS X.
A null pointer exception is triggered when Dolphin is quit from the dock.
2014-12-22 02:06:23 +01:00
Stevoisiak
6ad5e54970 DolphinWX/Globals: Variable naming consistency 2014-12-20 21:43:11 -05:00
Stevoisiak
91aeb7510f Changed config DSP references to config audio 2014-12-20 19:46:59 -05:00
Lioncash
e801fcead9 WiimoteConfigDiag: Unify controller menu with the GameCube controllers. 2014-12-01 03:36:04 -05:00
Lioncash
c2e5715034 Merge pull request #1601 from RachelBryk/wiimote-hotkey2
Fix wiimote connect hotkeys.
2014-11-28 19:50:13 -05:00
Rachel Bryk
df9ace0985 Fix wiimote connect hotkeys. 2014-11-28 08:55:19 -05:00
Jules Blok
6d51455195 VideoConfig: Further optimize convergence and separation values and update their descriptions.
Previous convergence distance was much too large.
2014-11-27 16:19:26 +01:00
Jules Blok
0f4d59f612 VideoConfig: Rename StereoFocalLength to StereoConvergence. 2014-11-24 11:58:38 +01:00
Jules Blok
6e62dd3415 Add stereoscopy hotkeys. 2014-11-23 14:30:12 +01:00
Stevoisiak
f1a26ff654 Various country flag improvements
* Added country flags for games from Netherlands and Spain
* Added separate category for Region Free games (Uses European flag as placeholder)
* Added missing country filter options in "show regions" menu
* Rearranged country filters for readability
* Incremented CACHE_REVISION

Also fixed various country filters not showing up as options in the "Show regions" menu.
2014-11-18 19:44:16 -05:00
Dolphin Bot
dced84d440 Merge pull request #1564 from RachelBryk/freelook
Make freelook hotkeys configurable.
2014-11-17 20:44:48 +01:00
Lioncash
f78600ec9e Merge pull request #1562 from lioncash/host
Host: Kill off GetRenderWindowSize
2014-11-17 13:51:40 -05:00
Lioncash
b94dbca160 Host: Kill off GetRenderWindowSize 2014-11-17 13:44:49 -05:00
Rachel Bryk
ea11c446c2 Make freelook hotkeys configurable. 2014-11-16 22:00:56 -05:00
skidau
5143adac0e Merge pull request #1306 from i418c/freelook_fixes
Freelook fixes
2014-11-17 13:03:23 +11:00
i418c
92d4e38267 Changed the hotkeys to 1 and 2. Message in GUI changed to reflect this. 2014-11-16 10:39:54 -08:00
Lioncash
ac387031a4 DolphinWX: Kill off trivial event tables
Also fixes some of the wonky stuff in Main where we would fire an event to do post-init stuff which isn't necessary anymore.
2014-11-09 00:08:33 -05:00
Lioncash
ee22d091a0 DolphinWX: Eliminate most usages of event tables in the debugger.
Moves things over to Bind.
2014-11-05 23:03:06 -05:00
Rachel Bryk
2eac08aa30 Add nunchuk support to tas input. 2014-11-02 20:52:13 -05:00
Augustin Cavalier
29593d403b Move GLInterface to the OGL VideoBackend's directory. 2014-11-02 12:16:33 -05:00
Fog
467ab1a629 Moved Input Display to Movie Menu 2014-10-17 21:08:34 -04:00
i418c
0ac3e8c19f Fix Freelook on Linux and add speed reset.
Should fix issue 7692.
Also fixes issue 7147.

I have no idea if these changes will affect Mac or Windows users, so please test.
2014-10-16 19:57:11 -07:00