Commit Graph
100 Commits
Author SHA1 Message Date
Rachel Bryk 0a093cf1b9 Why do compilers assume i don't know order of opperations? :( 2013-09-22 22:01:25 -04:00
Rachel Bryk 12e7c22006 Fix recording netplay with wiimote. 2013-09-22 17:32:11 -04:00
Rachel Bryk 9a6f28fce4 Revert "Fix stack misalignment issues."
This reverts commit d334a9bc23.

This breaks single core.
2013-09-22 14:29:35 -04:00
Rachel Bryk f3469c16a5 Merge branch 'wiimote-netplay'
Conflicts:
	Source/Core/Core/Src/NetPlayClient.cpp
	Source/Core/Core/Src/NetPlayClient.h
	Source/Core/Core/Src/NetPlayProto.h
	Source/Core/Core/Src/NetPlayServer.cpp
	Source/Core/Core/Src/NetPlayServer.h
	Source/Core/DolphinWX/Src/NetWindow.cpp
	Source/Core/DolphinWX/Src/NetWindow.h
2013-09-22 14:27:52 -04:00
Rachel Bryk 75129dc3a7 Merge branch 'to-merge-after-4.0' 2013-09-22 10:58:24 -04:00
Rachel Bryk d2c3222fcc Fix copying Sys/Wii to User/Wii on startup.
Fixes issue 6621.
2013-09-21 00:34:19 -04:00
Rachel Bryk dc73222bfc Remove suggestion to restart dolphin if a wiimote movie desyncs, since it's no longer necessary. 2013-09-18 21:51:37 -04:00
Rachel Bryk 47ce3dd09d Really fix reading projection hacks from game inis. 2013-09-17 10:44:47 -04:00
Rachel Bryk e3d01de01d Fix reading projection hack from game inis in ISOProperties. 2013-09-17 10:40:12 -04:00
Rachel Bryk ec5cf60f5e Set L/R buttons in tas input, instead of just the analog triggers.
Fixes issue 6613.
2013-09-17 09:56:45 -04:00
Rachel Bryk afdac224cb Prevent an error message from erroneously displaying when dumping frames in d3d9 or d3d11. 2013-09-16 06:31:47 -04:00
Rachel Bryk b4c082f1b3 No, i don't check what i committed before pushing to master, one week before a release.
Fixes a mistake from  550c855ae6.
2013-09-14 22:58:32 -04:00
Rachel Bryk 550c855ae6 Create blank ini file before editing it, if it doesn't already exists. This prevents the editor from prompting to create it. 2013-09-14 20:30:42 -04:00
Rachel Bryk dfcef6890e Use global user directory on windows.
Can override by setting HKCU\Software\Dolphin-emu\LocalUserConfig to true.
2013-09-14 06:08:29 +02:00
Rachel Bryk 0d341e9f28 [NetPlay] Fix copy and paste error. 2013-09-09 03:12:42 -04:00
Rachel Bryk 772046647a Revert "Revert "NetPlay: Use the correct pad mappings for rumble""
This reverts commit 06140e8083.
2013-09-09 03:09:45 -04:00
Rachel Bryk 33fb1b562f Move some code from NetPlayClient.h to NetPlayProto.h, and only include that outside of NetPlay. 2013-09-07 00:27:35 -04:00
Rachel Bryk 2bc44f98c3 Disable gui controls for gc controllers and memory cards during netplay and movies. 2013-09-07 00:06:03 -04:00
Rachel Bryk 3baab41cf4 Allow input display to work with netplay even when not recording. 2013-09-05 16:09:56 -04:00
Rachel Bryk e9ffba7ab8 Don't ever ever let CFrame::DoStop() run twice at the same time. 2013-09-03 18:53:23 -04:00
Rachel Bryk 8ae10b3e12 [NetPlay] Allow recording movies during netplay.
Fixes issue 6207.
2013-09-03 15:50:41 -04:00
Rachel Bryk 3ff81c9199 Merge branch 'netplay-stop-fix'
Fixes issue 6511.
2013-09-02 23:39:57 -04:00
Rachel Bryk 7d09e72ac8 Don't tell the server to stop if we already stopped. 2013-09-02 23:33:53 -04:00
Rachel Bryk 410197a3bd Remove code that was made unused by revision cea7737aef. 2013-09-02 22:05:05 -04:00
Rachel Bryk cea7737aef Fix crash on stop in netplay, and stop netplay when anyone with a pad mapped in game stops emulation. 2013-09-02 21:54:28 -04:00
Rachel Bryk 18749bad68 Actually allow the dump and logs folders to be set outside of user/ 2013-08-25 01:35:32 -04:00
Rachel Bryk 8882f89bbc Allow user folder to be set via command line.
Clean up GetUserPath(), to allow setting any path with it.
2013-08-24 23:15:55 -04:00
Rachel Bryk d3894a0594 Clean up wiimote-netplay. 2013-08-22 11:58:29 -04:00
Rachel Bryk d3c437819d NetPlay: Add blank inputs when reporting mode changes, so the buffer isn't empty if wiimote 1 isn't polled next. 2013-08-19 17:03:14 -04:00
Rachel Bryk 894e29b809 Fix comments, and send wiimote mapping to new users. 2013-08-18 05:17:06 -04:00
Rachel Bryk 89d324786a Prevent stopping emulation before fully booting. This can sometimes cause dolphin to crash. 2013-08-16 10:04:08 -04:00
Rachel Bryk c7025989f8 Probably worthless commit that may fix wiimote netplay buffer problems. 2013-08-15 22:31:36 -04:00
Rachel Bryk 6d67ea2fda Merge remote-tracking branch 'origin/master' into wiimote-netplay 2013-08-15 09:00:04 -04:00
Rachel Bryk 90d454d22f Remove -0 from stable release version numbers. 2013-08-08 23:59:53 -04:00
Rachel Bryk f51cb0b7eb Fix multiplayer wiimote netplay. 2013-08-07 18:00:38 -04:00
Rachel Bryk 011bcfee34 Misc netplay cleanup. 2013-08-07 10:10:40 -04:00
Rachel Bryk d0f05291e7 Add wiimote support to netplay. 2013-08-07 08:16:41 -04:00
Rachel Bryk 88212fba67 Add new Netplay headers to the VS project. 2013-08-05 23:15:53 -04:00
Rachel Bryk af71100867 Save DSP on thread setting to config cache when booting.
Fixes issue 6451.
2013-08-04 02:34:39 -04:00
Rachel Bryk f58edd018c Remove a couple files which have apperently never been used for anything. 2013-08-02 20:46:07 -04:00
Rachel Bryk 541106d611 Increase number of save state slots to 10. 2013-08-02 20:42:30 -04:00
Rachel Bryk c1baed086d Fix hotkeys. 2013-08-02 16:14:34 -04:00
Rachel Bryk 8c5bc2ba3c Allow setting dsp on thread via game ini.
Also force TWW to LLE and no dsp on thread.
2013-07-31 21:35:22 -04:00
Rachel Bryk 44d17b5da5 Add hotkeys to increase/decrease the frame limit. 2013-07-30 19:25:12 -04:00
Rachel Bryk a33b1fcdc6 Make hotkeys for togglign IR, AR, efb copies and fog settings configurable. 2013-07-30 05:49:02 -04:00
Rachel Bryk bff2bc1288 Clear patches on shutdown.
Fixes issue 6434.
2013-07-25 16:43:00 -04:00
Rachel Bryk 7a6eeb5fbd Merge branch 'multi-tas-input' 2013-07-23 20:44:21 -04:00
Rachel Bryk 3f03588dec Tas input works with bongos too. 2013-07-23 20:43:51 -04:00
Rachel Bryk 8a4b6f3d73 Forgot this from the last commit. 2013-07-23 19:55:17 -04:00
Rachel Bryk 9fdc7360cd Fix L and R triggers with tas input.
Partially copied from revision 1be844406c02, but allows < fully pressed, and without the typo.
2013-07-23 19:44:43 -04:00
Rachel Bryk e742b32c65 Drag and drop. 2013-07-21 22:25:26 -04:00
Rachel Bryk 481c081db3 Merge branch 'possibly-useful-netplay-changes' 2013-07-21 13:33:14 -04:00
Rachel Bryk 41fe2e1466 Don't sync dual core setting in netplay. 2013-07-20 13:20:14 -04:00
Rachel Bryk 96219df4fd Allow non-SIDEVICE_GC_CONTROLLER controllers in netplay again. 2013-07-19 22:58:33 -04:00
Rachel Bryk e4767aec55 Sync some important settings with server during netplay. 2013-07-19 18:48:27 -04:00
Rachel Bryk 919e54c695 Automatically connect the appropriate controllers for netplay. 2013-07-19 15:53:20 -04:00
Rachel Bryk 0e1efd7d38 Poll the controllers with the same timing as movies for netplay. Might help prevent desyncs. 2013-07-19 15:01:04 -04:00
Rachel Bryk 970cb4329f Merge branch 'real-wiimote-fixes' 2013-07-11 11:35:51 -04:00
Rachel Bryk de369dcc60 Misc cleanup and fixes for some of the bad code i've written.
Fixes a buffer overflow in the sscanf, move the movie.raw to the GC folder, and stops calling GetSettings() twice.
2013-07-01 17:44:42 -04:00
Rachel Bryk e4846de692 Add hotkeys for save/load state to/from file. 2013-06-30 19:01:30 -04:00
Rachel Bryk 63a747edc0 Add shortcut to (dis)connect the balance board.
Fixes issue 6383.
2013-06-26 06:23:29 -04:00
Rachel Bryk 5904ffb21d Fix last commit, and set the position on mouse down instead of mouse up. 2013-06-25 11:04:28 -04:00
Rachel Bryk b892d838ff Allow dragging the analog sticks with the tas input. 2013-06-25 10:52:25 -04:00
Rachel Bryk a619135ab4 Merge branch 'JP-wiimote-savestate-fixes' 2013-06-25 09:32:01 -04:00
Rachel Bryk 970661a0c5 Warning fix. 2013-06-24 12:30:08 -04:00
Rachel Bryk f73a97b242 Revert "fix warning: format '%x' expects argument of type 'unsigned int*', but argument 3 has type 'u8* {aka unsigned char*}'"
This reverts commit b9953f5d6a.
2013-06-24 09:16:14 -04:00
Rachel Bryk 266236d6a4 When loading a save state in read only that mismatches the current movie, load the input prior to the save state from the save state's movie, instead of using the current movie's input up to that point.
This prevents desyncing before the save state.
2013-06-21 01:53:50 -04:00
Rachel Bryk 716f656d28 Save sync gpu setting to dtm header. 2013-06-20 06:08:17 -04:00
Rachel Bryk 3e40f28369 Get video backend name via g_video_backend->GetName() instead of sconfig for movies, since that can be wrong.
Also, I still can't code. Or even notice when something obviously doesn't work.
2013-06-10 21:04:55 -04:00
Rachel Bryk ca12e7ee8f Make auto fullscreen resolution the default. 2013-05-25 13:51:52 -04:00
Rachel Bryk 743230500f Add auto fullscreen resolution option. Not tested on Linux, let me know if it doesn't work (it probably does).
Fixes issue 6082.
2013-05-25 03:08:09 -04:00
Rachel Bryk 026ab26755 Save settings to file when booting a game.
Fixes issue 6310.
2013-05-24 19:06:01 -04:00
Rachel Bryk 2412b2287a Buildfix for dsptool. 2013-05-21 20:30:09 -04:00
Rachel Bryk 10630989a4 Merge remote-tracking branch 'john-peterson/state4' 2013-05-21 20:14:15 -04:00
Rachel Bryk 10d1d19409 Set graphics settings while playing a movie in UpdateActiveConfig(), so settings can't be changed for a frame. 2013-05-21 19:20:22 -04:00
Rachel Bryk 7d74e30423 Merge remote-tracking branch 'john-peterson/cheat2' 2013-05-05 14:53:10 -04:00
Rachel Bryk e5fdd301a9 Merge remote-tracking branch 'John-Peterson/state' 2013-04-29 22:32:08 -04:00
Rachel Bryk 5afceca7a1 Apparently we can't trust m_strVideoBackend on osx. 2013-04-26 02:47:49 -04:00
Rachel Bryk 3b732f695d Show video backend and audio engine in title bar.
Fixes issue 6276.
2013-04-25 19:59:08 -04:00
Rachel Bryk deece78e19 Seriously, someone kill me. 2013-04-08 03:11:45 -04:00
Rachel Bryk 48f3e962d6 Kill me now.
Fixes issue 6227.
2013-04-08 03:05:12 -04:00
Rachel Bryk 4d81e0739d Use an enum for efb scale values. 2013-04-06 01:49:13 -04:00
Rachel Bryk ee163d1e49 Someone take my commit rights away. 2013-04-05 17:26:56 -04:00
Rachel Bryk 6a5a522bba Hastily committing untested code without making sure i didn't miss anything first? I would never! 2013-04-05 17:20:34 -04:00
Rachel Bryk e531970052 Round IR scale down to whole number if using 1.5x/2.5x IR, if game ini specifies -1 for EFBScale.
Fixes issue 6210.
2013-04-05 17:13:48 -04:00
Rachel Bryk 81e261eb68 Fix description of disable fog, and move it to enhancements tab. 2013-03-24 15:47:18 -04:00
Rachel Bryk 7c2c4662a7 Disable Vsync while holding tab to disable the frame limit, and allow toggling vsync while emulation is running in OGL.
D3D9 still doesn't support changing vsync while emulation is running.

