71fde876df
A fix to my fix to my fix. Sorry.
...
(Avoid uninitialized m_pFile when loading WADs.)
2013-09-01 17:15:16 -04:00
c092c65d4a
[Android] Disable most video preferences if Software Rendering is chosen. Since the software renderer and other renderers have little in common, it doesn't make sense to keep many of the video preferences enabled.
2013-09-01 15:20:15 -04:00
440ae412b0
[Android] Add the option to show the on-screen FPS counter.
2013-09-01 03:07:16 -04:00
b03ff7a86b
[Android] Fix the game thread never leaving.
2013-09-01 01:10:40 -05:00
a6f6695ecd
Work around MSVC bug, and make it less likely to happen again. Ew.
...
MSVC insisted on using a copy assignment where a move was intended and
ought to be used. This would have been caught, because the class in
question inherits from NonCopyable, which declares a move assignment
operator, which is supposed to delete the implicitly declared copy
assignment operator, but of course MSVC didn't do that either, causing a
class that should have been safe to be unsafe.
2013-09-01 00:04:50 -04:00
5209abeb03
Better error reporting for ES / NANDContentLoader.
2013-08-31 23:49:29 -04:00
3e049a130b
NetPlay: bump proto
...
As it changed with the pad mapping change.
2013-08-31 23:29:12 -04:00
ffe710b4e8
Recvfrom tidy and store laste error.
2013-09-01 15:15:55 +12:00
1c106abf13
Fix sendto.
...
This fixes Opera, sorry [SS]
2013-09-01 14:30:07 +12:00
b11f14c6f7
Fix setsockopt.
2013-09-01 14:03:03 +12: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
b187a38433
Fix inability to boot NAND contents caused by 04c41c1d38.
...
Might be nice to refactor this code to decrease duplication, but for now
just a fix.
2013-08-31 15:06:00 -04:00
751c2e69f6
Add a link to our documentations guides in Dolphin
2013-08-31 10:31:43 +02:00
676d78ec41
Fixes accept.
...
Tested with network demo from devKitPPC :)
2013-08-31 18:47:19 +12:00
11cffddbf7
Fix a trivial bug in b6728c1405.
2013-08-31 01:54:57 -04:00
04c41c1d38
Fix loading DLC using IOCTL_ES_OPENTITLECONTENT & /dev/es state save.
...
(Intertwined enough that's it's easier to do in one patch.)
(1) /dev/es did not support state save, which could cause crashes and
incorrect behavior after loading.
(2) NANDContentLoader tried to read all of a title's contents into
memory when it was first opened. Two issues:
- If any contents were missing, it bailed out. However, with DLC,
only some of the contents may be downloaded, as determined by the
permission bits in the ticket. Instead, return an appropriate error
when a content is accessed that doesn't exist on the filesystem
(don't bother checking the permission bits though).
- Everything was loaded into memory - even if it consisted of 3 GB of
songs, which caused Dolphin to lag out for quite a while (and would
fail on 32-bit). Instead, open content on demand.
2013-08-31 01:38:52 -04:00
4d6d4a97e4
Make NonCopyable use rvalue references.
...
This is required to be able to move objects that inherit from it.
(Note that this patch also #ifs out the class for the externals that
include it yet are compiled in pre-C++11 mode. It shouldn't matter,
since those externals don't use it.)
2013-08-31 01:38:49 -04:00
c497d62836
Fix sysmenu test connection bug on Windows.
2013-08-31 16:44:53 +12: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
df7b4da13b
[ARM] Fastmem is back. Still disabled for Android.
2013-08-31 02:33:12 +00:00
8b0a0daf10
Revert "[ARM] Remove Fastmem. It is buggy and may never have the potential to work correctly."
...
This reverts commit f485d96b0b
2013-08-31 02:33:11 +00: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
51c814f34e
[Android] Removed the unnecessary MainActivity generics declaration in the DolphinEmulator class. It's unused (and likely won't be used).
2013-08-30 15:47:04 -04:00
c633c2bb13
[Android] Some various cleanups. Also make some class variables final.
...
Localize some variables as well, and clean up an import.
2013-08-30 15:31:25 -04:00
6428137ca4
Set XAudio2 as the default audio backend
2013-08-30 19:12:46 +02:00
710ac04084
[ARM] Fix the VMOV encoding to encode the destination VFP register correctly.
2013-08-30 05:13:43 -05:00
2c1337eb5f
[ARM] Support both hardfp and softfp with lfs and lfd. Fixes these two instructions on Android since it uses softfp calling conventions. This adds a emitter for moving from two ARM Registers to a double VFP reg.
2013-08-30 09:38:11 +00: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
7cceace1ed
[ARM] Fix Savestates.
2013-08-30 06:43:18 +00:00
8bb16d8e98
[Android] Android NDK now supports full implementations of std::mutex, std::thread, and std::conditional_variable so there is no need to have our own implementations there now.
2013-08-29 22:29:33 -05:00
0df64775ea
Merge branch 'master' of https://code.google.com/p/dolphin-emu into android-savestate-support
2013-08-29 21:57:53 -04:00
10c18e75de
[ARM] Fix lfs/lfd. We need to dump the fpr cache at times where VFP registers may be affected. We shouldn't need to flush D8-D15 but it doesn't seem to work. So we have to flush all registers.
2013-08-30 01:11:32 +00:00
90918cdb84
[Android] Remove garbage loggers for when I was debugging why the overlay buttons wouldn't work.
2013-08-29 21:09:38 -04:00
dac9659c58
[Android] Preliminary save-state support. Have the UI set up. Crashes with SIGABRT however.
2013-08-29 21:07:17 -04:00
b5d5296250
[Android] Accidentally enabled screen rotation in the emulator window. Disabled it.
2013-08-29 19:09:56 -04: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
1dcede4d56
[Android] Stop the play store from overwriting buildbot builds.
2013-08-29 22:28:23 +00:00
5a749cc7ca
[Android] The back button now toggles the visibility of the action bar in the emulation window. This can be used in the future to implement the overlay for save states and other things.
2013-08-29 18:26:45 -04:00
aeec249626
[Android] Decouple the emulation processes from the Main activity. Moved them into their own activity called EmulationActivity.
2013-08-29 17:21:17 -04:00
2de2e774fe
Use pthread_setname_np.
...
This makes SetCurrentThreadName actually work (name shows up in
debugger) on non-Windows.
2013-08-29 16:30:32 -04:00
e685d198bd
ogl: only free use fences
...
This fixes some opengl error when not all fences are created.
2013-08-29 21:03:48 +02:00
335839b27f
[Android] Move the instantiation of the NativeGLSurfaceView into a layout file. This will allow the addition of other components in the future, such as overlays, etc.
2013-08-29 13:13:44 -04:00
01764fef67
[Android] Forgot to make the AboutFragmentAdapter class 'final'
2013-08-29 12:45:40 -04:00
8fd2c32ba6
[Android] Decouple the About fragment from the FolderBrowserAdapter. Now it uses its own independent adapter (I have no idea why this wasn't done in the first place).
2013-08-29 12:40:35 -04:00
93ed4adb02
[Android] Use the same layout for the game list and the folder browser. Since the UI layouts are exactly the same.
2013-08-29 12:16:29 -04:00
64b83a18b2
[Android] Simplify the line divider for the folder browser and game list. Turns out someone disabled it in the list view initially. No more custom implementation now.
2013-08-29 12:06:31 -04:00
8ae076e665
Merge branch 'iconv_static'
2013-08-29 05:54:02 -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
c9afd83439
ogl: fix vertex stream detection
...
sorry, copy & paste fail
2013-08-29 12:01:34 +02: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
c5a886100c
[Android] Some minor formatting styling.
...
Remove unnecessary this statements.
2013-08-28 20:31:37 -04:00
ea671d639c
[Android] Simplify the onItemClick listener for the GameListAdapter in GameListFragment. There is no need to evaluate whether or not an item is a folder, since folders cannot be added in the first place. Probably some leftover code I forgot to remove.
2013-08-28 18:23:32 -04:00
d4840565a9
[Android] Fix the position of a logcat logging statement. If, for whatever reason, the event parameter is null, then the previous placement would have caused an exception.
2013-08-28 08:21:09 -04:00
8ca3ed13de
[Android] Clean up AboutFragment's onAttach method.
2013-08-28 08:15:00 -04:00
e7bdcc34e1
Fix some enum alignments
2013-08-28 01:12:24 +12:00
b34a5faee7
More cleaning.
2013-08-28 01:07:43 +12:00
2a68b65cda
Merge branch 'master' into wii-network
2013-08-28 00:57:37 +12:00
75c398118f
Fix headings and more.
2013-08-28 00:57:08 +12:00
d493525050
Add socket cleanup.
...
Don't know what to do with remaining sockops if called from a SetRegister reset command.
2013-08-28 00:37:45 +12:00
6748d5d087
Fix const.
2013-08-28 00:05:43 +12:00
eebcea9174
Fixed accept.
...
Added helper functions.
Removed unused structs.
2013-08-27 23:58:26 +12:00
4644a3bd16
Fix for Just Dance 4
...
Some clean ups.
2013-08-27 23:58:26 +12:00
40a1cb5dfe
ogl: warn on osd if not supported features are enabled
2013-08-27 13:24:23 +02:00
4a863c88b4
[Android] Simplify onAttach for CPUSettingsFragment and VideoSettingsFragment
2013-08-27 04:06:18 -04:00
76f20cca59
[Android] Remove the documentation of a parameter in GameListItem that was removed a while ago.
2013-08-27 04:01:20 -04:00
93f9f23576
ogl: reset api state for blitting
...
glBlitFramebuffer depends on scissior test and color mask. It isn't documented well,
but it does. So we have to reset the apistate before using it.
In this way, there isn't any benefit of glBlitFramebuffer, glDrawArray would be better :-(
2013-08-26 22:18:00 +02:00
15df7b3445
ogl driverdetails: add flag to disable hacked and pinned memory
...
pinned memory is broken for index buffers
hacked buffer crashes the amd driver
2013-08-26 19:45:19 +02:00
d83dffe442
[Android] Add wad file support.
2013-08-26 12:19:47 -05:00
670b028492
[Android] Remove the explicit key event listener from InputConfigFragment. The AlertDialog class has a key listener built into it.
...
Also documented the methods/interfaces in MotionAlertDialog.
2013-08-26 13:19:06 -04:00
e12c66b6cf
[Android] Only dismiss the input dialog when an input is registered. Before it would dismiss upon the first event. Fixes a bug where control sticks wouldn't register because of the AlertDialog closing immediately after the "if (firstEvent)" branch.
2013-08-26 12:56:35 -04:00
ba274368f8
[Android] Make the dialog variable in InputConfigFragment a local variable in onPreferenceTreeClick. With the new input UI, this doesn't need to be accessible to other classes.
...
Also change the documentation of the custom dialog class.
2013-08-26 11:58:51 -04:00
e051935659
Merge branch 'android-new-input-ui'
2013-08-26 09:15:50 -04:00
8006c878f8
Maybe libusb_exit fails when not initialized.
2013-08-27 00:58:20 +12:00
08153387c5
[Android] Greatly simplify the input handling for the button mapping settings. Now input handling is directly in the fragment.
2013-08-26 08:57:52 -04:00
aa7319e043
Slightly better error handling for libusb_init not working.
2013-08-27 00:46:04 +12:00
33761c0b65
More cleaning.
2013-08-27 00:22:44 +12:00
07ea771012
[Android] Finish documenting the native functions in NativeLibrary.java.
2013-08-26 08:06:28 -04:00
69bb04f79f
Fixed inconsistent usage of sock and used fd instead.
2013-08-26 23:57:18 +12:00
e8cde8464e
Code style fix and cleanup.
2013-08-26 23:24:41 +12:00
5ecd86708b
Disable Wii Sockets for NetPlay and TAS
2013-08-26 23:24:01 +12:00
db355b21d2
[Android] My bad, somehow the Java file in the previous commit got encoded with UTF8+BOM.
2013-08-25 23:57:53 -04:00
9dfb6dfd7f
[Android] Fixed a typo in the event callback system documentation.
2013-08-25 23:49:51 -04:00
786f09b1fa
[Android] Document the event callback system used in the Settings menu in large detail.
2013-08-25 23:47:51 -04: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
0e8f9d8abc
Fix a crash in the Wiimote registration code
...
The code was hitting undefined behavior, causing crashes when starting a Wii
game with Dolphin compiled with gcc >= 4.8.
Might introduce some slight change in the Wiimote activation logic.
Fixes issue 6526.
2013-08-25 21:30:43 +02:00
28008814a7
[Android] Apparently I also forgot to commit the input menu layout.
2013-08-25 03:16:05 -04:00
6c0c460320
[Android] Woops forgot to commit the new resource strings.
2013-08-25 03:13:00 -04:00
709ab1feb5
[Android] Initial implementation of the new input UI.
...
Testing may be further required. But it should work for the most part.
2013-08-25 03:10:32 -04:00
18749bad68
Actually allow the dump and logs folders to be set outside of user/
2013-08-25 01:35:32 -04: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
417bfb2630
Send pad buffer to clients when they join; fixes issue 6524.
2013-08-24 21:43:33 -04:00
72e0423f8b
Fix debug builds. Sorry.
2013-08-25 13:39:30 +12:00
74b61c7553
Dolphin depend on polarssl... :\
2013-08-25 13:27:20 +12:00
0dd98d62fc
Remove 'pragma optimize' in fakepoll.h - if optimizations cause breakage the breakage should be fixed instead of disabling opts
2013-08-25 03:04:43 +02:00
c4dec3fb3a
Remove debug verify cert code.
2013-08-25 13:02:34 +12:00
73be79f4e0
Fix trailing whitespaces in all files where some were added
2013-08-25 02:49:58 +02:00
987f4945b5
Fix indentation issues
2013-08-25 02:41:02 +02:00
1cbc8f8182
sync gpu: check disable flag before volatile
...
This could be an optimizing as this condition could be moved out of the loop.
So we save an atomic load.
But I don't know if it matters at all
2013-08-24 18:43:07 +02:00
2017ab9323
Revert "[Android] First french translation.
"
...
This reverts commit d2481aa477
2013-08-24 09:50:02 -04:00
31ea87d705
Revert "[Android] Added 2nd file for French translation.
"
...
This breaks the Android UI. 'translatable="false"' is there for a reason."
This reverts commit 5d9700a303
2013-08-24 09:43:21 -04:00
5d9700a303
[Android] Added 2nd file for French translation.
...
(Sorry, I didn't find how to upload 2 files at the same time in Google Code)
2013-08-24 13:37:42 +00:00
d2481aa477
[Android] First french translation.
...
Can't try it as I don't have any Android device. Any feedback appreciated.
If misplaced, please fix it.
2013-08-24 13:36:18 +00:00
a90e82d2c0
[Android] Invalidate the options menu upon switching fragments. This hides the 'clear game list' option faster when switching fragment. Also fixes a rare bug where the option might not even redraw when returning to the game list.
2013-08-24 09:19:40 -04:00
528a733359
[Android] Don't create a new GCMPath entry in the Dolphin config if it another existing GCMPath entry already has the same directory path.
...
Also, fix a 'bug' with the clear all items function. Make sure we set GCMPathes to 0, so that GCMPath entries start adding at GCMPath0 again.
This change also allows me to remove the duplicate checking code from GameListFragment, since the items in the game list are loaded based on the GCMEntries in the Dolphin config.
2013-08-24 09:12:17 -04:00
857ce47de2
[Android] Add the license header to Java files that were missing it.
2013-08-24 08:23:23 -04:00
5548e77438
Merge branch 'master' into wii-network
2013-08-24 23:56:31 +12:00
6907a32653
Fix android, part 3 of 3. >:)
2013-08-24 23:49:50 +12:00
d1057b2c6c
Fix android part 2 of X.
2013-08-24 23:41:25 +12:00
66c50ebf19
[Android] Better description for the dual core option.
2013-08-24 07:37:28 -04:00
7de9bda35e
Fixes hid.
...
Fix small bug in ssl when testing certain demos.
2013-08-24 23:16:58 +12:00
dbcc677922
Merge remote-tracking branch 'remotes/origin/dx9-ssaa-fix'
2013-08-23 22:43:03 -03:00
40243a4fe7
Indentation Fix
2013-08-23 22:28:17 -03: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
9deb63a312
Simplify a few OSD::AddMessage calls now that this function accepts std::string objects
2013-08-24 01:44:16 +02:00
367d6dfd65
Add an OSD message when taking screenshots in D3D9/D3D11
...
Fixes issue 6486.
2013-08-24 01:41:17 +02:00
6df36ec687
[Android] Forgot to commit the menu layout XML when I implemented the option to clear the game list.
2013-08-23 16:17:02 -04:00
7f61c31f85
[Android] Fix some redundancy in the category names for the settings menu. In a menu named "Settings" (which is shown in the top left) we have the categories, "CPU Settings" and "Video Settings" - but the fact they are settings pages is already established at this point so it's redundant. Just made them "CPU" and "Video" instead.
...
Also changed the description for dual-core
They now look like this: http://i.imgur.com/qieaKmL.png
2013-08-23 16:10:55 -04:00
c9e13f6b7a
ogl: fix ubo workaround
2013-08-23 17:53:20 +02:00
1469342f83
[Android] Add an option to clear the game list.
2013-08-23 11:17:24 -04:00
c2aef25f4c
[Android] Since we don't show invalid filetypes in the file browser anymore, there's no need to check if a file is valid or not since they're all valid now.
2013-08-23 10:26:15 -04:00
70dab0d839
[Android] Document most of the native functions in NativeLibrary.java.
2013-08-23 10:15:36 -04:00
654b0dbfa8
[Android] Fix the removal of duplicate items from the gamelist.
...
This should have initially been a nested loop since it now guarantees every item in the list is checked.
Also, removed some unused code and documented some things.
2013-08-23 09:50:00 -04: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
7a5374258e
ogl: rework DriverDetails framework + detect UBO mesa bug
2013-08-23 10:52:29 +02:00
d9485cbf23
[Android] Only show valid files in the file browser.
2013-08-23 00:18:01 -04:00
1f3a0ff10b
Merge branch 'OpenAL-sane-defaults'
...
* OpenAL-sane-defaults:
Removed a redundant tooltip text.
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-23 12:15:39 +10:00
98a038aefb
Fix more *nix issues.
2013-08-23 00:58:12 +12: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
41c25d0c90
[Android] General cleanup. Add more documentation.
...
Remove some accidental changes that slipped through. Don't want to have input settings in the settings menu just yet.
2013-08-22 08:18:56 -04:00
f274b3b074
Fix compile on *nix.
2013-08-23 00:13:26 +12:00
6acbea5c3e
Less verbose. Sorry.
2013-08-23 00:10:47 +12:00
124fe24f4c
Make wii-network async.
...
* accept still needs to be made async.
2013-08-22 23:58:56 +12:00
951bbcd6ce
[Android] Change the .settings file to target Java 1.6 instead of 1.5.
2013-08-22 07:39:11 -04:00
779f02d9a5
[Android] Turns out the sidebar XML could also be simplified.
2013-08-22 07:02:30 -04:00
0c5f3953dd
[Android] Simplify the XML layout for the about menu. Remove unused strings.
2013-08-22 06:58:19 -04:00
c2bab4edd4
[Android] Remove fragments from the Android Manifest XML. These shouldn't be defined here (nor do they need to. They're fragments, not activities).
2013-08-22 03:53:39 -04:00
7c99b0650b
[Android] Format all Java files to be consistent.
2013-08-22 03:43:07 -04:00
f09cafb2be
[Android] Make the previous commit parlane approved in terms of boolean conditions.
2013-08-22 02:57:31 -04:00
988c168c2d
[Android] Fix a bug in FolderBrowser.java which was causing an incomplete directory structure to show.
2013-08-22 02:52:05 -04:00
85c78759c7
[Android] Make two class variables in InputConfigFragment private. If left the way they were, they could be accessed by other classes in its package, which is not intended.
2013-08-21 21:27:32 -04:00
97bfa6300d
Remove unused code from InputConfigFragment. This was for when the option to draw onscreen controls was in this menu instead of video preferences.
2013-08-21 21:10:23 -04:00
20e82ec08c
Fix the fix to AVX support detection
...
Should be xgetbv(0) & 6 == 6, not just & 6. Thanks to tueidj for pointing this
out.
2013-08-22 01:08:14 +02:00
ca23318089
[Android] Fixed a bug where the config files might not load correctly upon launch. If the initial files existed, it wouldn't load the configs. This fixes that.
...
If the files don't exist they will be copied (in the previous block) and everything will be fine.
2013-08-21 16:02:43 -04:00
8b291b6b57
[Android] Allow users to be able to choose where they want the APK installed.
2013-08-21 14:35:31 -05:00
1eb1ba8c3d
Typo + Add Lima to the driverdetails.
2013-08-21 05:41:32 -05:00
comex
