16753 Commits

Author SHA1 Message Date
Ryan Houdek
bcc434095d Merge pull request #2212 from Sonicadvance1/fix_user_paths
Fix user directories at times doing stupid things.
2015-03-15 09:45:02 -05:00
Ryan Houdek
aaf04aeaca Fix user directories at times doing stupid things.
With my previous changes Dolphin would fail to create the user directory if it didn't exist, and would dump all the configuration options in to the cwdir.
This was a bit more complicated to fix in a clean fashion, so I took to moving around code concerning user directories.
Instead of having GetUserPath serve a dual purpose of both getting and setting our user directories, break out to a new SetUserPath function.

GetUserPath will know only get the configured user path.
SetUserPath will set our user paths and setup the internal user path state.

This ending up being a lot cleaner overall, which is nice. Also less mind bending when attempting to read the code.

So now we won't dump all of our configuration in to the cwdir if ~/.dolphin-emu isn't found.

Fixes issue 8371.
2015-03-15 09:19:48 -05:00
Ryan Houdek
b267e5147c Merge pull request #2203 from alucryd/findx11
Include the FindX11 module
2015-03-15 07:40:20 -05:00
Ryan Houdek
5e6d49d96b Merge pull request #2209 from magumagu/remove-hle-opcode
Remove remnants of old fake opcodes.
2015-03-15 07:13:07 -05:00
Lioncash
7be1498a43 Merge pull request #2210 from rohit-n/nullptr
Core: Change NULLs to nullptrs.
2015-03-15 04:42:19 -04:00
Rohit Nirmal
48ec42d4a0 Core: Change NULLs to nullptrs. 2015-03-14 20:20:41 -05:00
magumagu
87dcda5785 Remove remnants of old fake opcodes.
These are illegal opcodes, and should be treated as such.
2015-03-14 16:59:12 -07:00
Lioncash
2134770d7a Merge pull request #2208 from shuffle2/fixup-vcxprojs
remove win32/mixed project configurations.
2015-03-14 18:12:57 -04:00
Shawn Hoffman
25064fd8f4 remove win32/mixed project configurations.
remove win32 configs from all the externals, so it shouldn't happen again by accident.
2015-03-14 14:07:21 -07:00
Markus Wick
ec8a074690 Merge pull request #2153 from degasus/enet
enet: Search for shared library
2015-03-14 17:23:27 +01:00
Lioncash
41ad0f6976 Merge pull request #2204 from Stevoisiak/CheatWindowConsistency
DolphinWX: Changed "OnShow_CheatsWindow" to "OnShowCheatsWindow"
2015-03-13 16:39:54 -04:00
Dolphin Bot
46a67dda6b Merge pull request #2159 from mathieui/several-gcadapters
Allow several gc adapters to be plugged
2015-03-13 20:30:28 +01:00
Stevoisiak
2f0e3d239d DolphinWX: Changed "OnShow_CheatsWindow" to "OnShowCheatsWindow" 2015-03-13 15:20:19 -04:00
mathieui
b9af0c4d12 GC Adapter: Do not abort if some libusb functions are not supported
Also remove a typo.
2015-03-13 18:05:09 +01:00
mathieui
88ab6352dd GC Adapter: do not proceed with the input read if the thread isn’t running
If the Init() call does not work in the fallback path, then abort.
2015-03-13 18:05:09 +01:00
mathieui
5a10be7fef GC Adapter: fix a crash on exit
s_detected is better for detecting that a thread is actually running.
Also make sure the claim_interface is always called when we detect an
adapter.
2015-03-13 18:05:09 +01:00
mathieui
ebedc80545 GC Adapter: never call libusb_reset_device()
There should be no need to do this, and performing a reset breaks things
on any other software using the device (e.g. another dolphin instance).
2015-03-13 18:05:09 +01:00
mathieui
ad49de7740 GC Adapter: don’t stop scanning after failing to claim an adapter
Only call Shutdown() after all devices have been tested.
2015-03-13 18:05:09 +01:00
mathieui
5f5cc963cf GC Adapter: stop searching adapters after one has been added 2015-03-13 18:05:09 +01:00
Maxime Gauduin
148ce85b26 Include the FindX11 module 2015-03-13 12:58:08 +01:00
skidau
2916aed1f9 Merge pull request #2195 from JosJuice/nandcontentloader-singletons
Don't construct NANDContentLoader classes before Main.cpp runs
2015-03-13 12:20:43 +11:00
Lioncash
899a5078a0 Merge pull request #2200 from Stevoisiak/CheatManagerRename
Rename "Cheats Manager" to "Cheat Manager"
2015-03-12 15:27:52 -04:00
Stevoisiak
fbe11aefbb Rename "Cheats Manager" to "Cheat Manager" 2015-03-12 15:24:00 -04:00
Markus Wick
43b2f790fd Merge pull request #2197 from RachelBryk/paren
Fix missing parenthesis.
2015-03-12 07:58:05 +01:00
skidau
9063f0d16f Merge pull request #2150 from Tilka/gamelist_searching
DolphinWX: fix searching the game list in GTK
2015-03-12 13:32:50 +11:00
skidau
5dc23a93b6 Merge pull request #2169 from magumagu/rect-clamp
Fix clamping for rectangles.
2015-03-12 13:31:51 +11:00
skidau
f3bb30f17f Merge pull request #2180 from RachelBryk/netplay-quit
Fix crash when server's client disconnects.
2015-03-12 13:28:38 +11:00
Rachel Bryk
71bc1f39e0 Fix missing parenthesis. 2015-03-11 20:09:33 -04:00
Dolphin Bot
647cd3c8e0 Merge pull request #2171 from JosJuice/nonmodal-regression
Fix 4.0-5689 regression (AR codes, patches)
2015-03-11 08:15:02 +01:00
skidau
9ccc236b9c Merge pull request #2179 from RachelBryk/sort
Consistently sort games with the same name but different revision or reg...
2015-03-11 12:31:25 +11:00
skidau
2e7a832c4d Merge pull request #2194 from skidau/GCPad-Recalibrate
Calibrated the GCPad even if the game does not explicitly do so.
2015-03-10 11:42:38 +11:00
JosJuice
66bb3000c2 Don't construct NANDContentLoader classes before Main.cpp runs
The cUIDsys constructor writes to <Wii user path>/sys/uid.sys.
This must not be done before Main.cpp sets the correct user paths.
2015-03-09 16:08:32 +01:00
skidau
d7e54c36f1 Calibrated the GCPad even if the game does not explicitly do so. 2015-03-09 17:07:15 +11:00
skidau
d92efc4a3e Merge pull request #2190 from skidau/wiimote-profiles
Fixed the wiimote profiles not taking effect.
2015-03-09 11:30:33 +11:00
magumagu
a1dbe8e463 Merge pull request #2166 from MoochMcGee/master
Add various loads and stores to JitIL
2015-03-08 17:12:52 -07:00
skidau
07251b7c57 Merge pull request #2177 from skidau/debugger-split-window
Added the ability to split the Debugger window horizontally and vertically
2015-03-09 10:58:16 +11:00
Ryan Houdek
d6c6d36e87 Merge pull request #2191 from magumagu/mmio-typo
Fix typo in usage of IsOptimizableMMIOAccess.
2015-03-08 18:40:24 -05:00
magumagu
859c1123ba Fix typo in usage of IsOptimizableMMIOAccess. 2015-03-08 16:20:17 -07:00
skidau
b200e83b02 Fixed the wiimote profiles not taking effect. 2015-03-09 08:32:14 +11:00
Ryan Houdek
d34e908c4e Merge pull request #2185 from degasus/master
GLX: fix memory leak
2015-03-08 11:54:50 -05:00
degasus
f3f2ed1536 GLX: fix memory leak 2015-03-08 17:42:37 +01:00
Ryan Houdek
b0f61201c3 Merge pull request #2142 from Sonicadvance1/fix_gles31_non_nvidia
Fix OpenGL ES 3.1 on non-Nvidia devices.
2015-03-08 09:03:05 -05:00
Ryan Houdek
a9622c247b Merge pull request #2146 from Sonicadvance1/aarch64_optimize_fpr_push_pop
[AArch64] Optimize FPR pushing and popping.
2015-03-08 08:51:45 -05:00
Ryan Houdek
a984b2476a Merge pull request #2144 from Sonicadvance1/android_autostart
[Android] Support arguments from Activity Monitor.
2015-03-08 08:50:27 -05:00
Ryan Houdek
3c5e99c777 Fix OpenGL ES 3.1 on non-Nvidia devices.
We are declaring we require ARB_shader_image_load_store in the shader, this isn't an extension on GLES because it is part of the GLSL ES 3.1 spec.
If we are running as GLES then just not put it in the shaders.
2015-03-08 08:49:53 -05:00
Ryan Houdek
70977fd6b1 Merge pull request #2092 from Sonicadvance1/gles_occlusion_queries
Implement full occlusion queries for the Nexus 9.
2015-03-08 08:44:15 -05:00
Ryan Houdek
c2b2e03f73 [Android] Support arguments from Activity Monitor.
Activity Monitor can start activities by using adb to invoke it.
This will allow us to set the user directory and autostart file from adb.

