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

1889 Commits

Author SHA1 Message Date
Matthew Parlane 15f8603d1f Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Common/Src/CommonPaths.h
	Source/Core/Common/Src/FileUtil.cpp
 2013-08-26 00:50:57 +00: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
Matthew Parlane 5548e77438 Merge branch 'master' into wii-network 2013-08-24 23:56:31 +12:00
Jasper St. Pierre dfb34ddef4 NetPlayWindow: Make the spacing consistent on both sides 2013-08-23 20:40:34 -04:00
Pierre Bourdon 9303b57db1 Refactor VideoCommon/OnScreenDisplay. 
Use strings internally, use a multimap and std::function for callbacks (instead
of a flat vector + loop over the vector to find the right callback type), fix
coding style issues. Simplify MainAndroid code a bit.
 2013-08-24 02:13:54 +02:00
Jasper St. Pierre 23ff31451f NetPlay: Rework pad mapping 
Pad mapping and the UI behind it is significantly confusing,
and has been confusing users since NetPlay was introduced.

As part of a large code cleanup to help NetPlay more stable,
introduce a better pad mapping system where local pad mapping
is handled by the client. Now, all the server and other
clients know is which player have which controllers, and the
clients only know this so they can show the pad mapping in the
UI; they don't do anything else with it.

A future cleanup will use this pad mapping data to completely
ignore the pads configured in the settings pane on the host.
 2013-08-23 09:40:08 -04:00
Matthew Parlane b6e054a2be Merge branch 'master' into wii-network 
Conflicts:
	Source/Core/Core/Core.vcxproj
	Source/Core/Core/Core.vcxproj.filters
	Source/Core/Core/Src/CoreParameter.cpp
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
 2013-08-23 00:51:12 +12:00
skidau c774fb4880 Removed a redundant tooltip text. 2013-08-18 17:09:01 +10:00
skidau 5cec914484 Changed the default audio latency to 2. Made soft_oal.dll the default on Windows builds as the old OpenAL32.dll is outdated and contains bugs. 2013-08-18 17:03:21 +10:00
Jasper St. Pierre 756bf93111 NetWindow: Move "Write memcards" checkbox to be host-only 
The setting is propagated from the host, so the client checkbox would
be ignored anyway.
 2013-08-16 21:42:38 -04:00
Ryan Houdek 08b27bb3b8 In the EGL backend context interface, don't call eglMakeCurrent. This was only done to pull in some information to the info log. This is necessary since eglMakeCurrent binds the context to the current thread and we need to destroy the context and reinitialize it when jumping to a new thread. We already call MakeCurrent in Video_Prepare which is done in the new thread. 2013-08-16 23:41:45 +00:00
NeoBrainX 1ba98550ef VideoConfigDialog: Rephrase "Hacked Buffer Upload" and its description to something less technical. 2013-08-16 14:26:50 +00: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
Matthew Parlane 9de7611ff9 Merge branch 'master' into wii-network 
Conflicts:
	CMakeLists.txt
	Source/Core/Core/Core.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Dolphin.vcxproj.filters
	Source/Dolphin_2010.sln
	Source/VSProps/Dolphin.Win32.props
	Source/VSProps/Dolphin.x64.props
 2013-08-16 19:17:07 +12:00
Pierre Bourdon c6d8d52041 Fix a warning introduced by the recent netplay UI changes 2013-08-15 15:05:20 +02:00
Matthew Parlane d8b39b9dcf Support PolarSSL on *nix 
Removed unneeded PolarSSL directories.
Remove duplicate sha1 and md5 files.
Define out SSL test file writing.
Fix format string bug and warning.
 2013-08-15 23:36:17 +12:00
Jasper St. Pierre 998194246c NetPlay: Disable the "Start" button while the game is running 2013-08-14 18:16:07 -04:00
Jasper St. Pierre 1c74e412e2 NetPlay: Remove the "Stop" button 
Now that the host can simply close the window, there's no need for this extra control.
 2013-08-14 18:16:06 -04:00
Jasper St. Pierre 5241deaebe NetPlay: Allow hosts to stop the game by closing the game window 2013-08-14 18:16:05 -04:00
Jasper St. Pierre 92f8d79574 NetPlay: Set the pad buffer size on server creation 
If we don't do this, then when the game starts we'll send out the
buffer size to clients being a super large value of junk, and they'll
hang forever trying to accumulate an input buffer a size that they'll
never ever reach in a million years.

This never manifested in release builds for some reason.
 2013-08-14 18:15:28 -04:00
John Chadwick a791733c27 Fix invalid C++ code (returning reference to local) - thanks devm33. 2013-08-13 14:47:32 -04:00
Jasper St. Pierre d0084cb41d Main: Fix code that creates the BIOS subdirectories 
We need to ensure that the file path ends with DIR_SEP, as
File::CreateFullPath is a very naive function.
 2013-08-12 06:23:58 -04:00
