Commit Graph

193 Commits

Author SHA1 Message Date
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
bztdlinux f796d4d747 STAND BACK - NEWLINE POLICE
gcc spams warnings when newlines are not at the end of files.
reason: http://gcc.gnu.org/ml/gcc/2001-07/msg01120.html


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4582 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-15 22:26:39 +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 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 926ff36489 Build (minor) > Fixed linux compilation errors
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4544 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-12 21:20:16 +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
Sonicadvance1 3c537ec137 Fix Compiling in OSX
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4523 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-11-08 23:36:14 +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
LPFaint99 6cbeeafdf1 some more fixes for the switch to unicode. Thanks sl1nk3.s
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3925 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-08-02 05:59:55 +00:00
sl1nk3.s caf152fdd0 Fix screenshot offset as well as screenshot aspect ratio, also use PNG instead of BMP thanks to issue 1186.
Fix for opening.bnr containing bad chars where the loop would stop when encountering one (fixes Rogue Leader description, which was using 0x0d and 0x0a)

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3899 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-28 23:38:49 +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 cec4b65512 revert part of r3896
bad decision to move all ini paths to common

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3897 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-28 16:20:54 +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
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
nakeee db9c9b7c17 Linux compile fix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3725 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-09 12:23:24 +00:00
John Peterson 40f8c8ea3a nJoy: (Typing)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3724 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-09 08:18:10 +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 19ad53ea58 nJoy: Show the original GC controller analog stick area in the advanced settings
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3720 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-09 06:33:01 +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
LPFaint99 a41c1b2d0a add *.user, Win32, and x64 build dir to ignore list for DebuggerUICommon and Unit Tests
add *.aps to ignore list for DolphinWX dir
add eol-style native to 120 or so files

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3689 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-06 02:10:26 +00:00
sl1nk3.s 936225eee4 Fix a nasty dualcore hang in EFB read (see r3658 comment...)
Also fix an issue reported by baby.lueshi (issue 1074) in nJoy related to half press button being always pressed when unset.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3661 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-07-03 15:35:31 +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
XTra.KrazzY 8a6fcdc2bc Cleanup
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3549 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-06-26 15:06:23 +00:00
sl1nk3.s c857f71e80 Minor bugfixes : disable Refresh list and Load wii menu when game is running and fix silly init of njoy's rumble
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2973 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-04-15 20:19:25 +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 ee7ef367ff fix for linux compile error introduced in r2691
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2697 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-20 19:34:36 +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
nakeee f22af37320 Trying to make gameini support some gl options
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2687 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-03-20 11:51:22 +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 0f2a0750a2 nJoy: Moved nJoy.ini to the config dir
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2445 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-26 08:42:18 +00:00
LPFaint99 473cd01181 UUpdate svn:eol-style=native ( r1438 ) for Source/*.h
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2385 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-23 06:17:57 +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
nakeee 9ec81d4bf0 linux compile fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2377 8ced0084-cf51-0410-be5f-012b33b47a6e
2009-02-22 21:37:36 +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