ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,838 Commits 5 Branches 11 Tags 1.3 GiB
Commit Graph

112 Commits

Author SHA1 Message Date
fgfemperor 64167bcb60 Now you can switch between Emulated and Real WiiMotes, connect more Real Wiimotes and even pair them up (if you have MS BT Stack) during gameplay! 
All you gotta do is Pause the emulation! That's useful for when your batteries run out during gameplay, for example...

But if you change the WiiMote source (between Emulated, Real or Inactive) you must disconnect and reconnect (Menu Tools -> Connect WiiMote) the WiiMotes affected by the change...

Thanks to jack.fr0st who did all the emulation state notification work!

Now every plugin has a way to know the current emulation state (paused, stopped or playing)

@ayuanx: I thought about doing a PostMessage(g_WiimoteInitialize.hWnd, WM_USER, WIIMOTE_DISCONNECT, current_number); so that the user gets asked to reconnect that WiiMote, trying to avoid having to disconnect and reconnect, but it didn't work because shooting that message only asks to reconnect, doesn't do a disconnect... Do you have any ideas on how to accomplish that?

Also, if anyone could check if Issue 1916 is finally fixed... Or at least when is the cursor being hidden or not...

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4789 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-01-06 19:26:52 +00:00
ayuanx 72b1570e08 Fixed Issue 1928 
Fixed Issue 1917
(Since wxWidgets is not allowed in core, so I moved the popup window to CFrame)

*Maybe* this could also fix Issue 1919?

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4780 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-01-03 23:05:52 +00:00
ayuanx 25abd0f944 Small code cleanup 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4768 8ced0084-cf51-0410-be5f-012b33b47a6e
 2010-01-01 03:19:46 +00:00
ayuanx ba25f038af This should fix Issue 1798 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4760 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-12-31 17:42:55 +00:00
ayuanx 4240cf9053 Wiimote: More work, don't ask, no answer 
nJoy: Maybe this could reactivate multi-pad?

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4729 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-12-25 22:10:56 +00:00
ayuanx 6f1efd4873 Rearranged EmuWiimote & nJoy. Wow they can share one pad at the same time, and they also can be enabled/disabled separately. 
So as long as the game supports, you can toggle controller input between them on the fly.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4691 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-12-14 02:23:14 +00:00
ayuanx 5f47aa7bb1 Fixed crash: when you try to change pad in config dialog 
Fixed issue: XInput trigger source cannot be selected
Added proper close of SDL_Joystick