Jasper St. Pierre 22b3c26654 Main: Create BIOS subdirs of GC userdir on load 
So that users don't get confused about where to place the BIOS files
 2013-08-11 14:33:26 -04:00
Jasper St. Pierre a3a222bf5b NetPlay: Remove NetPlay.h / NetPlay.cpp 
Now the server and client implementations are entirely separate.
 2013-08-05 05:05:06 -04:00
Jasper St. Pierre 3b32d3c90d NetPlay: Split the server out, and make the local system manage a client as well 
This should be transparent, but it may cause regressions.

The idea here is that now all players, including the host of the server,
talk to the server through TCP/IP networking. This significantly reduces
our codepaths through netplay, and will prevent strange local-only bugs
from happening.

The cleanup isn't 100% finished yet. The NetPlay dialog still drives the
server through private APIs. I eventually want to sanction off the server
entirely, so all communication is done through TCP/IP. This will allow us
to have high-traffic public servers that can relay multiple games and
lobbies at a time, and split off channel and game management to people
other than the host.

This is all still just a pipe dream, though.
 2013-08-05 04:42:26 -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 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
Ryan Houdek 5d38a9c91e [Android] Some minor cleanup. 2013-07-27 15:09:33 -05:00
Rachel Bryk 3f03588dec Tas input works with bongos too. 2013-07-23 20:43:51 -04:00
Braden ec148008d0 Clean up code for multiple GameCube Controllers 
Conflicts:

	Source/Core/DolphinWX/Src/Frame.cpp
	Source/Core/DolphinWX/Src/FrameTools.cpp
 2013-07-23 20:35:33 -04:00
Braden 59d6df7046 Adds Support for multiple GameCube Controllers 
Conflicts:

	Source/Core/DolphinWX/Src/Frame.cpp
 2013-07-23 20:22:08 -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 1be844406c, but allows < fully pressed, and without the typo.
 2013-07-23 19:44:43 -04:00
Jasper St. Pierre 09338c673c FrameTools: Use the correct window handle for resizing the window 
We want to resize the OpenGL window, not the frame window.
 2013-07-23 15:02:00 -04:00
Jasper St. Pierre 6d463d1b67 NetPlay: Allow building a server without a game 
This isn't hooked up in the UI yet, but it will allow us to
basically start the server and chat system without choosing
a game.
 2013-07-22 07:29:15 -04:00
Jasper St. Pierre f693488c8a InputConfigDiag: Save the configuration when pressing "OK" 
This fixes a common UI complaint of the control dialog UI.
Also, don't close the dialog if we have an error with the expression.
 2013-07-22 03:19:38 -04:00
Jasper St. Pierre bc17798ef2 InputConfigDiag: Add a simple error status label 
This tells you what you did wrong at a high level if you messed up.
 2013-07-22 03:19:22 -04:00
Jasper St. Pierre 3c7f223aa1 Add "Q" / "E" as freelook keybindings 
To move the view up and down.
 2013-07-22 00:14:42 -04:00
Jasper St. Pierre 52482115e1 Move in-game keybinding handling to a central location 
Instead of handling it separately in every backend.
 2013-07-21 23:17:16 -04:00
Rachel Bryk e742b32c65 Drag and drop. 2013-07-21 22:25:26 -04:00
Jasper St. Pierre fec641d14a X11: Don't do a round-trip to the server to figure out our size on configure 
Simply use the values from the event structure.
 2013-07-21 01:59:40 -04:00
Jasper St. Pierre 01ff85506d X11: Don't use a client event as a wrapper for XMoveResizeWindow 
Simply configure the window from here
 2013-07-21 01:59:40 -04:00
Ryan Houdek 737df2a68c Patch from Degasus that removes the last of the the GL_TEXTURE_RECTANGLE usages. This is needed to have GLES3 support. 2013-07-13 17:24:23 -05:00
Glenn Rice 8b65775ee1 Fix a couple of compiler warnings that have cropped up. 2013-07-10 15:07:57 -05:00
John Chadwick 16cd26d177 Add UPnP support. 
Feedback is in logs as suggested by skid_au. The checkbox is still there, but
mostly for people who would like to opt out (unfortunately, I can not be sure
how this feature may behave for some routers - there's a hell of a lot of bad
UPnP implementations.)

The Visual Studio stuff is a little messy, so I apologize if anything is a bit
off. I tested most configurations and it worked.

I also tested CMake on Debian Wheezy, Ubuntu Saucy, and Mac OS X Mountain Lion.
All seemed to be OK.
 2013-07-09 18:08:43 -04:00
Jasper St. Pierre b2e7248b58 LogWindow: Fix a bad initializer 
Since these defaults aren't used, don't bother specifying them.
 2013-07-05 22:39:18 -04:00
Rachel Bryk e4846de692 Add hotkeys for save/load state to/from file. 2013-06-30 19:01:30 -04:00