Fixes issue 6111.
2013-03-18 20:42:18 -04:00
Rachel Bryk 0c86634101 Revert "Disable Vsync while holding tab to disable the frame limit."
This reverts commit 341eb87806.

I'll do it right later.
2013-03-17 12:30:44 -04:00
Rachel Bryk 341eb87806 Disable Vsync while holding tab to disable the frame limit.
Fixes issue 6111.
2013-03-17 11:56:24 -04:00
Rachel Bryk 8767b30f75 My OCD will not stand for this. 2013-03-15 15:42:59 -04:00
Rachel Bryk d63d7fde9e So much more readable now! 2013-03-15 11:45:43 -04:00
Rachel Bryk def578fea6 Fix checks for preventing the main and render windows from spawning off screen. 2013-03-15 09:19:39 -04:00
Rachel Bryk eaebebc33d Prevent the render window from spawning off screen.
Fixes issue 6063.
2013-03-14 05:28:02 -04:00
Rachel Bryk 0b34457a8e All the cool kids hard code string lengths.
Fixes issue 6090.
2013-03-13 07:04:53 -04:00
Rachel Bryk e73cc858bc Allow playing movies from command line. Also remove some unneeded code. 2013-03-13 01:37:35 -04:00
Rachel Bryk 9a3633924d Dolphin needs to be restarted before playing back a wiimote movie, so let's suggest that instead of giving an unhelpful error message. 2013-03-09 02:44:24 -05:00
Rachel Bryk 13a64e992d Fix a typo. 2013-03-08 22:47:56 -05:00
Rachel Bryk 723371e022 Wow, I'm dumb. Fix mismatched set/get. 2013-03-08 20:06:04 -05:00
Rachel Bryk 0c16489c39 Merge branch 'VideoSoftware-savestates' 2013-02-28 13:36:29 -05:00
Rachel Bryk 46f5c19c6d Not sure if this is the right way to handle this, but it makes the save states perfectly stable. That's all that really matters, right? 2013-02-26 18:52:38 -05:00