Commit Graph

48 Commits

Author SHA1 Message Date
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
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 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
LPFaint99 22427f89bc Njoy can now be build with wxUSE_UNICODE 1 on windows
move all static ini paths to Common

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3896 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-28 08:27:45 +00:00
death2droid 73a7686044 Fix up all copyright dates.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3886 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-26 11:51:40 +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 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 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
hrydgard 0489ccd420 nJoy SDL, linux: fix some warnings and a bug. untested :p
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2691 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-20 17:14:42 +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
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 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
John Peterson 516a14150a Wiimote: Improved the emulated Wiimote, added gamepad controls for analog tilting.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2207 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-10 17:25:08 +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 6daae62df3 nJoy: Fixed settings when multiple pads are connected
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2195 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-10 01:25:42 +00:00
John Peterson c18613a580 nJoy: Fixed the Hat / Custom D-Pad setting in the save by slot mode
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2194 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-10 00:41:43 +00:00
John Peterson 5edef94753 SimplePad: Added input recording options to the GUI, now we just need to get rerecording to work to, perhaps one can rewind the input counter when a state is loaded? So the input counter is saved in the savestate for the pad.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2184 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 20:06:27 +00:00
daco65 2ff2852771 Njoy: added an option to choose what kind of analog filtering you want. it should be changeable when you choose to view advanced settings. this solved my analog/digital config problems i had and it *should* still work for those who had np with Jpeterson's change. i was told the wiimote had the same problem (makes sense) but im not sure if alot of ppl had that problem with their controllers so i have kept it as an ini changeable option only (set AdvancedMapFilter to True to use the same filtering as Njoy 0.3 does with AdvancedMapFilter enabled.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2180 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 18:43:03 +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
daco65 bb4cec5b45 this is just temp until i can talk to JP why added the 6000 in the first place. doesn't make sense to me
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2170 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-09 01:40:25 +00:00
daco65 128313cdea fixed the analogue config bug ( at least for me o.o )
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2157 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-08 19:23:25 +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 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 eb91942fd6 nJoy: Fixed bugs in settings saving and loading
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2069 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-02 03:16:59 +00:00
John Peterson c9ca6ef55a nJoy: Fixed a bug that would sometimes cause settings to not be saved correctly
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2010 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-25 18:20:16 +00:00
nakeee 2e92b94e4a Compile fix on linux
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2005 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 22:24:44 +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
omegadox 8f98f0b778 Some warning and code cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1998 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-24 00:45:46 +00:00
John Peterson 7f9dc55fbc nJoy: Improvements to the configuration, the SaveById option should now be simpler and better
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1977 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-21 18:09:31 +00:00
tmator 8f2d1136a7 fix njoy build for non win32 os, and small osx64 build fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1965 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 20:21:05 +00:00
John Peterson 140ba01794 nJoy: Fixed configuration bug
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1957 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 14:41:58 +00:00
John Peterson a10c603255 nJoy: Fixed the 360 pad triggers with XInput, now they are separate triggers that work just like they should
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1953 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 14:25:33 +00:00
John Peterson 969f34bbd0 nJoy: Escape key stops waiting for input when configuring the pad, changed the display of a disabled button from -1 to ""
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1946 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 10:37:48 +00:00
John Peterson 6f4cbb89f9 nJoy: Configuration bugfixes, and show the digital shoulder button status in the advanced settings to
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1945 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 06:38:29 +00:00
John Peterson 00bca8d807 nJoy: Fixed the analog shoulder buttons for the XBox 360 pad
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1944 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-20 05:28:30 +00:00
John Peterson bede48c6b1 nJoy: Fix halfpress button configuration
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1943 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 23:17:29 +00:00
John Peterson 8f40075f8f nJoy: Fixed the analog trigger buttons
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1934 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 17:47:00 +00:00
John Peterson 4a88f31ddb nJoy: Preparation for fixing the digital pad and the analog triggers
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1928 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-01-19 05:49:25 +00:00
John Peterson 5e5e507121 nJoy: Enabled keyboard input (only for buttons so far) through wxWidgets in the main application. It only works when you render to the main window.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1706 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-28 18:50:24 +00:00
John Peterson b63e559f8a nJoy: I forgot a file
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1699 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-12-27 11:41:58 +00:00