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

115 Commits

Author SHA1 Message Date
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
John Peterson fa7e857161 nJoy: Readded some fixes to nJoy (Notice: these changes have nothing to do with the argument earlier. These are only for fixing nJoy (point one and three in the 1991 revision)). Now opening the Wiimote plugin doesn't crash either (it was just a typo in GetWiimote()). 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2000 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-24 12:09:30 +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
hrydgard 70bc8167f8 Warp back to 1983!!! (rev 1983, that is, not the year :P) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1997 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-23 21:28:55 +00:00
John Peterson 7ecf884f9a nJoy: Fix to last commit 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1996 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-23 16:50:07 +00:00
John Peterson f15c53eba7 nJoy: Compile fix (missing #endif) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1995 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-23 16:48:04 +00:00
John Peterson 361aed6811 nJoy: Added #ifdef INPUTCOMMON 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1994 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-23 13:31:00 +00:00
John Peterson 63ad74f9e8 nJoy and PluginManager: 
1. Avoided LoadLibrary() and FreeLibrary() in favor of using an existing LoadLibrary() because of an unresolved crash related to LoadLibrary() and nJoy. After several times of LoadLibrary() and FreeLibrary() of nJoy these seems to be some kind of memory corruption that brings up several error boxes from different places (not just nJoy) and then cause a crash.

2. Slowed down the moving of the pad initialization to InputCommon. I'm not against InputCommon at all, but I have to spend some more time with it before it works on Windows

3. Partly fixed a somewhat frequent failure of nJoy with SDL 1.3 that would give a strange DirectInput error message and cause the pads to not function. It's still present before the nJoy config windows is opened. It's only fixed on booting a game.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1991 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-23 10:00:59 +00:00
nakeee 8a87001778 forgot include 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1986 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-23 00:15:57 +00:00
nakeee 87bfe821eb Added input manager handles the sdl init/quit for now 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1984 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-22 22:32:57 +00:00
John Peterson e332e18ce6 nJoy and SerialInterface: Fixed the crashes with MAXPADS more than 1, the downside is that it doesn't work well one the second boot 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1980 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-22 11:18:46 +00:00
John Peterson bb06dfb823 nJoy and SerialInterface: Fixed the nJoy crashes 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1978 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-22 00:31:12 +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 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 0c9a1a9595 nJoy: The triggers were inversed 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1948 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-20 11:11:02 +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 c2c6e2bd47 nJoy: Fixed some misplaced values 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1935 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-19 18:09:03 +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
Shawn Hoffman ba8c2aa7e4 nakee's work on dolphin events. Also get wxw out of logmanager. This commit wants your comments 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1875 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-15 06:48:15 +00:00
nakeee bf18502077 ADding functions 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1828 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-08 12:12:15 +00:00
John Peterson 6517f80316 nJoy: Config fix 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1791 8ced0084-cf51-0410-be5f-012b33b47a6e
 2009-01-05 06:35:59 +00:00
John Peterson 9786786c7e nJoy: Typo 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1708 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-28 20:11:22 +00:00
John Peterson 270e411cf5 nJoy: Changed comment 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1707 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-28 18:56:10 +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 15cff48f5a nJoy: First implementation of an analog stick radius adjustment. Converting a square radius to a circle radius. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1698 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-27 11:32:03 +00:00
LPFaint99 fb5b4d026a Compile fix, remove PanicAlert from nJoy SDL 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1697 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-26 19:39:12 +00:00
nakeee a679e345fd Started working on pad evnt 
fix for testgl
fix for njoy-sdl to work in debug


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1674 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-26 09:20:01 +00:00
John Peterson 92cef41968 nJoy: Preparation for adding new options. NOTICE: Not tested in OSX 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1665 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-26 02:42:15 +00:00
bushing fd60a51a95 Fix the degenerate case so that we don't crash if zero joypads are detected 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1645 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-24 07:38:39 +00:00
nakeee 62d44c9166 Clear errors, fixed unload on linux 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1566 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-17 17:49:38 +00:00
nakeee 7f8cc4ec62 more nowx fixes 
disabled njoy test build


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1545 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-14 23:52:01 +00:00
hrydgard 0d424e109c might fix up nJoy, thanks sl1nk3 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1516 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-12 20:35:46 +00:00
hrydgard 4e1e220e71 Cleanup, some BOOL removal. tested to work, unlike a certain other change :p 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1515 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-12 17:59:33 +00:00
hrydgard 537cf69cce Revert 1513 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1514 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-12 17:36:12 +00:00
nakeee 8fa5b24472 made BOOL into s8 
I tried hard not to break windows code but please check


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1513 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-12 12:56:11 +00:00
hrydgard ff776ce7cf Some fixes to nJoy. No more trying to read non-existing buttons (dunno about axes, but i got warnings about the buttons), 
Also some code standard cleanup.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1488 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-10 21:23:15 +00:00
bushing 901fe7c00f set svn:eol-style=native for Plugins/**.cpp 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1441 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-08 05:25:12 +00:00
Shawn Hoffman 84614f31f4 made configmain a lot more pretty, fixed an annoying bug where closing njoy would send dolphin behind any other open windows, and ported the "old" about box to wxw. The message is just a huge string, so just change if wrong! 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1024 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-10-31 05:40:52 +00:00
Shawn Hoffman 26552968b7 updated njoy so it now shows it's beautiful aboutbox too. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@790 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-10-07 19:29:30 +00:00
Laurence Muller 54719af08c removed win32 gui from the plugin. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@783 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-10-05 23:04:35 +00:00
fires.gc c7ae1fd402 Reverted r762 and r763 - i don't see any good reason to keep this revision as long as nobody fixes the windows build (btw: i don't understand why we need a non-WX build at all). if someone is going to fix it he can revert this revision. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@766 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-10-04 17:26:12 +00:00
Sonicadvance1 9a3ebd0c3b Linux: Compiling with nowx=true now builds the entire project without WX, this isn't tested in Windows so it's always on via Common.h, You can test/fix it yourself that way. Also fixed Compiling again 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@762 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-10-04 07:57:28 +00:00
Shawn Hoffman 6178eae001 made all plugins build with correct names and paths. (windows). for some reason njoy and padsimple don't show that they have been compiled with debugfast in their name, not sure why. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@733 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-09-30 01:09:02 +00:00
Maarten ter Huurne 0bebbcb5f4 Replaced type "BYTE" by "u8", except where "BYTE" is used to access the Windows API. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@408 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-08-31 14:32:35 +00:00
Maarten ter Huurne 838f37112e Fixed compilation on Mac OS X by testing for Linux explicitly instead of assuming that non-Windows equals Linux. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@380 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-08-30 08:49:34 +00:00
Sonicadvance1 3e029639df Removed jpeg dependency in GL plugin, added Rumble to Linux nJoy. and reverted my accidental Dolphin ini file 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@379 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-08-29 09:55:17 +00:00
masken ae5b59747a Turned on Warnings as Errors for all vcprojs. Fixed almost all of the warnings in win32. Added many SVN Ignore settings. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@283 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-08-23 15:28:24 +00:00
Laurence Muller 5fc50dc63c Disabled the rumblepad hack. 
If you want to use it, uncomment #define USE_RUMBLE_DINPUT_HACK in nJoy.h.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@172 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-08-10 18:46:55 +00:00
hrydgard e7786f3934 fix linux build, last njoy commit broke it :P 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@127 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-08-03 09:21:04 +00:00
Laurence Muller bcaa0d1d86 nJoy: 
- Added some kind of rumble support (windows only, using direct input).
- Only usable for player one.
- Not customizable, fixed rumble strength.
- Due to some Dolphin bugs you need to initialize rumble support manually.

How to use:
- Disable the 'render to main window' in the video plugin (opengl or d3d).
- Start the game and wait a few seconds.
- When the game is running, press the 'half press' button once.
- Rumble support should now be enabled (if your joypad supports it).
- Confirmed to work with Crazy Taxi.

Dolphin bug:
When void PAD_Initialize(SPADInitialize _PADInitialize) is called, the render window does not excist yet. Therefor the value _PADInitialize.hWnd is incorrect.

In order to initalize rumble support, it is required to set the CooperativeLevel to "DISCL_EXCLUSIVE | DISCL_FOREGROUND". But without a proper hWnd this will fail.
So the trick I used here is, let the game start and create a window (and a hWnd). After that I set the CooperativeLevel.



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@126 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-08-01 23:38:53 +00:00
Laurence Muller 53ba40fd7f nJoy: GUI update 
- Config GUI now uses wxWidgets (should work in linux!)
- The alignment of text may look crappy in linux, so we still need to fix that.
- Opening the config GUI takes time, crappy XPM image of the controller loads slow (cant we use BMP files???) (line 240)
- Stupid GUI bug present when switching between a default joystick and one with no hat. (line 381)
- For some reason setting the value of a wxTextCtrl doesnt gets updated immediately (line 559)
- If you're using windows and dont want to use wxWidgets for the GUI, you can still use the old one by removing #define USE_WXWIDGETS from nJoy.h line 33.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@95 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-29 22:26:42 +00:00
Laurence Muller 82137a0ee9 nJoy: 
- Converting dialog windows to use wxWidgets instead of win32.
- Currently only the about box is converted.
- The debug versions in windows will not compile yet.
- If you want to use the old version, remove #define USE_WXWIDGETS in nJoy.h



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@85 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-26 12:28:17 +00:00
Laurence Muller 690b7d4e1e nJoy: 
- nothing special, just a default nJoy.ini.
- Controller 1 contains a profile for the logitech rumblepad 2

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@71 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-23 19:23:36 +00:00
Laurence Muller d8ed24fd29 nJoy: 
- This version should compile on linux.
- The about and config dialogs are disabled (win32 should be replaced by wxWidgets)
- This version is untested, so if you want to try it out, use a premade nJoy.ini from a windows install.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@70 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-23 18:53:54 +00:00
Laurence Muller 5955748d58 nJoy: minor fix, loading settings while game is running. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@62 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-23 09:05:59 +00:00
Laurence Muller f9582bef30 nJoy: 
- Enabled Half press for shoulder buttons
- Added a option to select controller type
- Normal controllers should use the default joystick
- Some joysticks dont have a real hat (POV) but fake this with buttons.
In this case Joystick (no hat) should be selected.
After this is selected, four new buttons will appear for the d-pad.
- Next version will probably include keyboard support.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@60 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-23 00:49:20 +00:00
Laurence Muller 7f95ad831f nJoy: Shoulder button fixed, I forgot to set a value for the pressure. Currently it set at max (0xFF) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@57 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-22 14:32:13 +00:00
Laurence Muller ef3a9832ce nJoy: small fixes for the analog from gigaherz 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@56 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-22 14:23:27 +00:00
fires.gc e8b40c07a3 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@51 8ced0084-cf51-0410-be5f-012b33b47a6e 2008-07-22 09:02:26 +00:00