But still nJoy and Wiimote cannot share the same gamepad. It needs to be figured out how to do it with SDL.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4686 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-12-13 04:31:38 +00:00
Shawn Hoffman 06aa62504c revert to r4531, but keep the changes from the following revisions: 4533,4550-4551,4556-4559 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4566 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-11-14 17:08:32 +00:00
John Peterson ee88afce58 Gamepad (minor) > Disabled LiveUpdates, it's not stable in the current form 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4552 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-11-13 01:52:15 +00:00
John Peterson 0837e38c39 Gamepad (minor) > Fix to last commit 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4549 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-11-12 23:39:43 +00:00
John Peterson 2d064262ce Gamepads (minor change) > Fix to last commit, LiveUpdate related 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4547 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-11-12 23:22:51 +00:00
John Peterson 18450737be Gamepads (minor change) > Fixed it so it doesn't always check for new pads on startup 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4543 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-11-12 21:14:41 +00:00
John Peterson 71506bc0f7 Wiimote and nJoy > Gamepad changes 
1. Added LiveUpdates, while the configuration window is open nJoy and Wiimote will check for connected/disconnected pads
2. Removed the 'Nintendo RVL-CNT-01' device from the device list, and other SDL devices with no axes/buttons
3. Added SDL (from the current SVN) to get debugging information for SDL.dll
4. Added 'Upright Wiimote' option to emulated Wiimote options

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4534 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-11-12 18:57:35 +00:00
sl1nk3.s 9154424841 Fix a small misspell in OGL config, Fix the toggle fullscreen button when rendering to separate window + a weird issue related to rendering to main. 
Code cleanup in nJoy i had around for a while, it also adds code to support SDL 1.3's force feedback API and is more stable (will not crash anymore on stop when rumble is enabled)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4459 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-10-24 00:18:21 +00:00
Shawn Hoffman 3b76f6dc80 get rid of the '¯' chars in source code...non ascii chars are not really good to have floating around for no reason. http://google-styleguide.googlecode.com/svn/trunk/cppguide.xml?showone=Non-ASCII_Characters#Non-ASCII_Characters 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4231 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-09-08 16:07:13 +00:00
Marcus Wanners 50593397f3 Got rid of all of jp's ////////////////////////////// lines (nearly 500 of them)! 
Yes, I used a script :D

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4169 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-09-02 21:00:45 +00:00
XTra.KrazzY c86d2e5129 Now ALL copyright dates are fixed to the legally correct year: The year in which the project began. Now we don't have to change it every year :) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3898 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-07-28 21:32:10 +00:00
sl1nk3.s 664f017fec Fix a hang on stop on linux (why is that done better on linux ?? strange :P) 
Fix what must have been a typo for Pikmin PAL CRC, the game still doesn't work though :(
Fix a crash on stop in nJoy 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3821 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-07-17 16:20:55 +00:00
Nolan Check d85f5a6937 Rearrange LogManager includes. The main purpose is to make it possible to modify Thread.h without recompiling the whole entire project. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3770 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-07-12 21:58:32 +00:00
Shawn Hoffman 2a236a4631 remove PAD_GetAttachedPads() from PadSimple and nJoy (and plugin specs). It hasn't done anything except get in the way/cause confusion since changing SI devices was added. Also I declare PadSimpleEvent and nJoy .4 as dead/rotting code. someone can feel free to prove me wrong...but know they are on my hitlist :p 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3739 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-07-11 00:27:32 +00:00
John Peterson 45dbfc7fdc nJoy: (Forgot to disable logging) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3723 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-07-09 08:00:21 +00:00
John Peterson 8d42378479 nJoy: Allow the same settings for the C-stick 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3722 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-07-09 07:58:36 +00:00
John Peterson a718ff266e nJoy: Fixed the radius adjustment 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3717 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-07-09 02:23:40 +00:00
John Peterson 8fa315879a nJoy: Added radius option to advanced settings 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3716 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-07-09 00:48:07 +00:00
Shawn Hoffman 518d3854ba add wxw modalness to both njoys and fix a bug where calling DllConfig from different parent HWNDs would stop the config dialog from appearing. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3656 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-07-03 03:01:58 +00:00
sl1nk3.s b0852c1bef Updated rumble for nJoy, fixed a few glitches with half press button and deadzones too. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2840 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-04-02 21:13:58 +00:00
Shawn Hoffman 2301d072a6 nakee's new logmanager. added a console window for windows builds (prints to parent console on non-win32). also fix some random wxw bugs: main window's position is saved when using debugger, disabling windows from the tools menu are saved settings, some other small fixes 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2675 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-03-18 17:17:58 +00:00
Marcus Wanners c0cf641779 Linux compile fix. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2559 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-03-05 15:58:14 +00:00
Marcus Wanners 432ea89b49 Compiler Warnings: Mismatch edition. Also fixed some conversion warnings. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2557 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-03-05 15:16:50 +00:00
John Peterson fc6a7c47d5 Core Stop and Start: Fixed stop and start again by avoiding FreeLibrary() of the OpenGL plugin, and avoiding a crash in its ShutDown() function. You need to use SETUP_FREE_PLUGIN_ON_BOOT to compile with this option that works on my system. Also, I noticed that I don't need the SETUP_AVOID_CHILD_WINDOW_RENDERING_HANG anymore, I can now delete the g_EmuThread without having it hanging in its waiting function. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2356 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-22 04:24:53 +00:00
John Peterson 0b1909aed0 Rerecording and nJoy: Copied the recording functions to nJoy 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2305 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-18 23:26:16 +00:00
tmator b5c0efd5ac fix nowx njoy 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2292 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-17 22:05:34 +00:00
John Peterson eb1c6163f7 Emulated Wiimote: Enabled the roll and pitch function again (I had accidently disabled it in the last commit) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2220 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-12 10:49:38 +00:00
John Peterson b932a53b68 Emulated Wiimote: Fixed the angles to x, y, z values conversion. There's just one thing left to fix before the combined roll and pitch works, when roll is more than 90 pitch has to be changed from for example 15 to -165 or something like that. Until I figure that out you can use the emulated roll and pitch separately by setting the range of either one of them to zero. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2219 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-12 08:46:48 +00:00
John Peterson 0681f76a1d Last commit: Forgot one change 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2216 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-11 10:31:43 +00:00
John Peterson 68f39cb287 nJoy: 
1. Circumvent the IDirectInputDevice2::SetDataFormat() error when opening the configuration window to.

