Commit Graph

59 Commits

Author SHA1 Message Date
j4ck.fr0st f7f11211a1 Some Wiimote Cleanup, re/moved some globals to where they belong.
A few things could be solved differently/in a better way, but that would involve some classes and stuff (plus work)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5097 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-02-21 18:53:11 +00:00
ayuanx 68a4eacb62 Merged PadSimple with nJoy
(Linux build could be broken, X360Pad support could be broken)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4924 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-01-22 23:19:16 +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
Shawn Hoffman 0403e3014e buildfix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4741 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-12-28 23:28:35 +00:00
ayuanx d62d6b0c33 Now Dolphin officially supports Multi-WiiMote (up to 4)
* You can connect/disconnect one or more WiiMote from Menu->Tools any time (must pause game first)

* Up to 4 Emulated Wiimotes can work together at the same timer

(PS: "Wiimote_Real" needs to be rewritten to support Multi-WiiMote, and it could be broken already now)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4736 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-12-27 19:31:02 +00:00
ayuanx f255f08a99 Fixed a potential crash when mapping keys to Wiimote
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4703 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-12-17 16:14:48 +00:00
ayuanx 7d1fdb85f3 Implemented Nunchuck Roll/Pitch
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4702 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-12-17 14:15:56 +00:00
ayuanx e9891684ca Several elements are not properly updated on GUI with last rev, sorry.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4692 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-12-14 03:30:21 +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
ayuanx c9f98d8f2b Reorganized Wiimote Config Dialog a bit to make it more compact
Fixed many wrongly named variables
Deleted many unreferenced variables

wxWidgets cleanup

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4663 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-12-09 14:52:30 +00:00
ayuanx 48896c7de2 1. Fixed a silly bug that prevented IR rotation in last rev from working, now IR rotation works fine, verified.
2. Added Roll Left/Right key mappings for keyboard.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4659 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-12-08 19:58:19 +00:00
ayuanx db98709de0 Implemented Pad Rumble for Emu WiiMote, Currently this function is still quite basic and rough.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4649 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-12-06 01:15:13 +00:00
ayuanx d919a641c1 Makes "Shake by Mouse Middle Button" work again
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4640 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-12-04 12:22:36 +00:00
ayuanx 5ef159a971 Now WiiMote button mapping supports both Keyboard & Joypad, or even mixed, no need to bother Xpadder. :)
But I've only tested on Win32 SDL, don't know about Linux or 360pad.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4630 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-29 17:58:52 +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 928dc99874 Gamepad (minor) > Crashfix in Wiimote plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4554 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-13 09:11:24 +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
nakeee 188e3b9172 Trying to get gui to compile with wx 2.9
Shouldn't affect normal compile.



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4362 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-10-05 07:31:38 +00:00
Shawn Hoffman 65b6b15c6e normalize wiimote logging: no more crazy newlines, plugin logs to...wiimote plugin log, ipc wiimote stuff logs to...WII_IPC_WIIMOTE
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4270 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-09-15 02:12:55 +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
LPFaint99 90d2d95c72 plugins can now compile with unicode
excluding DX9

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3905 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-30 07:08:31 +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
LPFaint99 bd7419d437 More work on wiimote plugin X11 input config
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3730 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-10 06:16:22 +00:00
LPFaint99 8145eb30d9 Simplify gui init for Wiimote, nunchuck, and classic controller
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3729 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-10 05:30:19 +00:00
LPFaint99 722ee4cd06 Move XInputBase from PadSimple to InputCommon,
Start work on X11 input for wiimote plugin mapping (copy XTra-KrazzY's fix for PadSimple)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3721 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-09 06:50:22 +00:00
LPFaint99 af83bfffa1 Simplify GH3 gui init, only show currently connected extension keyboard mapping
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3719 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-09 04:19:49 +00:00
LPFaint99 48f1c24cc9 Add gui for GH3 Controller, extension is still disabled currently
Analog stick and whammy still do not work for GH3 extension, frets, strum, and +/- work
some cleanup
Next commit will change the PadMapping gui to only show the controller mapping for the currently enabled extension

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3718 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-09 03:58:53 +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
LPFaint99 b6a43c5db8 Steps to simplify pad mappings for wiimote plugin
simplified ini saving
misc cleanup;
My next few commits will change the config gui to only show the pad mappings for the currently connected extension, more cleanup/simplification, GH3 controller config options; I just have no more time tonight :P

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3708 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-08 07:16:26 +00:00
LPFaint99 52438f1dc7 Wiimote plugin cleanup & linux build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3677 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-05 05:59:03 +00:00
LPFaint99 c921fe1c13 New Wiimote Plugin Config GUI
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3676 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-05 04:29:00 +00:00
hrydgard 7ec0a3a5e8 fix crash bug when saving some wiimote config
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3662 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-03 18:26:57 +00:00
Shawn Hoffman 99a33ccba9 apply the new wxw method to dsp hle, wiimote, and padsimple.
wiimote config now loads way faster :)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3649 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-02 19:00:27 +00:00
sl1nk3.s 69055f8d42 Tiny crash fix for the wiimote plugin as well as a safer check for the volume in DSP HLE
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3314 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-06-03 20:09:48 +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
hrydgard 4bdb4aa0d1 Merge large parts of nakeee's "Soap" branch into trunk, after fixing a few crash bugs in FileUtil.cpp.
Not really anything interesting, just some better comments, some slightly more portable/cleaner code in places.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2459 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-28 01:26:56 +00:00
John Peterson b739dd3817 Emulated Wiimote: Added Classic Controller analog gamepad support, and added its keyboard configuration to the GUI
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2400 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-24 02:40:17 +00:00
LPFaint99 578c402d2c Update svn:eol-style=native ( r1442 ) for Source/*.cpp
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2384 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-23 06:15:48 +00:00
John Peterson 7218a070e6 Emulated Wiimote: Fixed typo in last commit
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2288 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-17 11:25:18 +00:00
John Peterson 12a869304c Emulated Wiimote: Fixed a bug that would make PadMapping[0].ID = -1, that would lead to a segmentation fault in Linux when we tried to access joyinfo[-1]
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2287 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-17 11:16:59 +00:00
tmator cf8220dc9c fix osx build, and first step to get real wiimotes on osx
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2277 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-16 21:12:00 +00:00
John Peterson a92444d3cc Emulated Wiimote: Added the pitch left and pitch right keyboard input to the GUI
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2275 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-16 09:25:22 +00:00
John Peterson b53c30ad25 Emulated Wiimote and SimplePad: Build fixes for Linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2264 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-15 19:25:23 +00:00
John Peterson a8e35e976a Emulated Wiimote: Added customizable controls for the Wiimote and the Nunchuck
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2259 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-15 18:23:42 +00:00
John Peterson 34dbb40ef5 Emulated Wiimote: Added option to use analog controls for the Nunchuck stick
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2243 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-15 02:01:43 +00:00
John Peterson 7c638f3a51 Emulated Wiimote: Added option to use Analog 2 for roll and pitch. Now you can use the regular controls on Analog 1 and roll and pitch on Analog 2.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2240 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-14 13:03:21 +00:00
John Peterson 79947e5d29 Emulated Wiimote: Added dead zone option for the gamepad input
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2237 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-14 01:15:35 +00:00