ae607ea1e9
Fix missing md5thread.detach()
2013-09-18 21:48:23 -04:00
452fd84bbd
[ANDROID] Fix ARM JIT. Is due to Android using softfp instead of hardfp.
2013-09-18 17:21:22 -05:00
6fc2117503
[ARM] Enable VMOV to move from double VFP reg to two ARM registers.
2013-09-18 17:21:22 -05:00
af951f467e
[InputCommon] Fix a bug in ControllerInterface::UpdateOutput() in ControllerInterface.cpp. The variable ok_count was never incremented, which caused the function to always return false.
2013-09-18 10:09:32 -04:00
d03fb11188
Fix an incorrect opcode for an SSE instruction in x64Emitter.cpp. CVTSD2SI should write 0x2D, not 0xF2.
...
Also format the NormalSSEOps enum.
2013-09-18 07:43:31 -04:00
86f6e8cc1e
Better fix for issue 6614: ISOProperties should store integer settings for PHack booleans. INIFile is stupid, please kill it with fire.
2013-09-18 12:33:57 +02:00
7aa98a3830
Fix loading of the 'projection hack enabled' gameini setting
...
Fixes issue 6614.
2013-09-18 12:23:46 +02:00
28f2bd310d
ogl: don't PanicAlert on shader compiler warnings
2013-09-18 11:47:44 +02:00
24a44ecfb8
[ANDROID] Add two new DriverDetails bugs for Adreno. V45 of the driver has broken shader compilation with UBOs in the shaders, this is most likely fixed with V53 found in the Nexus 5. Add a bug for issue surrounding on screentext and doing a glClear after swap causes screen swizzling and zero frames rendered respectively. On the Java side, pass in the dimensions of the screen swapped since there is an issue with Adreno where it rotates the output 90 degrees for some reason. Disable the GLSL shader cache on Android for now due to the inability to cleanly exit the emulator, this tends to cause the cache to get corrupted. All this together fixes rendering with Adreno 3xx GPUs with driver version v14 and above. In particular my Galaxy S4 still resets with this without the root commands, but my HTC Droid DNA and LG G2 is fine. This must be due to particular 'enhancements' that the Samsung kernel has over the other ones. The speed on Adreno has yet to be optimized, so it will most likely be slow still. Faster than the software rasterizer in any case. The ARMJIT is still broken in at this point, so not much fun can be had.
2013-09-18 02:37:10 -05:00
db7f8697ba
[Android] Use a simpler "startActivity()" call in DolphinEmulator.java. Turns out the other one isn't 4.0 compatible, but actually only 4.1 and up. Also, in this case, we really don't actually care about the saved instance state bundle.
2013-09-18 01:57:01 -04:00
197b317357
Fix indentation in function PSO_MakeSaveGameValid() in GCMemcard.cpp.
...
Also move the iterator variable for a for loop into the loop statement in function CARD_GetSerialNo()
2013-09-17 21:27:37 -04:00
6cc30f3b23
Revert "ogl: change the default buffer upload on osx+nvidia"
...
This reverts commit 3b0b5155e8
2013-09-18 02:23:47 +02:00
39a8645ffc
[ARM] Fix the FPR cache to not have to dump registers after every instruction. Add mullwox instruction.
2013-09-17 22:08:23 +00:00
06062d5744
[ARM] Fix VSQRT/VCMP/VCMPE/VCMPE0/VCMP0 emitters when using the high 16 double registers.
2013-09-17 22:08:23 +00:00
ec9c395f4f
Add WBFS to the file extensions supported by Dolphin on OSX
2013-09-17 16:50:44 +02:00
e34d8aee1d
Add * to the characters leading a verbatim line (used in Gecko codes comments)
2013-09-17 16:50:44 +02:00
47ce3dd09d
Really fix reading projection hacks from game inis.
2013-09-17 10:44:47 -04:00
e3d01de01d
Fix reading projection hack from game inis in ISOProperties.
2013-09-17 10:40:12 -04:00
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
302e9c891b
[ARM] crand/crandc/creqv/crnand/crnor/cror/crorc/crxor/mcrf/mfcr/mtcrf/mtsr/mcrxr/mfsr implementations.
2013-09-17 11:00:16 +00:00
dcf74ef2b3
[ARM] Renables load instructions with update.
2013-09-17 11:00:15 +00:00
988544389a
[Android] Slightly change the layout of the AboutFragment. Looks more like an actual list view now.
2013-09-16 22:04:59 -04:00
b4883e2ada
[Android] Make the AboutFragment extend the ListFragment, since this is basically what this fragment acts as. Much more descriptive than simply extending Fragment.
...
Also made the list non-clickable, since it isn't supposed to be interacted with.
2013-09-16 21:04:58 -04:00
38c7d38800
Fix two wrong opcodes in the x64Emitter. PEXTRW and PINSRW were actually writing PCMPGTB opcodes. Thanks for the help Sintendo.
2013-09-16 15:59:31 -04:00
1529bb48c8
[ARM] Flush the fpr cache between every instruction. Do this until I figure out what is destroying the FPR register states.
2013-09-16 15:44:41 +00:00
7397867b21
[GLES3] Enable support for primitive restart.
2013-09-16 15:43:57 +00:00
9b9526fba2
[ARM] Add dcbt/dcbtst/dcba noops.
2013-09-16 15:13:37 +00:00
75f2738f5c
VideoCommon: fix ogl lighting bug which happens because of NaN emulation
...
attn is sometimes very big (eg 1e27), so attn*attn doesn't fit into a float.
So the funny part here is: 0.0 * (1e27*1e27) = 0.0 * Inf = NaN
As the shader compiler is allowed to change the order of multiplications,
this issue isn't fixed completely.
2013-09-16 17:10:19 +02:00
98fb4c146e
[ARM] ps_sel implementation.
2013-09-16 14:05:50 +00:00
cba2dd01bc
[ARM] Remove extraneous BKPT from ps_rsqrte.
2013-09-16 13:39:02 +00:00
a0a0c526ae
[ARM] ps_rsqrte implementation.
2013-09-16 12:59:34 +00:00
7d410ec95c
[ARM] VRSQRTE NEON emitter.
2013-09-16 12:58:20 +00:00
5a9cb84ae2
[ARM] ps_nmadd/ps_nmsub implementations.
2013-09-16 12:03:08 +00:00
b7f47bc2e1
[ARM] rlwnmx implementation.
2013-09-16 11:53:22 +00:00
43f2313ef9
[ARM] Implement ps_msub. Minor optimizations.
2013-09-16 11:53:21 +00:00
afdac224cb
Prevent an error message from erroneously displaying when dumping frames in d3d9 or d3d11.
2013-09-16 06:31:47 -04:00
1b5f904438
D3D11: Fix screenshot aspect ratio.
...
Fixes issue 6527.
2013-09-16 12:13:58 +02:00
0bcc20ca5b
[ARM] fcmpo/fcmpu implementations.
2013-09-16 08:57:51 +00:00
c56ecce840
[ARM] fctiwzx implementation. This isn't implemented in JIT64 and it is unstandeable why it isn't.
2013-09-16 07:49:16 +00:00
beb41a8f56
[ARM] Add NEON VORR and fix encoding on NEON VEOR. Remove VMRS_APSR because it is the same as VMRS(PC)
2013-09-16 07:49:16 +00:00
f0fc611f15
Add a hacky check for text file size in ReadFileToString. Fixes issue 6455.
2013-09-16 06:57:44 +02:00
a7e1fb81b1
Merge branch 'wad_gamenames'
2013-09-15 21:38:31 -07:00
037199c326
Look for portable.txt in the exe directory and activate portable mode if it exists
2013-09-16 05:46:07 +02:00
2c350a5e6b
Fix INIFile ignoring the last line of files
2013-09-16 05:28:14 +02:00
449cd3b267
[Android] No need to use startActivityForResult in DolphinEmulator.java any more. Just some leftover stuff from the big refactor.
2013-09-15 22:11:17 -04:00
5a0f0b908e
[Android] Fix the name of the parameters in some unused interface methods.
...
There are some interface methods that are simply stubbed for the time being. It would be better to give the parameters better names despite not being used.
2013-09-15 14:34:30 -04: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
24e9aedc14
Merge branch 'global-user-directory'
...
Please read https://wiki.dolphin-emu.org/index.php?title=Controlling_the_Global_User_Directory
for documentation about this feature.
Thanks to neobrain and RachelB for their work on this change, and thanks to
everyone who helped test it.
2013-09-14 19:24:27 +02:00
4ef5624f1f
Change the name of INI options for memcard paths and NAND path to make migrating User directory from non-global to global easier
2013-09-14 17:46:41 +02: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
e56071f2be
[ARM] slwx/srwx/srawx implementations.
2013-09-14 09:07:34 +00:00
81d7986202
[ARM] Add LSRS emitters, and ASR{S} register emitters. Fixes encoding in LSR emitter.
2013-09-14 09:06:49 +00:00
53498dafeb
[ARM] fmaddsx and fmaddx implementations.
2013-09-14 05:52:09 +00:00
be4277e8a1
[ARM] stmw implementation.
2013-09-14 05:16:18 +00:00
c211d06ad2
[ARM] stfd and stfdu implementations.
2013-09-14 05:09:46 +00:00
6fe86f1fd1
[ARM] cntlzwx implementation.
2013-09-14 04:29:37 +00:00
ef2ea31eac
[ARM] ps_madds0 and ps_madds1 implementations.
2013-09-14 04:12:57 +00:00
cf4c39d2be
IniFile: Support extending the list of loaded keys and sections with data from other ini files.
...
Changes a lot of parsing code which previously was not aware of the notion of
key/value, and operated only with raw lines. Now key/value is the default and
lines are handled as raw only if they do not contain =, or they start with $ or
+ (for Gecko/AR compatibility).
2013-09-14 06:08:31 +02:00
d1e96c7282
Display warning OSD messages when a game ini is overriding any settings.
2013-09-14 06:08:31 +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
4512813cf9
[ARM] lfdu and stfsu implementations.
2013-09-14 04:00:40 +00:00
0ae8fa964d
[ARM] lfsu implementation.
2013-09-14 03:51:32 +00:00
aaf8e92f78
[ARM] Fixes srawix implementation.
2013-09-14 03:00:33 +00:00
751fae4965
[Android] Make sure the default config file has fastmem disabled.
2013-09-13 21:17:40 -05:00
f830b85d10
NetPlayServer: Drop all the pads for a client when she disconnects
...
This makes intuitive sense, and prevents issues with users stealing
up all the pads and requiring admin intervention to participate.
2013-09-13 21:33:11 -04:00
0040e66282
Merge branch 'geckoos-fix'
...
Fixes issue 6551.
2013-09-13 18:18:51 -04:00
e15e30602c
Fix HLE_HOOK_START in the interpreter.
2013-09-13 18:18:20 -04:00
e62bc44f15
Use d01f1bad for the gameid check in RunCodeHandler rather than the actual ID.
...
This avoids conflict with the icache hack. codehandleronly.s does not
actually use the gameid, so it shouldn't matter.
2013-09-13 18:14:56 -04:00
e6cd3b3283
Fix placement of HLE::Patch to not get overwritten by HLE::PatchFunctions.
...
(This applies to the existing HBReload hook, which would be erased in
various circumstances depending on the type of file loaded.)
2013-09-13 15:31:51 -04:00
a316e2f182
Hook the Gecko codehandler to invalidate the icache.
...
The codehandler is broken and does not do this itself. This is a hack,
but a lot simpler than the alternatives.
2013-09-13 15:31:51 -04:00
354b205dec
Return correct value to fix libogc's IOS launch sequence.
2013-09-13 15:31:50 -04:00
1f8237c570
Fake ticket views for missing IOS title.
2013-09-13 15:31:50 -04:00
868ab1918b
Reset es_inuse upon Reset.
2013-09-13 15:31:50 -04:00
39a524f47d
Returning false from an IPC_HLE method should not produce an INFO_LOG.
...
It's commonly used to delay replying to a message and is in no way an
error.
2013-09-13 15:31:50 -04:00
7a15159c34
[Android] Explicitly set the defaults for the CPU settings.
2013-09-13 00:29:59 -04:00
0490d7d59c
[Android] JP strings for the Fastmem option.
2013-09-13 00:24:06 -04:00
ba05db7828
[Android] Add a fastmem option to the cpu options, default disabled.
2013-09-12 23:08:00 -05:00
1680f27739
[ARM] Disable loadstorepaired instructions when fastmem is disabled.
2013-09-12 23:07:19 -05:00
ef1d33647f
Improve the ArraySize function a bit now that c++11 isn't forbidden there. Error messages should be friendlier now.
2013-09-12 12:57:13 -05: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
c1ddeacc9d
[ARM] Removes extraneous fpr.Flush
2013-09-12 10:31:29 +00:00
aa8f0c2ca4
[ARM] Fixes ps_madd implementation.
2013-09-12 10:30:52 +00:00
8882d27689
[ARM] Fixes the ps_merge00 and ps_merge10 implementations. They both had the potential to overwrite the source registers in the moves.
2013-09-12 10:17:27 +00:00
749b62fcd9
[ARM] Fixes orcx implementation.
2013-09-12 09:55:55 +00:00
e1d510c2dc
[ARM] Disables loadstores with update because they are broken.
2013-09-12 09:40:10 +00:00
2c33bab1a6
[ARM] lfsx implementation.
2013-09-12 07:52:19 +00:00
fa5499e046
[ARM] Disable lmw when fastmem is disabled.
2013-09-12 02:51:38 -05:00
acbdcc8ea0
Use the POLARSSL_LIBRARY variable to set the link library. This fixes a
...
possible linkage issue when multiple versions of the library are around.
2013-09-11 22:09:49 -05:00
b9c1af04ad
Replace the one use of CompileTimeAssert with static_assert (already used elsewhere).
2013-09-11 20:58:47 -04:00
9ee50a2730
Merge branch '6584'
...
Fix for XP and lifetime issues on Mac. Fixes issue 6584.
2013-09-11 20:47:27 -04:00
fde3815d34
Replace ARRAYSIZE macro with another ugly macro. At least this will throw an error for a non-array and won't conflict with Windows macro names.
2013-09-11 19:19:36 -05:00
ce49964dfe
Fix "modifier" button functionality et al.
2013-09-11 17:48:04 -05:00
3fcdf5e25b
VideoCommon: use memcmp to compare shader uid
2013-09-11 17:34:23 +02:00
3b0b5155e8
ogl: change the default buffer upload on osx+nvidia
2013-09-11 11:02:09 +02:00
2b10142b4f
Remove a bunch of old HLE junk
...
This hasn't been used since 2008
2013-09-10 22:35:52 -04:00
56686666d6
Fix ES_DECRYPT.
...
ES_DECRYPT is usually called with the in IV parameter equal to the out
IV parameter. Dolphin was preemptively zeroing out the out buffer,
causing it to read zeroes for the IV. (Also be more correct when those
parameters *aren't* equal.)
Dolphin now has the dubious honor of having an exploit (smashstack) work
in it. It crashes in Project M, though.
2013-09-10 17:09:37 -04:00
84db868187
[Android] Android uppercases the name of the tabs in the settings by default. So we don't have to call ".toUpperCase" in the string returns in getPageTitle().
2013-09-10 11:21:13 -04:00
8ceb72612a
[Android] Kick the targetSdkVersion in the AndroidManifest XML file to 18. Since this app basically works on 4.x.x, we don't need to make compatibility modes kick in for anything above 4.0.0.
...
Also very minor cleanup to the XML.
2013-09-10 09:29:05 -04:00
ce5f80b151
[Android] Give the exceptions in compareTo implementations in GameListItem and FolderBrowserItem some messages. If the exceptions ever actually get thrown, at least you're given a reason as to why the exception was thrown now. Also changed the exception type to NullPointerException. IllegalArgumentException is intended to be used for validating the parameters in constructors/methods.
2013-09-10 08:32:11 -04: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
4add0f55e0
Fix SDIO HLE writing garbage to memory.
...
When servicing a write-register request, it wrote the contents to the
register offset plus 0x8d070000, which corresponds to the actual
hardware registers, presumably in case the application wanted to read
them directly rather than with a read-register request. WriteToHardware
doesn't handle cached writes to registers, so it decided the address was
RAM, applied RAM_MASK, and happily wrote the register contents to
0x81070000, causing random corruption. Since the PPC does not normally
have access to those registers, there is no reason to be doing this in
the first place. Use a member to store these values instead.
(Also add a proper DoState.)
2013-09-09 23:57:51 -04:00
a3ef35a1bf
[Android] Fix a bug where the video backend would not load correctly.
2013-09-09 22:38:09 -04:00
cd7f787627
ogl: also restore logic op for util shaders
2013-09-09 23:21:56 +02: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
0d341e9f28
[NetPlay] Fix copy and paste error.
2013-09-09 03:12:42 -04:00
772046647a
Revert "Revert "NetPlay: Use the correct pad mappings for rumble""
...
This reverts commit 06140e8083
2013-09-09 03:09:45 -04:00
06140e8083
Revert "NetPlay: Use the correct pad mappings for rumble"
...
This reverts commit 92c846de45
2013-09-09 02:39:28 -04:00
3ec9f9b64a
videoCommon: also reset logicOp on mode switch
2013-09-09 02:30:44 +02:00
fe0a450ee4
Don't request authentication (aka I should actually test before committing).
2013-09-08 19:32:14 -04:00
22d9331b96
Improve IOdarwin -
...
Add requestAuthentication, which might help someone who can't sync, and
better error reporting.
2013-09-08 18:15:49 -04:00
4146e1f3d6
[ARM] Implement psq_st. Optimizations in psq_l and fix all the remaining bugs...except clamping within the max value range of the value. Causes some minor visual effects mostly.
2013-09-08 21:56:17 +00:00
c1aa80cefa
[ARM] Add support for double registers in VMOV(immediate). Add VEOR and VSTR1. Fix some minor encoding bugs.
2013-09-08 21:56:17 +00:00
f382a53500
[Android] Organize the list of allowed file extensions for the folder browser and game list alphabetically.
...
Keeps things nice and sorted.
2013-09-08 17:52:26 -04:00
c306dafe44
[Android] Simplify some checks within the the folder browser in regards to checking if a file is hidden or not. Also potentially fixed the case where items in the game list would not remain saved to the config.
2013-09-08 16:45:37 -04: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
92c846de45
NetPlay: Use the correct pad mappings for rumble
...
Rename the functions around so we don't get confused again, too.
2013-09-08 13:54:05 -04:00
ba0c52b104
[ARM] Optimization to psq_l, no need to push/pop regs anymore. Implement support for single float loading, gives a decent speedup to Ikaruga in menus and game.
2013-09-08 08:18:34 +00:00
e5b5713d70
[ARM] Optimize that fastmem load/stores minimally.
2013-09-08 07:37:03 +00:00
2126f405e0
[ARM] 1 instruction optimization for psq_l
2013-09-08 07:25:59 +00:00
e6af4970d8
[ARM] Use NEON for loading the values from psq_l, gives a minimal performance increase. This change also begins a new NEONXEmitter for having cleaner support for NEON.
2013-09-08 07:07:15 +00:00
f753b9ae97
[Android] Show the full text for save and load states if there's room on the screen. If not, let it overflow into a context menu.
2013-09-07 19:19:28 -04:00
cc054b9da3
[Android] Make the MotionAlertDialog private. This isn't needed to be protected anymore. The only reason it was protected was for when the input settings were coupled as all hell to the GameListActivity (lol). Also documented the interface method within it.
2013-09-07 18:51:15 -04:00
913853d441
Move the creation of the GLInterface (and hence the video backend
...
window) from VideoPrepare to Initialize in the software plugin (as in
the GL plugin). This fixes issue 6564. It also makes the emulator show
up positioned correctly in the dolphin application window when using
render to main.
2013-09-07 15:57:32 -05:00
8b4f0ef034
IODummy needs it too.
2013-09-07 16:17:00 -04:00
b31502893f
Fix lifetime issues in IOWakeup.
2013-09-07 16:13:39 -04:00
f4586570ac
Use SetEvent instead of CancelIoEx for XP compatibility.
2013-09-07 15:43:17 -04:00
31b69c53f7
[ARM] Implement psq_l for 2x float loads. Couldn't find a game using quantized loads. Huge speed boost to Ikaruga and THP movies with this one.
2013-09-07 17:44:10 +00:00
614a7c2081
[ARM] Clean up some host side register allocations I missed.
2013-09-07 17:44:10 +00:00
cf09974d61
Merge branch 'translate-about'
2013-09-07 09:56:54 -05:00
86d10ec19e
[Android] Fix the input binding string.
...
Forgot a period at the end. Thanks for pointing that out pauldachz
2013-09-07 06:19:24 -04: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
d25a8bb6cb
Fix reply after shutdown error.
...
Fixes Issue 6577
2013-09-07 13:07:00 +12:00
67c65831bc
[ARM] Make fnabsx and ps_nabs quicker. Sleep deprivation got the better of me.
2013-09-07 00:35:12 +00:00
ef05a14757
[ARM] Clean up FPR cache. Rapid fire floating point instruction implementations. Adds 13 new instructions.
2013-09-07 00:19:32 +00:00
cd7b97f767
Make JITDISABLE not defeat grep.
2013-09-05 18:38:47 -04:00
3baab41cf4
Allow input display to work with netplay even when not recording.
2013-09-05 16:09:56 -04:00
b2657f6a9b
Re-added the HLE code that creates the cdb.vff file on first launch of the Wii sysmenu.
...
Revert "Remove HLE_IPC_CreateVirtualFATFilesystem as it no longer takes 3 minutes to LLE like the comment says."
This reverts commit 5d47fd1dde
2013-09-05 21:29:04 +10:00
2fb0147967
Merge branch 'comex-wiimote-fixes'
...
Should fix issue 6574.
2013-09-05 06:13:33 -04: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
7acee71c0c
Move swapModeTable to a local variable, avoids shader uid generation writing to it
2013-09-04 23:23:29 +02:00
175707739e
Move LightingUidData to the LightingShaderGen header
2013-09-04 23:23:29 +02:00
30da36dd1e
Fix an incorrect sizeof in a memset in GDBStub.cpp
2013-09-04 09:01:44 -04:00
10eb9f09b4
[Android] Change a check for an empty path from !path.equals("") to !path.isEmpty() in GameListItem.
...
Also simplify the logging exception tag in the constructor.
2013-09-04 08:02:32 -04:00
b94a462fca
[Android] Remove the compareTo implementation from SideMenuItem. We don't perform any operations that require it.
2013-09-04 07:43:56 -04:00
38304a7e42
[Android] Simplify the JP settings labels.
2013-09-04 07:36:28 -04:00
48cda9d26f
[Android] Display the name of the control that is being bound in the input settings. Makes the binding description more informative.
2013-09-04 07:32:28 -04:00
a83d4e7226
[Android] Correct a typo for the load state menu root in the menu overlay XML. Should be "loadStateRoot", not "loadtateRoot"
2013-09-04 07:19:02 -04:00
a7c2b27a6a
[Android] Remove unused strings from the resource XML files.
2013-09-04 07:09:29 -04:00
bdc04f9119
[Android] Change the exception logging in NativeLibrary to be an error instead of a warning.
...
Technically not having the required library should be regarded as an error, since the app won't even load without it.
Also changed the logging tag in FolderBrowser.
2013-09-04 06:46:11 -04:00
8992f58720
Fix Wiimote thread wakeup on externally-triggered destroy.
2013-09-04 05:32:32 -04:00
dc87b6d431
Fix OS X code.
...
- Close the connection properly on destruction.
- Work around what seems like an Apple bug.
2013-09-04 05:32:13 -04:00
872e9ce3da
Add accidentally omitted code in last commit.
...
(m_wiimote_thread_run_loop was being used but not set, causing
Wiimote::IOWakeup to crash on OS X; todo rebase this)
2013-09-04 04:39:18 -04: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
02fc68ea5d
While we're at it, explicitly wake up the Wiimote thread rather than using a 1s timeout.
...
This only matters if reads are not constantly being completed by
reports anyway, but seems like a good idea.
2013-09-04 03:25:05 -04:00
906de748bd
Refactor thread handling to fix OS X bug.
...
On OS X, openL2CAPChannelSync registers events on the current
thread's run loop, so Connect needs to be called on a thread that's
going to do CFRunLoopRun; this was causing all Wiimote input to be
ignored. Easiest way to do that is to use the Wiimote thread, and
have Read call CFRunLoopRun to block on events, bringing OS X's
Wiimote event loop in line with every other platform's. This also
means that the thread can't be stopped and recreated by Prepare,
so make Prepare notify it instead, which has the side effect of not
making the GUI block on Prepare. (It would be nice if the GUI also
did not block on searching for devices, because blocking the GUI
is gross, but for now...)
2013-09-04 03:24:00 -04:00
d0d053a9f9
Fix for old libc version on bionic. Old versions would crash if the second argument was NULL.
2013-09-04 02:04:31 -05:00
0e949afa57
Remove dubious retain on OS X.
...
Revert this if the claimed crash actually shows up - or better, figure
out the actual cause.
2013-09-04 01:11:04 -04:00
e0214b1a38
Fix syncing wiimotes on OS X.
...
IOdarwin.mm was assuming that scanning was complete when the run loop
was stopped (which the scan callback does), but somebody else was
stopping the run loop first, causing the scan to be aborted. Wait until
the scan is actually complete.
2013-09-04 01:04:51 -04:00
1ea8b93667
Fix typo in log message in WII_IOB.cpp.
2013-09-04 00:03:05 -04:00
7e26aace9f
[ARM] Reenable ps_add. Issue is due to something in the FPR cache. Still needs to be investigated.
2013-09-04 03:27:45 +00:00
8684b7635a
[ARM] Reimplement fastmem for the few loadstores that had it before.
2013-09-04 02:07:57 +00: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
70cfe96492
[Android] Fix an accidental call to the wrong method in the superclass of EmulationActivity. Should have been returning "super.onMenuItemSelected(itemId, item)" instead of "super.onOptionsItemSelected(item)".
2013-09-03 17:25:45 -04:00
8ae10b3e12
[NetPlay] Allow recording movies during netplay.
...
Fixes issue 6207.
2013-09-03 15:50:41 -04:00
7e1959a200
ogl: remove obsolete code
2013-09-03 18:51:30 +02:00
0255e13912
ogl: disable revision 737df2a68c for desktop ogl
...
texelFetch doesn't filter linear, so every copy with filters didn't work correctly. This is still the case for gles, but this will be fixed after the 4.0 release.
Fixes issue 6465.
2013-09-03 17:36:55 +02:00
4f72671d32
[Android] Change the documentation of the FolderBrowser class. We don't show invalid items anymore.
2013-09-03 07:05:02 -04:00
39ad48dfa5
[ARM] lmw implementation.
2013-09-03 09:55:15 +00:00
30cd436e86
[ARM] Merge load instructions in to one. Also rapid prototype 13 more load instructions. This disables fastmem currently for loads.
2013-09-03 09:22:43 +00:00
d4d6eb562e
[ARM] Fix and enable fastmem for 32bit stores.
2013-09-03 05:05:10 +00:00
cc2fa4a003
[ARM] Merge all store instructions in to one. This disables fastmem on stores currently. Hit isn't noticeable since I've also implemented 5 more store instructions with this.
2013-09-03 04:11:25 +00:00
dfce0f3b0b
[ARM] Merge all store instructions in to one. This disables fastmem on stores currently. Hit isn't noticeable since I've also implemented 5 more store instructions with this.
2013-09-03 04:08:15 +00: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
5b9254a1cd
fix android.
2013-09-02 17:30:31 -04:00
50520c7c3d
Make fastmem work under a debugger on OS X.
...
Not only do debuggers catch the expected SIGSEGV by default, I'm not
sure there's a working way to configure either gdb or lldb not to. This
commit uses an OS X-specific mechanism to add an exception handler that
runs before the default one.
2013-09-02 17:26:32 -04:00
4c3230bcde
Remove accessType from BackPatch's signature in favor of getting it from DisassembleMov.
...
It isn't easily accessible with sigaction or Mach exceptions (well,
requires an additional system call in the latter), and isn't necessary.
(and get rid of the enum, because it's only used once, and the comments
are more expressive than enum names)
2013-09-02 16:55:22 -04:00
e198e201e4
[Android] Fix the video settings from crashing the app. Was broke in the commit "Removal of my terrible idea"
...
https://code.google.com/p/dolphin-emu/source/detail?r=2897619ddbd3e3aae8427fc503647c65e770d466
Didn't comment out the line for that preference in the XML. This is disabled for now until the UI overlay for the buttons are implemented directly into the Java front-end.
2013-09-02 11:00:22 -04:00
a7f3264fed
[ARM] Merge a bunch of arithmetic JIT instructions and rapid prototyping of a bunch more.
2013-09-02 14:15:37 +00:00
1b1cc82e5b
rename vertex streaming hack tooltip
...
String is copyed from issue 6552.
2013-09-02 13:33:36 +02:00
beb57d7fbd
ogl: reorder driver extensions checks
2013-09-02 13:14:45 +02:00
2897619ddb
Removal of my terrible idea.
2013-09-02 05:31:48 -05:00
e7157e7c52
[Android] Fix fastmem and enable.
2013-09-02 04:10:21 -05:00
679957dc98
Fix Non-GLES run path in videosoftware for the previous commit.
2013-09-02 01:44:46 -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
0219049c03
Fix an accidental duplicate if-statement handling of 0x1007 in WII_IPC_HLE_Device_net.cpp
2013-09-02 01:28:48 -04: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
4f5729dd59
MSVC warnings.
2013-09-01 22:59:32 -04:00
de0a5fdfbb
More trivial warning fixes.
2013-09-01 22:59:18 -04:00
c08f06f8c9
Fix IOCTLV_SO_GETADDRINFO.
...
It tried to cast incoming pointers to native ones. The values are
required to be null anyway, so it doesn't really matter, but it fixes a
warning at least.
2013-09-01 22:58:40 -04:00
186527544b
Fix use of deprecated APIs in IOdarwin.mm.
2013-09-01 22:58:38 -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
d41eb76378
[Android] Fix the last commit. On-screen control drawing wouldn't re-enable upon flipping video backends.
2013-09-01 20:36:47 -04:00
acf3bd8697
[Android] On-screen controls work for Software Renderer, but not the OpenGL ES 3 video backend yet. Enabled it for Software Rendering and disabled it for Open GL ES 3.
2013-09-01 20:31:45 -04:00
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
d84312c799
Merge branch 'master' of https://code.google.com/p/dolphin-emu into android-core-control
2013-09-01 15:24:29 -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
fae0c860f6
[Android] Woops forgot a JP TL of a UI string.
2013-08-29 22:56:40 -04:00
cf96bfc2be
[Android] Add a button in the emulation view that allows a person to exit emulation and go back to the game list.
...
However, this does not work correctly yet. It will stop correctly. But the SurfaceView will not render the next game selected.
2013-08-29 22:52:09 -04: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
comex