2. Fixed the Allow out of focus input option again

3. Allow changing of the mapped pads while a game is running

4. Prevented crashes or problems from any combination of having the configuration window open when a game is started or stopped

5. Fixed a crash that would occur after nJoy was started with a connected pad, then stopped, and all pads disconnected, then started again

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2215 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-11 10:30:02 +00:00
nakeee 4d57101e29 Fix crazy svn changing trunk on last commit 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2206 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-10 14:02:01 +00:00
nakeee 3e9b3b266a [Soap] Roll back inputcommon changes 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2203 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-10 12:40:06 +00:00
John Peterson 1fbebb4ce1 Wiimote: Configure gamepad in Wiimote plugin 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2172 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-09 13:10:29 +00:00
John Peterson 2757dbe2a8 InputCommon and Wiimote: Detect pads in the Wiimote plugin 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2151 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-08 15:39:28 +00:00
John Peterson 94d8eb5d4e InputCommon and nJoy: Moved more functions to InputCommon 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2150 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-08 15:05:03 +00:00
John Peterson c6b4f5c819 InputCommon and nJoy: Moved functions to InputCommon, to be shared with the Wiimote plugin 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2147 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-08 14:34:23 +00:00
John Peterson e926bc61d1 Wiimote: Added logging messages for the speaker configuration and for the 0x18 sound reports, the speaker currently produce a low humming noise in the wpad tools demo, but no real sound 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2141 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-08 10:15:55 +00:00
John Peterson 60e89dfc6f nJoy: Fixed bug that would cause the settings to be lost when nJoy was started without any detected gamepad 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2131 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-07 05:57:28 +00:00
John Peterson fcb951c0c9 nJoy: Made the out of focus option only apply to gamepad input. As I understand it it's primarily used to allow keyboard input at the same time as Dolphin is used. Then it would probably be annoying to send the keyboard input to Dolphin while you are typing. Keyboard inputs was also the main idea with the out of focus option, I think that it's not as important for gamepad input as you are less likely to use the gamepad in two different programs simultaneously. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2087 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-03 10:17:01 +00:00
LPFaint99 f999ae94df Make checking for focus optional for njoy input. 
So if one wants, on one monitor play Dolphin, and on the other use the keyboard for something else

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2082 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-03 06:21:22 +00:00
John Peterson 2199b15ca6 nJoy: Updated IsFocus() to allow config window input to 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2068 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-01 20:45:27 +00:00
John Peterson 2620257f47 nJoy: Fixed the digital L and R buttons 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2066 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-01 20:19:21 +00:00
John Peterson 8c9d07b26b nJoy: Don't allow input when Dolphin is not in focus (supports both the 
rendering to main window and render to separate window options)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2062 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-02-01 16:29:35 +00:00
John Peterson a3c383ad4a nJoy: Made it tolerate a bad device (the Wiimote DirectInput device for example) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2003 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-24 22:13:53 +00:00