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

122 Commits

Author SHA1 Message Date
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
nakeee 20b6438b4b warning fixes 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1703 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-28 15:49:19 +00:00
nakeee 847dc93b73 That line doesn't make sense at all 
Can anyone explain why it's there?


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1702 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-28 15:37:14 +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
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 a9e588f4f3 nJoy: I forgot the file header 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1666 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-26 02:48:35 +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
Shawn Hoffman a6a279a7da fix for issue 411, njoy testing is re-enabled in windows, but not for debug config (it hates logging?) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1573 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-18 01:21:56 +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
Shawn Hoffman 4a5d9ded94 namespace-ified ActionReplay, and made ISOProperties use the existing AR code. bonus: encrypted arcodes are saved as unencrypted codes just by closing the isoproperties dialog. also added ARCodeAddEdit, but once again, it only views entries atm. some misc wxw cleanup 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1560 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-17 04:14:24 +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
bushing 30c883bcfc set svn:eol-style=native for **.h 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1438 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-08 04:46:09 +00:00
nakeee 064d45024c (requires review for windows/mac) 
Fix up so that various libraries wont be fatal for build with scons
wiiuse lib is used only if HAVE_WIIUSE is defined to 1 
made major cleanup for darwin and osx64


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1404 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-12-05 13:46:19 +00:00
nakeee 2c74f66070 No more Binary in svn + scons clean up 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1158 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-11-13 08:12:48 +00:00
nakeee b47f349c96 Got rid of default Dolphin.ini 
Default plugins are now in Paths.h
Important note for scons users, plugin names now match the one on windows!!!
make sure to remove the old ones!! and update your .ini!!



git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1131 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-11-11 20:59:48 +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
tmator 03763372ac first step to get dolphin on osx 64 with a no wx version (WIP) 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@924 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-10-20 17:32:15 +00:00
Shawn Hoffman 6e4673d5e7 most lame update ever, falcon4ever really wanted this to be changed, blame him 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@792 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-10-07 22:45:48 +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 580193658a Linux: Woops, SConscripts were broken, fixed. I think I broke using wx..maybe. Too tired to fix right now, must sleep 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@763 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-10-04 08:27:56 +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
Shawn Hoffman b39f0240cb padsimple config should get keycodes in windows now. replaced wxT("") with wxEmptyString. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@676 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-09-24 22:20:37 +00:00
Maarten ter Huurne 93afa3c5bb Use single quotes instead of double quotes. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@629 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-09-23 00:26:21 +00:00
Maarten ter Huurne 31f1fabbac Append to LIBS instead of overriding. Fixes build problems on Mac OS X. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@622 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-09-22 23:36:16 +00:00
nakeee e0291e735c cleaned up SConscripts 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@602 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-09-21 19:54:29 +00:00
nakeee 3e2419776f fixed scons=parsing 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@591 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-09-20 22:06:22 +00:00
Sonicadvance1 720efb825d Linux: I made Sconscript call wx-config inside of the main SConstruct, added a nowx argument, Made the filesystemviewer use the correct struct and fixed a silly scissor error that was made 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@589 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-09-20 17:31:54 +00:00
nakeee 0f4c4b6e1c SConscript made all the rest of env.Copy into env.Clone 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@542 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-09-16 16:50:09 +00:00
daco65 7a68316c61 stupid VS2005 compiler and its " i dont understand directories with spaces" 
fixed building when the source is located at a place like C:\Documents and settings


also got sick of njoy.h saying the new lines wern't done correctly. so thats fixed too.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@504 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-09-12 23:55:59 +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
Maarten ter Huurne bbeca155de Added "const" to the data type. This fixes loads of compile warnings and the resulting file seems to still be a valid XPM (in fact, some of the files already had "const"). 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@349 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-08-27 11:24:16 +00:00
Maarten ter Huurne 8876637c9f Fixed invalid use of sprintf. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@344 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-08-27 09:54:11 +00:00
Maarten ter Huurne 734586a0ab Include system headers using "#include <file.h>", so GCC will not issue warnings about them. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@331 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-08-26 23:32:54 +00:00
Maarten ter Huurne 59974dfb5b Only use "-fPIC" for compiling objects that will be part of dynamic libs. Make SConscripts inherit the compile flags from the top level instead of overriding them. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@329 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-08-26 22:28:42 +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
Maarten ter Huurne efd894fe1e Include SDL header as "SDL.h". This works with the CFLAGS output of pkg-config, picking up SDL no matter where it is installed. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@274 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-08-22 21:19:56 +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
tmator 60ac064e0c Mac plugin is now in mac/Plugins directory 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@113 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-31 08:38:13 +00:00
Laurence Muller 8f1628b69c nJoy: GUI fixes 
- It should now look pretty in Linux
- wxWindow::Update(); does not seem to work in Linux, so no countdown timer in Linux when pressing a button.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@110 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-30 23:33:37 +00:00
Laurence Muller fb7a7f9001 nJoy: GUI fixes 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@108 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-30 22:17:45 +00:00
Laurence Muller 19f3c986ff forgot to disable a line... 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@103 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-30 07:52:03 +00:00
Laurence Muller d2776e3468 Fixed linux compatibility, it seems that xpm files load fast under linux... 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@97 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-29 23:02:38 +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 3114c27143 fontsize fix for linux (from gigaherz). 
Logo is still greyscale ;(...

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@88 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-26 21:44:01 +00:00
Sonicadvance1 9d892e7295 Update nJoy about box. 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@87 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-26 20:32:08 +00:00
Laurence Muller 3f32143513 nJoy: oops... used the old filename, for some odd reason the logo image is black and white in linux... 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@86 8ced0084-cf51-0410-be5f-012b33b47a6e
 2008-07-26 12:32:33 +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