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
06dd0ba3b4
Exit ReadDataFromFifoOnCPU, PushFifoAuxBuffer early if shutting down (GpuRunningState=false)
...
This was causing a race condition where the "absurdly large aux buffer"
panic alert would be triggered in the last bit of fifo processing on the
CPU thread in deterministic mode (i.e. netplay). SyncGPU is supposed to
move the auxiliary queue data to the beginning of the containing buffer
so we don't have to deal with wraparound; if GpuRunningState is false,
however, it just returns, because it's set to false by another thread -
thus it doesn't know whether RunGpuLoop is still executing (in which
case it can't just reset the pointers, because it may still be using the
buffer) or not (in which case the condition variable it normally waits
for to avoid the previous problem will never be signaled). However,
SyncGPU's caller PushFifoAuxBuffer wasn't aware of this, so if the
buffer was filling at just the right time, it'd stay full and that
function would complain that it was about to overflow it. Similar
problem with ReadDataFromFifoOnCPU afaik. Fix this by returning early
from those as well; other callers of SyncGPU should be safe. A
*slightly* cleaner alternative would be giving the CPU thread a way to
tell when RunGpuLoop has actually exited, but whatever, this works.
2015-04-21 22:33:29 -04:00
8ad45607af
Add Global Brawl Netplay Settings
...
Creates an ini for Super Smash Bros. Brawl and adds a gecko code for standardized tournament play (unlock all characters and stages, set to a timed, stock battle, items off, ect.)
More info here: http://smashboards.com/threads/brawl-gets-an-optimized-netplay-codeset.397646/
Update RSBE01.ini
2015-04-21 15:17:48 -07: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
d662fffb8c
Merge pull request #2309 from lioncash/header
...
DiscIO: Add a missing header to Volume.h
2015-04-21 13:29:55 +12: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
b0db4f53cc
Merge pull request #2307 from lioncash/crash
...
Core: Don't display on-screen messages via DisplayMessage until emulation has begun
2015-04-21 11:08:07 +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
41017742eb
Merge pull request #2305 from Stevoisiak/GlobalsSectionComments
...
Globals.h: Added comments for menu sections
2015-04-19 20:45:20 -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
c74ae3d27e
Merge pull request #2303 from degasus/master
...
no-gui: fix help string
2015-04-18 15:48:10 +02: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
8bb7f785b0
Merge pull request #2269 from APK-Games/master
...
Updated and added new Action replay Codes
2015-04-16 11:55:31 +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
7506c386cf
Merge pull request #2299 from lioncash/d3d
...
D3D: Remove dependency on wxWidgets
2015-04-14 19:31:46 -07: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
f1de5bc2e5
Merge pull request #2297 from Armada651/includes
...
Base.props: Remove DXSDK_DIR from the include path.
2015-04-13 20:36:21 -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
a8142f8d3e
Merge pull request #2296 from comex/warning-fixes-99999
...
Warning fixes 99999
2015-04-13 02:35:16 -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
59c4beb8ea
Merge pull request #2293 from JosJuice/main-unnecessary-include
...
Main: Remove unnecessary shellapi.h include
2015-04-12 13:07:27 -04:00
bd680aa3b5
Main: Remove unnecessary shellapi.h include
...
The include was introduced by bcf1f54c611f3494
2015-04-12 10:22:18 +02:00
comex