37d00cceda
Fix wx bullshit which made the watch view assert on my machine.
...
1) Apparently wxString::Format is type safe, and passing a u32 to it
with the format "%lu" crashes with a meaningless assertion failure.
Sure, it's the wrong type, but the error sure doesn't help...
2) "A MenuItem ID of Zero does not work under Mac". Thanks for the
helpful assert message, no thanks for making your construct have random
platform-specific differences for no reason (it's not like menu item IDs
directly correspond to a part of Cocoa's menu API like they do on
Win32).
2015-04-24 22:04:46 -04:00
87bd57e0be
Merge pull request #2322 from JosJuice/extract-file-fix
...
Fix extracting files from Wii discs
2015-04-24 16:32:23 -04:00
2e10a71dcd
Fix extracting files from Wii discs
...
I broke it for individual files but not folders in 4.0-6016.
2015-04-24 22:08:15 +02:00
b3aaa46d42
Merge pull request #2088 from Sintendo/diecmp
...
Emit 'TEST reg, reg' for 'CMP reg, 0' automatically
2015-04-23 16:34:23 -04:00
87a63713f4
Merge pull request #2317 from comex/oops
...
Fix code broken by merge
2015-04-23 02:08:28 -04:00
74c30d1784
Fix code broken by merge
2015-04-23 02:07:45 -04:00
a39985fe08
Merge pull request #2315 from lioncash/code
...
DolphinWX: Remove superfluous code in FrameTools
2015-04-23 02:05:14 -04:00
ad95454d04
Merge pull request #2223 from phire/imm
...
Cleanup OpArg, make immediates more explicit.
2015-04-23 01:53:18 -04:00
8fb36228e5
Merge pull request #2311 from JosJuice/fix-wad-crash
...
Fix WAD crash caused by VolumeHandler removal
2015-04-23 00:23:42 -04:00
819f4d994c
DolphinWX: Remove superfluous code in FrameTools
2015-04-22 19:56:50 -04:00
0b44d7c18a
Fix Wii software crashing at boot if no disc is inserted
...
Boot_BS2Emu was trying to read from the inserted disc even when
nothing was inserted, and this happened to not crash (but not
work either) before VolumeHandler was removed. This commit adds
a check that restores the old behavior, so there is no longer a
crash, but the game ID still doesn't get set for WADs. I don't
know if/how it should be set, so this felt like the safest option.
2015-04-22 09:14:41 +02:00
5d61b9d0a4
Merge pull request #2313 from lioncash/unused
...
GPFifo: Remove unused parameters from Write[x] functions
2015-04-22 00:39:38 -04:00
31ea8d0834
Merge pull request #2310 from lioncash/fsmenu
...
FrameTools: Use AppendRadioItem for constructing the frameskip menu
2015-04-22 00:39:17 -04:00
56df9b7508
GPFifo: Remove unused parameters from Write[x] functions
2015-04-21 23:01:25 -04:00
4340927b7f
Merge pull request #2308 from Stevoisiak/FrameToolsMath
...
FrameTools: Remove redundant 'i-1'
2015-04-21 16:17:02 +02:00
ebe0222265
FrameTools: Use AppendRadioItem for constructing the frameskip menu
...
Same thing, less code.
2015-04-20 21:51:30 -04:00
f5c72c5b1a
DiscIO: Add a missing header to Volume.h
2015-04-20 21:10:31 -04:00
c3cf43f064
FrameTools: Remove redundant 'i-1'
2015-04-20 20:24:37 -04:00
571eee8648
Merge pull request #2225 from JosJuice/remove-volumehandler
...
Get rid of VolumeHandler
2015-04-21 11:18:57 +12:00
a86f2fe2e7
Merge pull request #2199 from skidau/remove-controls-lock
...
Cleaned up the controller locking mechanism
2015-04-21 11:13:30 +12:00
82bbada352
Merge pull request #2257 from RachelBryk/battery
...
Add an option for wiimote battery.
2015-04-21 11:12:12 +12:00
f35277f215
Merge pull request #2267 from Stevoisiak/soundStream
...
(Visual Studio) Categorize SoundStream.h with other SoundStream files
2015-04-21 11:10:49 +12:00
d799446faf
Core: Don't display on-screen messages via DisplayMessage until emulation has begun
2015-04-20 18:31:40 -04:00
d27b8673f5
Merge pull request #2306 from Stevoisiak/MoveUndoSaveState
...
FrameTools: Move "Undo Save State" to save state menu
2015-04-19 20:45:41 -04:00
83ec7a1e78
FrameTools: Move "Undo Save State" to save state menu
2015-04-19 20:18:11 -04:00
8adf8b16bc
Globals.h: Added comments for menu sections
2015-04-19 18:51:55 -04:00
8c209b3bc9
no-gui: fix help string
2015-04-18 15:03:42 +02:00
9eb608c9da
Merge pull request #2301 from lioncash/const
...
General: Apply the const specifier where applicable
2015-04-16 23:13:39 -04:00
cd0212ab1c
Merge pull request #2302 from lioncash/perf
...
PerfQueryBase: Move common implementation variables into base class
2015-04-16 07:31:31 +02:00
7063886520
Merge pull request #2289 from lioncash/netplay
...
DolphinWX: Break the netplay UI controls into separate classes.
2015-04-16 12:35:41 +10:00
f0593095b4
Merge pull request #2295 from comex/fix-usb-threading
...
Fix threading issues
2015-04-16 12:33:20 +10:00
70605cae5c
Merge pull request #2300 from lioncash/update
...
Debugger: Update the registers/watches before refreshing grids.
2015-04-16 12:30:24 +10:00
c895e4504a
Merge pull request #2298 from JosJuice/partitions-no-string-parsing
...
Fix extracting Wii disc partitions numbered 10 or higher
2015-04-16 12:00:40 +10:00
221d37ae83
Merge pull request #2287 from lioncash/hkbinds
...
HotkeyDlg: Get rid of application-wide event bindings.
2015-04-16 11:59:24 +10:00
6b82b31640
Merge pull request #2285 from linkmauve/nogui-no-x11
...
NoGUI: Don’t segfault when the DISPLAY environment variable isn’t set
2015-04-16 11:58:15 +10:00
63393570fb
PerfQueryBase: Move common implementation variables into base class
2015-04-15 19:22:16 -04:00
1e7ca7f579
NoGUI: Don’t segfault when the DISPLAY environment variable isn’t set
2015-04-16 01:10:57 +02:00
86ceb54c38
Fix extracting Wii disc partitions numbered 10 or higher
...
Instead of trying to get the partition number from the
(localized!) item name, the partitions are now stored as item data.
2015-04-15 09:29:24 +02:00
b0613bb1c8
General: Apply the const specifier where applicable
2015-04-15 02:04:03 -04:00
2cddb8f480
Debugger: Update the registers/watches before refreshing grids.
2015-04-15 00:13:13 -04:00
bdde6b2a7c
D3D: Remove dependency on wxWidgets
...
This hasn't been necessary for ages
2015-04-14 22:27:03 -04:00
a6970b3744
Merge pull request #2288 from lioncash/unnecessary
...
ISOProperties: Remove unnecessary/unused variables & controls.
2015-04-14 10:42:29 -04:00
882080c282
Merge pull request #2284 from lioncash/leaks
...
DolphinWX: Fix memory leaks relating to the TAS dialog
2015-04-14 10:38:48 -04:00
bea3054c9c
Base.props: Remove DXSDK_DIR from the include path.
...
By overriding the include directories we can ensure we only use the Windows SDK.
2015-04-13 21:44:40 +02:00
c36a6b7599
Merge pull request #2291 from JosJuice/qt-sort-ascending-title
...
DolphinQt: Sort game list by ascending title order by default
2015-04-13 02:36:31 -04:00
8ebe3d3478
Remove unused field.
2015-04-13 02:27:08 -04:00
5fff97f3f4
Fix printf width in TraversalServer.
2015-04-13 02:26:52 -04:00
ba664b3293
Join the emu thread in Core::Stop. Get rid of Core::Shutdown which did that before.
...
Core::Shutdown was only called on app exit, yet the emu thread exits
whenever emulation stops; if you launched a new game it would just join
via the destructor when s_emu_thread was set to a new thread.
(Incidentally, the destructor also makes explicitly joining on app exit
rather pointless.)
Because the GUI thread wasn't waiting for the CPU thread to fully shut
down, Core::IsRunning would remain true briefly after CFrame::DoStop
which, given Dolphin's penchant for accessing variables belonging to
other threads, can only mean trouble... In my case, because the previous
commit caused UpdateGUI, which is called at the end of DoStop, to call
PauseAndLock, which checks IsRunning, pressing stop at the right time
would cause strange behavior.
2015-04-13 02:17:38 -04:00
e000aaaf5d
Have the UI thread do PauseAndLock before messing with GetUsbPointer.
...
Since its lifetime is managed on the CPU thread, this (or a refactoring)
is absolutely required. One of the functions with a PauseAndLock call
added is CFrame::UpdateGUI; this is fine now, since it's called only
after important events happen, so just make sure not to call it every
frame or something :)
2015-04-13 01:49:24 -04:00
bd680aa3b5
Main: Remove unnecessary shellapi.h include
...
The include was introduced by bcf1f54c611f3494
2015-04-12 10:22:18 +02:00
comex