a7e1fb81b1
Merge branch 'wad_gamenames'
2013-09-15 21:38:31 -07:00
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
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
5d202ae9ea
proper fix for issue 6206
2013-09-14 15:09:58 -07:00
501eafb407
Overlay local gameinis over global gameinis instead of copying.
...
Huge megacommit because a lot of things needed to be modified to make this
possible.
2013-09-14 17:46:41 +02:00
aa202c2e21
Move global gameinis from User to Sys. Get rid of SHARED_USER.
2013-09-14 06:08:30 +02:00
86e765f3eb
Move Themes/ from User to Sys. Only Gameinis remain.
2013-09-14 06:08:30 +02:00
91a758b342
Move TextureDecoder.cl from User to Sys
2013-09-14 06:08:30 +02:00
c3eec379df
Move global User/Wii to Sys/Wii
2013-09-14 06:08:30 +02:00
e7213ca4b1
Overlay the user Shaders/ over the shared one to avoid copying files
2013-09-14 06:08:30 +02:00
6bdb6585d6
Overlay the user Maps/ over the shared one to avoid copying files
2013-09-14 06:08:29 +02:00
b587af3ea3
Change the initial user directory creation to stop special casing Windows
2013-09-14 06:08:29 +02:00
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
44066326ff
Hack the gettext detection a bit to fix translations not working on OSX buildbot builds
2013-09-12 18:22:31 +02:00
484130049d
On windows, ignore WM_QUERYENDSESSION and close upon WM_ENDSESSION.
...
The messages can come through CFrame::MSWWindowProc and the wxApp implementation, so make sure to catch both.
Fixes issue 6546.
2013-09-10 03:14:21 -07:00
2d492bdc4f
Revert "Leak an object when quitting Dolphin to try and fix issue 6546"
...
This reverts commit 380b780dd1e29de302a6
2013-09-10 01:04:29 -07:00
e29de302a6
Move the CFrame::ClosePages call from ~CFrame to CFrame::OnClose
2013-09-09 18:49:10 +02:00
380b780dd1
Leak an object when quitting Dolphin to try and fix issue 6546
2013-09-09 18:44:21 +02:00
3db2108dbb
Add two buttons to the ISOProperties dialog so that we still meet string freeze deadline.
2013-09-08 21:04:03 +02:00
cf09974d61
Merge branch 'translate-about'
2013-09-07 09:56:54 -05:00
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
2bc44f98c3
Disable gui controls for gc controllers and memory cards during netplay and movies.
2013-09-07 00:06:03 -04:00
f1c6357750
Enable translation of the about dialog.
2013-09-06 21:02:11 -05:00
a7f244e96d
Revert "Revert "[NetPlay] Make the Memory Card A/B setting sync across netplay.""
...
This reverts commit 5696da0b3e
2013-09-04 19:16:28 -05:00
5696da0b3e
Revert "[NetPlay] Make the Memory Card A/B setting sync across netplay."
...
This reverts commit e110f1049c
2013-09-04 02:55:13 -05:00
e9ffba7ab8
Don't ever ever let CFrame::DoStop() run twice at the same time.
2013-09-03 18:53:23 -04:00
e110f1049c
[NetPlay] Make the Memory Card A/B setting sync across netplay.
...
Fixes issue 6575.
2013-09-03 17:41:52 -04:00
8ae10b3e12
[NetPlay] Allow recording movies during netplay.
...
Fixes issue 6207.
2013-09-03 15:50:41 -04:00
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
6b1c8f9d17
[Netplay] Read dual core setting before syncing it with clients.
...
Fixes issue 6573.
Fixes issue 6535.
2013-09-02 19:55:25 -04:00
1b1cc82e5b
rename vertex streaming hack tooltip
...
String is copyed from issue 6552.
2013-09-02 13:33:36 +02:00
2897619ddb
Removal of my terrible idea.
2013-09-02 05:31:48 -05:00
831963616f
[Android] Make texture loading/deleting/drawing backend non-specific by making them happen in the backend instead of somewhere else. Just a clean up commit really.
2013-09-02 01:40:05 -05:00
35b8dfbe0c
A few more warnings.
2013-09-01 23:33:35 -04:00
2630169229
More warnings: mark/avert truncating conversions from float.
2013-09-01 22:59:35 -04:00
403744dee8
Fix use of deprecated screen resolution API.
...
(This is currently pointless, as the code in question is not used on OS
X anyway, but I'd like to see that option come back. In any case, fixes
the warning)
2013-09-01 22:58:35 -04:00
fd7cf5bb71
A bunch of trivial changes to fix clang warnings.
2013-09-01 22:58:33 -04:00
b03ff7a86b
[Android] Fix the game thread never leaving.
2013-09-01 01:10:40 -05:00
22f57cf07a
NetPlay: Don't bother with the host's controller settings
...
Use the pad mapping to calculate the number of devices
we want, and add them on each client when we get the
message.
2013-08-31 21:18:14 -04:00
751c2e69f6
Add a link to our documentations guides in Dolphin
2013-08-31 10:31:43 +02:00
11cffddbf7
Fix a trivial bug in b6728c1405.
2013-08-31 01:54:57 -04:00
7ce3d846d5
Indent the code in the previous bug fix I did. Now there aren't braces on the same level as each other. Should have initially done this along with that commit.
2013-08-31 00:39:19 -04:00
199c4e0d78
Merge branch 'wiiSaveExportFixes'
...
saves like super smash bros brawl, mario kart, etc which use simple copy restriction via the banner file are now able to be imported natively with the wii/wiiU system menu
save files which include subdirs are correctly packaged
NOTE: saves which include 'nocopy'/'nomove' folders will likely always require homebrew
adds feature to export all wii saves
2013-08-30 20:52:09 -07:00
93b0f46d34
Fix a tiny bug in CodeView.cpp. If statement with more than one line was missing braces.
2013-08-30 18:29:03 -04:00
b6728c1405
Avoid unnecessary bundle copies on OS X:
...
- Make "copy data into bundle" depend on the files actually being
changed, rather than being run on every build.
- postprocess_bundle depends on system files and checking the Dolphin
binary and all that, and would be iffy to try to avoid rerunning;
but it's only needed to produce a redistributable bundle, so add
SKIP_POSTPROCESS_BUNDLE to skip it for development.
2013-08-30 17:54:52 -04:00
2ab7fc10da
Rollback "DSP on Thread" to only affect LLE.
...
Keep the threading code in AX HLE in case we want/need to enable it again at
some point. Not too confident about refactoring it right now.
2013-08-30 09:14:30 +02:00
96394da1c2
[Android] Let NativeLibrary handle initial folder structure creation.
2013-08-29 18:07:32 -05:00
957c263367
[Android] Add save state native functions.
2013-08-29 17:47:50 -05:00
18fd690533
Only use static iconv on Android.
2013-08-29 05:53:15 -05:00
cb8e7a1be5
Work around check_lib not finding iconv.
2013-08-29 05:40:16 -05:00
160d72a9ae
[Android] Add in a static libiconv library so non English games don't crash Dolphin Mobile.
2013-08-29 04:43:31 -05:00
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
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
5548e77438
Merge branch 'master' into wii-network
2013-08-24 23:56:31 +12:00
dfb34ddef4
NetPlayWindow: Make the spacing consistent on both sides
2013-08-23 20:40:34 -04:00
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
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
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
c2d208df96
add the ability to export all save files
2013-08-18 15:02:40 -07:00
477c21e946
fix import/export of games with folders.
...
remove copy protection bit from banner
- should allow *some* copy protected games to be moved to a real system;
ex: super smash bros brawl, mario kart
games with a nocopy/nomove folder cannot be imported to a real system without using homebrew tools, warn for these saves
ex: guitar hero
remove some unneccessary class fields
the class is still incredibly ugly :(
2013-08-18 15:00:50 -07:00
c774fb4880
Removed a redundant tooltip text.
2013-08-18 17:09:01 +10:00
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
ba76b016da
[Android] Fix Wii games.
2013-08-17 19:41:28 -05:00
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
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
1ba98550ef
VideoConfigDialog: Rephrase "Hacked Buffer Upload" and its description to something less technical.
2013-08-16 14:26:50 +00:00
89d324786a
Prevent stopping emulation before fully booting. This can sometimes cause dolphin to crash.
2013-08-16 10:04:08 -04:00
59e060aba2
Missed some VS build options.
2013-08-16 21:42:31 +12:00
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
c6d8d52041
Fix a warning introduced by the recent netplay UI changes
2013-08-15 15:05:20 +02:00
6d67ea2fda
Merge remote-tracking branch 'origin/master' into wiimote-netplay
2013-08-15 09:00:04 -04:00
d6ec6ae97a
Fix polarssl on Windows.
2013-08-16 00:24:10 +12:00
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
fede38985e
Replace OpenSSL with PolarSSL
...
Works on windows, not yet cmake.
2013-08-15 20:47:47 +12:00
998194246c
NetPlay: Disable the "Start" button while the game is running
2013-08-14 18:16:07 -04:00
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
5241deaebe
NetPlay: Allow hosts to stop the game by closing the game window
2013-08-14 18:16:05 -04:00
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
a791733c27
Fix invalid C++ code (returning reference to local) - thanks devm33.
2013-08-13 14:47:32 -04:00
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
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
d0f05291e7
Add wiimote support to netplay.
2013-08-07 08:16:41 -04:00
a3a222bf5b
NetPlay: Remove NetPlay.h / NetPlay.cpp
...
Now the server and client implementations are entirely separate.
2013-08-05 05:05:06 -04:00
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
28e12a4198
Change the OSX CFBundleIndentifier to use the proper domain name
2013-08-03 18:37:57 +02:00
f58edd018c
Remove a couple files which have apperently never been used for anything.
2013-08-02 20:46:07 -04:00
541106d611
Increase number of save state slots to 10.
2013-08-02 20:42:30 -04:00
c1baed086d
Fix hotkeys.
2013-08-02 16:14:34 -04:00
44d17b5da5
Add hotkeys to increase/decrease the frame limit.
2013-07-30 19:25:12 -04:00
a33b1fcdc6
Make hotkeys for togglign IR, AR, efb copies and fog settings configurable.
2013-07-30 05:49:02 -04:00
5d38a9c91e
[Android] Some minor cleanup.
2013-07-27 15:09:33 -05:00
3f03588dec
Tas input works with bongos too.
2013-07-23 20:43:51 -04:00
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
59d6df7046
Adds Support for multiple GameCube Controllers
...
Conflicts:
Source/Core/DolphinWX/Src/Frame.cpp
2013-07-23 20:22:08 -04:00
8a4b6f3d73
Forgot this from the last commit.
2013-07-23 19:55:17 -04:00
9fdc7360cd
Fix L and R triggers with tas input.
...
Partially copied from revision 1be844406c
2013-07-23 19:44:43 -04:00
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
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
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
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
LPFaint99