adb shell am start -n org.dolphinemu.dolphinemu/.gamelist.GameListActivity -e AutoStartFile /sdcard/AC.gcz -e UserDir /sdcard/dolphin-emu2/

This allows more automated testing to be done with Dolphin on Android.
2015-03-08 08:43:25 -05:00
skidau
61591db916 Merge pull request #2011 from skidau/hotkey-render-to-main
Fixed the hotkeys so that they work with Render to Main

To set up a mix of keyboard and gamepad hotkeys, follow these steps:

1. In the Hotkey Settings, change the Device to Keyboard
2. Right click the hotkey button that you wish to map to your gamepad
3. In the window that pops up, change the Device to your gamepad
4. Press the Clear button
5. Press Detect and press the button on your gamepad that you want to map
6. Press Select
7. Press OK

To map a combo hotkey, e.g. Shift F5, follow these steps
1. Follow steps 1-4 above
2. Press Detect and the modifier button (e.g. Shift)
3. Press Select
4. Press Detect and the button which isn't the modifier (e.g. F5)
5. Press the "& AND" button
6. Press OK


This patch fixes these issues:
Issue 8307
Issue 8238
Issue 8217
Issue 8216
Issue 8214
Issue 8201
Issue 7652
2015-03-08 20:34:04 +11:00
skidau
3e12787cc8 Fixed a crash on launch which occurred if the hotkeys are not defined and the default hotkeys are loaded. 2015-03-08 20:27:14 +11:00
skidau
8f0bc1cd3a Slowed down the freelook speed keys and allowed the depth/convergence keys to be held down. 2015-03-08 20:27:13 +11:00