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
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
d3894a0594
Clean up wiimote-netplay.
2013-08-22 11:58:29 -04: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
1910f5851f
Make us capable of supporting driver specific issues(OSS versus official)
2013-08-21 05:34:52 -05:00
906cbe5ddf
ogl: enable glsl extension ARB_shader_image_load_store for early-z
2013-08-21 11:48:39 +02:00
60ccb2f44d
[Android] Fix Android 4.3 from crashing on my devices. This was annoying to find.
2013-08-21 00:12:53 -05:00
fbd0fba13a
[Android] Fix preferences from crashing. OSD controls was supposed to be boolean.
2013-08-21 00:06:48 -05:00
272dcb8756
In Windows, if BBA can't connect to any TUNTAP device then throw a panicalert, not just an error log.
2013-08-21 03:22:14 +00:00
53df78d372
[Android] Missed a string for the Japanese translation.
2013-08-20 20:48:43 -04:00
e52c2ac337
[Android] Migrate the "Draw Onscreen Controls" preference to the video settings.
2013-08-20 20:28:48 -04:00
9170c9b360
[Android] Remove unnecessary string messages from CPUSettingsFragment and VideoSettingsFragment.
2013-08-20 19:57:00 -04:00
00996c8d38
[Android] Implement a ViewPager for the settings. Also, move classes into appropriate packages to make things cleaner.
2013-08-20 19:39:00 -04:00
a3a4f21284
Remove some spurious endlines at the end of log messages
2013-08-21 00:19:50 +02:00
0521b6aa69
[Android] Hopefully fix buildbot's ant build.
2013-08-20 15:41:11 -05:00
8de3250550
[Android] Load all of the new settings from the ini when the app is launched.
...
- Also fix a typo in the ini saving method in UserPreferences. Accidentally spelt the ini name wrong.
- Also include the relocated XML preferences. I meant to push this with the previous commit.
2013-08-20 15:35:16 -04:00
3fdfd75832
[Android] Add most of the Dolphin video/gfx settings to the settings menu.
2013-08-20 14:33:30 -04:00
642657d07c
ogl: explain why pinned memory is disabled for index buffer
2013-08-20 19:09:55 +02:00
7b99fad274
ogl: fix the range of glDrawRangeElements
...
This range isn't the amound of rendered vertices (this is count).
It's the minimum/maximum of the indices in the index buffer.
2013-08-20 15:25:02 +02:00
64bd6a44d4
ogl: use texture_2d instead of renderbuffer for realxfb + efb2ram fbo
...
It should do the same on gpu, but textures are more flexible.
eg we could copy and sample them directly without blitting.
2013-08-20 15:11:03 +02:00
9dfb127923
ogl: remove glBindFragDataLocation
...
Without dual source blend, we have only one output per fragment shader,
so this is bound to zero by default.
2013-08-20 14:00:24 +02:00
fa8a4cdbb5
Corrected names of GetXFBAddress* functions in header.
...
They were named incorrectly in VideoInterface.h, but because nobody used
them outside of VideoInterface.cpp where they were decleared until now, this
hasn't been an issue.
2013-08-20 23:25:24 +12:00
dd35156717
[Android] Forgot to document the new parameter used in SaveConfigToDolphinIni() in the last change. Fixed that.
2013-08-19 22:37:04 -04:00
9595457e1c
[Android] Turn SaveConfigToDolphinIni() into a static method. Now saving settings to the ini config just uses one call in PrefsFragment.onDestroy().
2013-08-19 22:34:27 -04:00
6dbfdce775
[Android] Remove the loading toast messages from the UI. These really don't need to be here since the things they were used for took very, very little time to load.
2013-08-19 22:09:43 -04:00
8dc0b38f00
[Android] Decouple Dolphin.ini config file saving from GameListActivity. It doesn't make sense to save the config AFTER control is returned from PrefsFragment to GameListActivity, since the main purpose of PrefsFragment is to handle the user settings. So, instead, we call SaveConfigToDolphinIni() in the PrefsFragment.onDestroy() method. This way, when the PrefsFragment object is being 'destroyed', it will write the settings to the ini.
2013-08-19 21:56:13 -04:00
a87b967cde
[Android] Simplify saving settings to the ini file. Since the setting names are known, there's no reason to loop through them.
...
This will likely be simplified further very soon.
2013-08-19 20:55:50 -04:00
377202b9f6
Correctly check for AVX support in x64CPUDetect
...
It's not enough to check for the CPUID bit to know if AVX is supported since
AVX requires OS support (new set of registers == more registers to be saved
when context switching). If the OS does not support, the cpuid bit will still
be set but using YMM registers will cause an illegal exception fault.
2013-08-20 01:25:10 +02:00
77a5af3bcf
[Android] Change the settings menu a little more. Instead of the settings being a single view with settings from all components being displayed, I have broken it into sections. This future-proofs the settings menu in the sense that it won't get cluttered before people start asking "Hey, shouldn't this be broken into sections?".
...
As of this commit, it is broken into CPU Settings and Video Settings.
I also simplified the code that is responsible for setting the valid CPU cores and video backends by simply making UI string arrays that get chosen, based on the platform the Android device is running on.
2013-08-19 19:10:13 -04:00
d3c437819d
NetPlay: Add blank inputs when reporting mode changes, so the buffer isn't empty if wiimote 1 isn't polled next.
2013-08-19 17:03:14 -04:00
814c1c9572
pixelShaderGen: also execute alpha test for always fail with late z test
...
This should fix issue 6493, but maybe no real issue as this rendering just do nothing
2013-08-19 21:27:54 +02:00
ba3d3311bd
[ARM] If one requests a FPR to not preload but then later ask it to preload. Make sure to preload it at that time. Would have caused issues with having to make sure the non-preloaded regs were always grabbed last.
2013-08-19 18:13:08 +00:00
8094037104
[ARM] Add ps_sum0 and a disabled ps_madd.
2013-08-19 18:13:08 +00:00
42de733c41
[ARM] Disable floating loadstores as they cause problems. Reenable faddsx/fsubsx as it works with loadstores disabled.
2013-08-19 18:13:08 +00:00
23ce6b9227
ogl: remove glMapBuffer as it isn't in gles
2013-08-19 19:20:10 +02:00
1675f56f02
[ARM] Disable faddsx since it causes problems in crazy taxi.
2013-08-19 12:26:25 +00:00
b4baa4fdb9
[ARM] Add mullwx, mulhwux and half implemented srawix instructions. Change fsubsx/fmulsx slightly, still broken.
2013-08-19 06:26:34 +00:00
9bded1382c
[ARM] Add ASR/ASRS and UMULLS emitters.
2013-08-19 06:26:34 +00:00
7a41acd8ff
NetPlayServer: Remove unused code
...
GetPlayerList is always called on the client.
2013-08-18 21:38:32 -04:00
5c3dcc50bc
Add an INI option to not loop FIFO playback and stop emulation when it's done
2013-08-19 01:39:00 +02:00
205ebbebbb
[Android] Catch a more specific exception type (UnsatisfiedLinkError) when trying to load the main native Dolphin 'library'.
...
Also made the logging tag more specific.
It's generally bad to catch Exception because it's not very specific for the person reading the code. It doesn't say why that exception might have happened, it just indicates it's possible for an Exception to happen, which is quite general.
2013-08-18 18:30:13 -04: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
9f4ca0e0a7
[ARM] JitASM miroops. No functionality change.
2013-08-18 17:45:04 +00:00
5782530b40
NetPlayProto: bump netplay version
...
Since the packet structure changed.
2013-08-18 09:10:15 -04:00
26242de914
Increases Gamecube pad polling rate during netplay to normal. Also re-add dualcore setting syncing to netplay, which I had erroneously removed.
2013-08-18 08:19:16 -04:00
894e29b809
Fix comments, and send wiimote mapping to new users.
2013-08-18 05:17:06 -04: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
803b7ae991
[Android] Make the banners display a little larger. Now they don't look like tiny icons in the game list.
2013-08-17 22:51:35 -04:00
ba76b016da
[Android] Fix Wii games.
2013-08-17 19:41:28 -05:00
7294fe5a3f
Change per instruction run counts to u64 on all platforms. JIT64 and JITIL runcount isn't implemented properly(and is disabled) so this doesn't effect them.
2013-08-18 00:15:47 +00:00
d6fe9c639b
Add an OSD message to remind the user if Shader Debugging is enabled
...
Fixes issue 6497.
2013-08-17 23:48:06 +02:00
07d729daa2
[Android] Prevent duplicate duplicate items from being in the game list at one time.
...
Previously it was possible for a game with the same path and name to be in the list as another. This is annoying because duplicates ae (obviously) no different from the initial item.
This prevents duplicates from entering the list.
The way this works is:
1. We get the final list of items to add to the list.
2. Loop through it using two indices, which, for this explanation I'll call [item] and [itemAfter]
We compare path name at item with index [item] and the path name at item with index [itemAfter]
To phrase this numerically comparison works like so:
for (int i = 0; i < listSize; i++)
{
if (i+1 < listSize)
item[i].getPath().equals(item[i+1].getPath())
}
3. For each path comparison that is true, remove item at [indexNext].
2013-08-17 14:28:50 -04:00
a9d634086c
[Android] Change the Game List items to be formatted similarly to how the folder browser is. Also ensure the 'no banner' icon scales down to the same size as the other banners.
2013-08-17 13:25:40 -04:00
1f6c63f1d8
[Android] Ensure that required dependencies are actually exported along with everything else when the Android version builds. Without this, the support libs will not export and cause the emulator to crash upon being executed.
2013-08-17 12:26:43 -04:00
88f79a14db
[Android] Simplify if statement conditions for the item click listener in FolderBrowser.java.
...
Since FolderBrowserItems have an 'isDirectory()' method, that's all we need to care about now. There's no need to check subtitles to determine if an item is a directory anymore.
2013-08-17 11:03:02 -04:00
9149b30237
[Android] Shorten FolderBrowserItem's method 'isValidItem()' into 'isValid()' makes more sense and less redundancy in terms of 'item.isValidItem()' -> 'item.isValid()'
2013-08-17 10:55:13 -04:00
5047eeb263
[Android] FolderBrowserItem objects don't need to store a context.
...
Removed the requirement to pass a context in the constructors.
Also cleaned out unnecessary imports.
2013-08-17 10:50:31 -04: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
7934df3879
Remove a redundant check in the fifo.
2013-08-17 01:27:08 +00:00
d0d162e6ad
Fix really stupid optimise on Windows.
...
Possibly explains speed difference from master.
2013-08-17 12:16:51 +12: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
49963da371
Put the shader info log at the end of the shader log file. This fixes issue 6495.
2013-08-16 21:05:35 +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
da560ecefc
On CoreParemeter member object creation make sure to set bEnableDebugging, bAutomaticStart, and bBootToPause to default values so they aren't unitialized. This caused a issue in particular on the Android builds where bBootToPause would cause the games to boot in to a paused state, effectively causing the application to need to be forced closed and reran multiple times in order to test anything.
2013-08-16 07:30:53 -05:00
367f294ed2
[Android] Make sure to unallocate the correct memory size in MemArena.
2013-08-16 04:55:43 -05: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
c7025989f8
Probably worthless commit that may fix wiimote netplay buffer problems.
2013-08-15 22:31:36 -04:00
82e9bed20e
[Android] Fix a bug where the name would display incorrectly in the game list.
...
Completely missed the 'this.' on the variable. My bad.
2013-08-15 20:34:05 -04:00
c3065ecb66
Fix compatibility with the SDL2.0 release.
...
SDL2.0 removed SDL_HAPTIC_SQUARE because of ABI issues (see comment #7 on issue
6491 by Ryan C. Gordon from the SDL project). It will be reintroduced again in
2.1, so keep the code and #ifdef it away.
2013-08-15 22:18:40 +02:00
1de39a4a6e
Revert wrong indentation of some files. sorry for that one i was really convinced that i read that spaces must be used instead of tabs :)
2013-08-15 15:40:57 -03:00
08a6b8920b
re indentation to follow emulators code rules in some files I'm modifying
2013-08-15 15:16:32 -03:00
10f6117905
Add some ifdef magic to GLFunctions.cpp to make it not directly dependant on GLESv3.
2013-08-15 18:15:55 +00:00
8e9bbdeb2f
some fixes for point rendering
2013-08-15 15:14:48 -03:00
06620ff364
[Android] Fall back to using dlsym on ourselves to pull in OpenGL Functions when eglGetProcAddress fails. This fixes an issue on the Chromebook where I was forced to link to libGLESv2 and pull in the functions statically since eglGetProcAddress wouldn't return any GLESv3 functions. This also changes glMapBuffer to glMapBufferOES because glMapBuffer isn't actually part of the OpenGL ES 3 spec...
2013-08-15 18:07:56 +00:00
a5e34dd5cb
merge changes from other back ends to the PerfQuery functionality
2013-08-15 14:45:18 -03:00
ba6a67a5f1
Merge branch 'master' of https://code.google.com/p/dolphin-emu into dx9-ssaa-fix
2013-08-15 13:49:53 -03:00
Glenn Rice
