Commit Graph

2117 Commits

Author SHA1 Message Date
Grant Paul 39965e894d Add native fullscreen support for OS X. 2013-04-03 21:20:43 -07:00
Glenn Rice 3fdc46877a Make the GUI show a translated "No audio output" sound backend string. 2013-04-03 09:22:39 -05:00
Glenn Rice 6371a6f15d Fix some more strings for translation, and update the catalog. 2013-04-02 17:44:27 -05:00
Pierre Bourdon eb06c62a6e Merge branch 'new-ax-hle'
GC and Wii games using the AX UCode should now work almost perfectly with DSP
HLE. If you get any issue, make sure the "DSP on dedicated thread" option is
disabled, and try setting framelimit to "Audio".

As a side effect, DSP HLE should not desync anymore (making it usable in
netplay and TAS) with AX games.

Conflicts:
	Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AX.h
	Source/Core/Core/Src/HW/DSPHLE/UCodes/UCode_AXWii.cpp
2013-04-02 21:00:44 +02:00
Jordan Woyak d951c4c374 real buildfix 2013-04-02 13:07:51 -05:00
Jordan Woyak 69779a4321 Fix loading of "themes" with non-ascii character names.
Fixed issue 6189.
Why did GetUserPath return a non-const ref to string..?
2013-04-01 23:22:20 -05:00
Pierre Bourdon 49d809ac0e Merge branch 'osx-libcxx' 2013-04-01 18:17:49 +02:00
Lioncash 58159a1693 Some more logging typos and clarifications. Missed these in my last commit.
This commit mainly elaborates on some messages a little more. Also fixes some typos that slipped through the last commit.

A large change in text can be seen in EXI_DeviceMemoryCard.cpp. I added more info as to why a write to a memory card may fail. (This actually was a reason I was unable to write to a memcard recently).

Elaborations can be seen in WGL.cpp

I did change some comments in some files that I was correcting logging messages in, however this is only if I spot a typo or if an abbreviation is lower-cased. Even in that case, the amount of changes done to comments is very minimal.
2013-04-01 00:10:54 -04:00
Lioncash f432d6038e Fix some typos and correct some capitalizations in the log messages.
Makes the logging look more orderly and less spammy when spitting out things.
2013-03-31 19:13:30 -04:00
Grant Paul aabd8ce664 Add retina display support for Mac. 2013-03-31 11:36:42 -07:00
Pierre Bourdon e3b0a2c9bf Add an option to run the AX processing on the CPU thread. Fixes timing issues causing audio glitches on Wii, and should improve the overall stability of AX HLE. 2013-03-30 14:02:30 +01:00
Glenn Rice 485bd70df2 Fix some strings for translation and update the pot file to include
those strings once again.
2013-03-29 11:05:22 -05:00
Pierre Bourdon 4895e38bd5 This change might work better if I git add the files 2013-03-29 07:31:15 -07:00
NeoBrainX 6e88ae9695 Recommend Direct3D 11 or OpenGL instead of Direct3D 9. 2013-03-28 23:34:14 +01:00
Ryan Houdek 2444fdbbdd I missed some files required for our GLInterface. 2013-03-27 21:18:07 -05:00
Jordan Woyak 507f53e226 Fixed issue 6119. 2013-03-27 14:26:45 -05:00
lioncash 6fe5f5a6ba [DolphinWX] Remove a duplicate conditional in Frame.cpp 2013-03-27 15:09:04 -04:00
Ryan Houdek 7034c79ab9 Big commit. Fix running the APK, I had missed a view in the manifest. Clean up the Android EGL context creation to fit more in line with how Dolphin works. This breaks input at the moment as well. Change the memarena from 768MB to 64MB to allow 1GB phones to potentially run it. Rename EGL_X11 back to EGL since this merge brings in some of soreau's changes to more easily allow different platforms like Wayland and Android. Not quite all of the code because some needs to be cleaned up still. 2013-03-24 21:06:34 -05:00
Rachel Bryk 81e261eb68 Fix description of disable fog, and move it to enhancements tab. 2013-03-24 15:47:18 -04:00
NeoBrainX bb3ce1f8d3 Mark the Direct3D9 backend deprecated. 2013-03-23 23:53:19 +01:00
Ryan Houdek d11679a06e Android mega commit of trash. 2013-03-19 21:53:09 -05:00
Ryan Houdek 61e1659b97 Disabled OSX x86 build since we require 10.7 minimum. This takes support back to late 2006 models. Also, Missed CG framework addition. 2013-03-19 08:50:56 -05:00
Braden befe6e6962 Short,sweet and fixes issue 5725 2013-03-18 21:40:46 -05:00
Braden c5033e8594 Hide cursor in fullscreen mode on OSX fixes issue 3956 2013-03-18 17:45:08 -05:00
Braden a2af6494cf Clean up CInterfaceAGL, make sure the screen gets cleared on stop, and remove the FPS update that messes up GUI builds since GUIless doesn't build anyways. 2013-03-18 17:15:59 -05:00
Braden ae3c5a64cc Fix full screen on OSX, well as fixed as its ever been. Apperently in render to main it always shown the FPS on the bottom in full screen. 2013-03-17 20:58:43 -05:00
degasus e1a081ad2d Merge branch 'GLSL-master'
Merge an endless story. The branch name is a lie, it was started as glsl, but now it is a complete reworked opengl3 backend.

It just began with simple changes which aren't supported on osx.
They either support ogl2 OR ogl3 core, but mixing isn't allowed.
As the branch name says, the vicious circle starts with GLSL, but just implementing one wasn't possible either:
- OSX supports only GLSL100 which doesn't support our shaders.
- Vertex Array Objects are needed for ogl3, but not supported on ogl2
- immediate mode isn't supported any more, so we must implement vertex buffers
- uniform buffers are recommended as else we would need tons glUniform
- postprocessing shaders have to be converted to glsl
- lots of smaller outdated issues and bug fixes :-)

Thanks at all for testing and at Sonic for converting all of our shaders to glsl130

And sorry for all upcoming bugs...
2013-03-15 22:49:26 +01:00
Rachel Bryk 8767b30f75 My OCD will not stand for this. 2013-03-15 15:42:59 -04:00
Ryan Houdek 8c1091a21f Merge branch 'master' into GLSL-master
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
2013-03-15 11:19:52 -05:00
Rachel Bryk d63d7fde9e So much more readable now! 2013-03-15 11:45:43 -04:00
Rachel Bryk def578fea6 Fix checks for preventing the main and render windows from spawning off screen. 2013-03-15 09:19:39 -04:00
skidau afb6f9127a Corrected a typo. 2013-03-15 19:32:47 +11:00
degasus 84119a966b Revert "remove wx from agl"
This reverts commit e63a5d8529.
window_handle is also used at many other places, so just move it here isn't allowed
2013-03-15 02:40:08 +01:00
Ryan Houdek d6c7e7d652 Let's do this version check again. 2013-03-14 15:46:27 -05:00
Ryan Houdek db1fc9019b Add a OSX version check to GLSL so if anyone running < OSX 10.7 gets a message instead of crashing when running the game. Turn off DEBUG_GLSL. 2013-03-14 15:25:41 -05:00
Rachel Bryk eaebebc33d Prevent the render window from spawning off screen.
Fixes issue 6063.
2013-03-14 05:28:02 -04:00
degasus e63a5d8529 remove wx from agl 2013-03-14 09:52:13 +01:00
Braden a0fdcaced8 Removes the redundant window on OSX 2013-03-13 21:34:52 -05:00
Rachel Bryk 0b34457a8e All the cool kids hard code string lengths.
Fixes issue 6090.
2013-03-13 07:04:53 -04:00
Rachel Bryk e73cc858bc Allow playing movies from command line. Also remove some unneeded code. 2013-03-13 01:37:35 -04:00
degasus 382be2aabd Merge branch 'master' into GLSL-master
Conflicts:
	.gitignore
2013-03-12 11:28:56 +01:00
skidau 83fc5f4747 Merge branch 'FIFO-BP'
# By skidau (30) and Pierre Bourdon (1)
* FIFO-BP: (31 commits)
  Set g_bSignalTokenInterrupt on the main thread.  Fixes the random hang in Harry Potter: Prisoner of Azkaban.
  Used a scheduled event to generate the ARAM DMA interrupt if the DMA is greater than a certain size.  Fixes NFS:HP2 GC.
  Bumped up the disc transfer speed enough to prevent audio stuttering in Gauntlet: Dark Legacy.
  Enabled Synchronise GPU on "SPEED CHALLENGE - Jacques Villeneuve's Racing Vision".  Required to go in-game.
  Added direct GameCube controller commands to the Serial Interface emulation.  Fixes the controls in MaxPlay Classic Games Volume 1 and the Action Replay disc.
  Increased the FIFO buffer size to 2MB from 1MB.  Fixes Killer 7's Angel boss.
  Used an immediate GenerateDSPInterrupt when transferring data from ARAM to MRAM and a scheduled DSP interrupt when transferring data from MRAM to ARAM.
  Fixes the audio cutting in and out in the Resident Evil GC games using DSP HLE. Triggered the ARAM interrupt by the scheduler instead of directly in function.
  Implemented proper timing for the sample counter in the AudioInterface, removing the previous hack. Cleaned up some of the audio streaming code.
  Skipped the EE check if there is a CP interrupt pending.
  Disabled "Speed up disc transfer" from the ZTP GC game ini.
  Removed the disc seek times for GC games and removed the disc speed option on Wii games. Checked for external exceptions only in mtmsr.
  Delayed the interrupts in the EXI Channel.
  Merge aram-dma-fixes (r76a13604ef49b522281af75675f044d59a74e871)
  Added a patch that bypasses the FIFO reset code in Wallace and Gromit: Project Zoo, allowing it to go in-game.
  Made vertex loading take constant time.
  Increased the cycle time of the vertex command.  Fixes "Speed Challenge: Jacques Villeneuve's Racing Vision".
  Moved the setting of the Finish interrupt signal back to the main thread as it was causing Wii games like Resident Evil 4 (Wii) to hang.
  Profile stores, fp stores and ps stores only to the fifo write addresses list.  This should make the JIT a little faster as it will not be checking for external exceptions unnecessarily.
  ...

Conflicts:
	Source/Core/VideoCommon/Src/PixelEngine.cpp
2013-03-12 19:47:59 +11:00
degasus e1ca002937 osx: only use accelerated backends 2013-03-11 16:36:07 +01:00
Rachel Bryk 13a64e992d Fix a typo. 2013-03-08 22:47:56 -05:00
degasus a1c5e90083 Merge branch 'master' into GLSL-master
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/CMakeLists.txt
	Source/Core/DolphinWX/Src/GLInterface.h
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/VertexManagerBase.cpp
	Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj
	Source/Plugins/Plugin_VideoOGL/Plugin_VideoOGL.vcxproj.filters
	Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
	Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
	Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/main.cpp
2013-03-06 15:59:29 +01:00
Ryan Houdek 1214bf1359 Add ARM Jit to GUI when built on ARM 2013-03-06 03:25:45 +00:00
Jordan Woyak 10d57a3402 Use standard binary multiple unit symbols for game size display.
Use integer math for the calculation as we cannot rely on floats for something as important as game size display!
2013-03-05 14:58:30 -06:00
degasus 4714e4f99c fix agl 2013-03-05 15:17:00 +01:00
Ryan Houdek 240238308c Disable SSE2 check in the GUI when building ARM. 2013-03-05 14:03:01 +00:00
Ryan Houdek 3ac7ee4623 Fix compiling Dolphin on devices that provide crazy GLES drivers 2013-03-05 03:53:25 +00:00
Jordan Woyak bdc96342ba More string conversion cleanup. 2013-03-03 18:40:50 -06:00
Jordan Woyak 6026b29844 Separate banner and volume name getting functions. Game properties now shows the correct "banner" name in more cases. 2013-03-03 18:34:03 -06:00
Jordan Woyak a30636cb88 Buildfix. 2013-03-03 18:00:48 -06:00
Jordan Woyak ae14578bc5 Eliminate some netplay gamelist ugliness. 2013-03-03 17:56:40 -06:00
Jordan Woyak fad2b65d76 More wxString conversion cleanup. 2013-03-03 02:30:45 -06:00
Jordan Woyak 88cb11ba0a I'm confused at why SHIFT-JIS was being used here. 2013-03-02 20:42:48 -06:00
Jordan Woyak e183711d74 wxString conversion cleanup. 2013-03-02 20:34:53 -06:00
Jordan Woyak 6c8adf6130 Eliminate the wstring game name.
Some cleanup throughout related code. (try to make logic in ISOFile understandable by a human)
Encode strings in UTF-8 rather than somehow trying to determine the encoding in the GUI code.

Non-windows OSes temporarily broken.
2013-03-02 20:00:36 -06:00
Jordan Woyak 2b1af36900 Merge branch 'master' into windows-unicode 2013-03-02 15:33:32 -06:00
Jordan Woyak 2356e5c0e7 Eliminate some baseless restrictions in PointerWrap, mainly vector<string> not working. 2013-03-02 03:32:30 -06:00
Jordan Woyak e079d24912 Kill wstring version of game description. 2013-03-01 22:45:10 -06:00
skidau 73da6f4f3f Merge branch 'master' into FIFO-BP
# By Jordan Woyak (46) and others
# Via Jordan Woyak (2) and others
* master: (70 commits)
  Fixes two memory leaks, one is pretty bad for OSX. Yell at pauldachz if this doesn't work. Or... say thanks.
  Added a BluetoothEnumerateInstalledServices call so that the wiimote remembers the pairing.
  Make ARMJit core default CPU core on ARM architecture
  Fix a StringUtil regression from the arm-noglsl merge
  Small improvement to cmpli/cmpi in ARMJit.
  Merge latest ArmEmitter changes from ppsspp while we're at it.
  Ah. I blame vim on this typo entirely.
  Add disabled code for authenticating wiimotes on Windows.
  Add the missing FPR cache
  Buildfix.
  Yell at the user if they change window size while dumping frames, and some other avi dumping stuff.
  Not sure if this is the right way to handle this, but it makes the save states perfectly stable. That's all that really matters, right?
  Abort loading states from incompatible graphics backends.
  ARM Support without GLSL
  Improve VideoSoftware save states. They are fairly stable, but not perfect. OpcodeDecoder::DoState() needs to be fixed.
  Begin implementing save states to video software. Kind of works, sometimes.
  Make error message for loading save state with wrong dsp engine shorter.
  Abort load state if it uses a different dsp engine, instead of crashing.
  Update the gameini of F-zero. Efb to Ram is no longer the default choice.
  fix last commit by neobrain
  ...

Conflicts:
	Source/Core/VideoCommon/Src/Fifo.cpp
2013-03-01 20:12:56 +11:00
Pierre Bourdon a2d08d6740 Fix Dolphin starting only once then crashing at startup 2013-03-01 10:11:08 +01:00
Jordan Woyak dea1e2827d Open std::fstream in a unicode-safe manner. 2013-02-28 19:33:39 -06:00
Jordan Woyak 95558cdc69 Buildfix. 2013-02-28 03:11:10 -06:00
Jordan Woyak 03ec9a2e08 Kill some unnecessary c_str and use StrToWxStr in a few places that I missed. 2013-02-28 02:40:03 -06:00
Jordan Woyak 56f09d3b91 Attempt to be consistent with conversions between std::string and wxString. 2013-02-28 02:30:05 -06:00
degasus 1b8d044543 clear cg from project files 2013-02-27 10:55:25 +01:00
Ryan Houdek 717b976875 ARM Support without GLSL 2013-02-26 13:49:00 -06:00
Jordan Woyak 46adbfa9ed Merge branch 'real-wiimote-scanning' 2013-02-25 17:33:34 -06:00
Jonathan Jones ba979582e2 Makes the "No banner" banner image theme-able. Current "sexy X" banner included as part of "Boomy" theme.
Fixes issue 6023.
2013-02-22 15:30:07 -05:00
degasus bed29f843f fix spelling 2013-02-21 18:29:17 +01:00
degasus 40e17b4cb8 add option for hacked upload and disable it by default 2013-02-21 18:18:44 +01:00
skidau 351c741906 Merge branch 'master' into FIFO-BP
# By Jordan Woyak (9) and others
* master:
  Fixed a buffer overflow in the OpenAL buffer.
  TextureCache: Fix D3D backends crashing when a game uses multiple 1x1-sized LODs.
  WII_IPC_HLE_Device_FileIO: don't rebuild the filename on every operation.
  Some cleanup of CWII_IPC_HLE_Device_FileIO: The real file was never kept open for longer than a single operation so there was no point in dealing with it in DoState. Saving the real path in the savestate was also probably a bad idea. Savestates should be a bit more portable now.
  Removing destination on rename when source isn't present doesn't make sense. IOCTL_RENAME_FILE still might not be totally correct.
  Change some CNANDContentLoader logic to what was probably intended. Kills some warn logs when opening Dolphin.
  Let's not CreateDir an empty string every time CreateFullPath is used, logging an error every time.
  Fix a memleak. Probably/maybe improve USBGecko performance.
  Remove the core count from the cpu info OSD message. It was often wrong and not rather important.
  Use omp_get_num_procs to set the number of OpenMP threads rather than our core count detection.
  Bulk send TCP data to the client with the emulated USB Gecko.
  Added the ability to reverse the direction of the force feedback by allowing negative range values.
  Changes/cleanup to TextureCache::Load and other mipmap related code. The significant change is what is now line 520 of TextureCacheBase.cpp: ((std::max(mipWidth, bsw) * std::max(mipHeight, bsh) * bsdepth) >> 1) to TexDecoder_GetTextureSizeInBytes(expanded_mip_width, expanded_mip_height, texformat);
2013-02-19 23:19:29 +11:00
degasus fed574d08b solve merge conflict 2013-02-18 18:55:42 +01:00
degasus a629dea4dc Merge branch 'master' into GLSL-master
Conflicts:
	CMakeLists.txt
	Source/Core/DolphinWX/Dolphin.vcxproj
	Source/Core/DolphinWX/Src/GLInterface/WX.cpp
	Source/Core/DolphinWX/Src/GLInterface/WX.h
	Source/Core/VideoCommon/Src/TextureCacheBase.cpp
	Source/Core/VideoCommon/Src/TextureCacheBase.h
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX11/Src/TextureCache.h
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoDX9/Src/TextureCache.h
	Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
	Source/Plugins/Plugin_VideoOGL/Src/TextureCache.h
	Source/Plugins/Plugin_VideoSoftware/Src/SWmain.cpp

damn mipmap_fixes ...
2013-02-18 18:49:20 +01:00
skidau 1792a9d27b Added the ability to reverse the direction of the force feedback by allowing negative range values.
Fixes issue 5981.
2013-02-17 15:03:10 +11:00
skidau 9bff8e00c8 Added preliminary support to synchronise the timing of the CPU and GPU threads. A new option has been added to the game properties for this purpose. This option may help with random freezes in Dual Core mode.
Fixes Gladius and Baten Kaitos: Eternal Wings and the Lost Ocean

Fixes issue 5150.
2013-02-16 12:51:09 +11:00
Jordan Woyak ef90b15f3e Provide an option to not send speaker data. It can cause rumble lag even when the speaker is muted. 2013-02-15 03:00:31 -06:00
Ryan Houdek 818a376bd4 Fix header guard and definitions not being set to 1 2013-02-12 14:11:29 -06:00
Jordan Woyak da53ca8ee3 "Wait for the wiimote to connect"? I think that's a horrible idea. 2013-02-12 00:19:27 -06:00
Jordan Woyak a6461ca186 Improve wiimote reconnection on changing wiimote sources. 2013-02-11 23:39:04 -06:00
Jordan Woyak fa10335c55 Make continuous scanning optional. 2013-02-11 17:58:56 -06:00
Ryan Houdek 8923f0e13b Fix header guard and definitions not being set to 1 2013-02-11 15:06:40 -06:00
Jordan Woyak 1c64b1993d Change the ugly "no banner" banner to the sexy "X" from the website. 2013-02-09 17:04:41 -06:00
NeoBrainX 6645bd6fc6 Fix a crash in the FifoPlayer dialog. 2013-02-09 12:39:19 +01:00
Jordan Woyak 8ce58759e3 Remove some old nonsense. 2013-02-07 23:52:50 -06:00
Jordan Woyak 026793fa4a Fixup real wiimote GUI. 2013-02-07 23:17:51 -06:00
Jordan Woyak c4df69a342 Merge branch 'master' into real-wiimote-scanning
Conflicts:
	Source/Core/Core/Src/HW/WiimoteReal/IOWin.cpp
	Source/Core/Core/Src/HW/WiimoteReal/WiimoteReal.cpp
2013-02-07 20:22:06 -06:00
Jordan Woyak 8f5fb7e6f9 Hopefully buildfix Windows. (thanks for the patch, RachelB) 2013-02-07 14:15:47 -06:00
degasus 376a807dea first try of osx fix, mostly by pauldachz 2013-02-07 10:34:29 +01:00
Rachel Bryk 0ebe35e0ef Disable play and record buttons if an iso was selected, but is later deselected. 2013-02-07 00:31:57 -05:00
Rachel Bryk 6bc9e7579c Disable start/play recording buttons when no iso is selected. 2013-02-06 20:56:07 -05:00
skidau 03d9cca2fe Added a script to copy the OpenAL dll's to the main Dolphin folder on new builds. 2013-02-03 19:02:46 +11:00
Jordan Woyak 11a4c92325 Remove "Alternate Wiimote Timing" option. It's no longer needed.
Also kill some irrelevant comments.
2013-02-01 21:39:01 -06:00
degasus c05f66bdd0 first try for osx core profile
now it doesn't crash, but it still hangs on startup
2013-01-31 12:20:17 +01:00
Rachel Bryk e199d21513 Revert "Toggle full screen when double clicking the render window."
This reverts commit de27f0bea9.
2013-01-31 03:54:18 -05:00
Rachel Bryk de27f0bea9 Toggle full screen when double clicking the render window. 2013-01-31 03:51:29 -05:00
Glenn Rice 0ffdd2607f Fix the majority of the compiler warnings unearthed by the addition of
the new warning flags.
2013-01-29 23:24:51 -06:00
Rachel Bryk 1e006b5b99 Better implementation of revision 2cc1a97a66. Works with .gcz files now. 2013-01-25 21:28:04 -05:00
Glenn Rice f660077d06 Remove deprecated method for accessing a gtk widgets window.
Fix a debug build compiler warning.
2013-01-25 20:11:17 -06:00
Rachel Bryk 74a5ad542b Do not automatically refresh the game list for games that have "Emulation issues" written in their gameini after we open/close the iso properties.
Fixes issue 5932.
2013-01-25 13:00:53 -05:00
Rachel Bryk 2cc1a97a66 Properly sort multi-disc games by title. 2013-01-25 03:08:28 -05:00
Ryan Houdek 10418d449f Removed the need for this temporary variable. 2013-01-24 10:53:37 -06:00
Ryan Houdek 52ead25534 Cleans up EGL. Removes printf output with INFO_LOG and ERROR_LOG 2013-01-24 10:39:38 -06:00
Ryan Houdek 73eb98ed8e Move swap control to the host specific GLInterface files. 2013-01-24 10:31:08 -06:00
degasus e0ffdda26e Merge branch 'immediate-removal' into GLSL-master
Conflicts:
	Source/Core/VideoCommon/Src/PixelShaderGen.cpp
	Source/Plugins/Plugin_VideoSoftware/Src/SWRenderer.cpp

immediate-removal is a new created branch seperated from master but reverted the revert of immediate-removal
so we get less conflicts by merging
2013-01-24 16:58:28 +01:00
Sonicadvance1 0ba1794df3 Fix AGL.cpp 2013-01-21 21:48:02 +00:00
Lioncash 2bae4345c5 Revert "Ctrl+A support in the action replay code editing menu."
Guess it wasnt much of a solution as I'd hoped. (considering it seems to work on linux without this).

This reverts commit 0c1ea605d5.
2013-01-21 00:11:53 -05:00
Lioncash 0c1ea605d5 Ctrl+A support in the action replay code editing menu.
Makes adding/editing codes less of a pain in the ass. You don't need to manually highlight everything anymore.
2013-01-20 23:24:56 -05:00
Rachel Bryk 83237a36e0 Save memory card paths relative to exe directory. 2013-01-20 18:47:59 -05:00
skidau 0a5f479250 Added a game property to disable the clearing of the data cache. This is needed by one known game, "Rubik's Puzzle Galaxy: Rush".
Fixes Violin Paradise.
2013-01-20 13:09:38 +11:00
Grant Paul 2f28d938cf Add support for the mouse cursor and mouse clicking events on OS X. 2013-01-17 23:32:07 -08:00
Jordan Woyak d05d10d2a1 Improve "Enable Hotkeys" description.
Fixes issue 4607.
2013-01-17 19:54:29 -06:00
Jordan Woyak ba1a31248b Fix typo. 2013-01-17 19:42:56 -06:00
Jordan Woyak 2180c93347 Mention middle mouse button in "Free Look" description.
Fixes issue 5581.
2013-01-17 19:38:01 -06:00
Jordan Woyak cae8bb33c3 Fix initial theme selection. 2013-01-17 01:24:02 -06:00
Jordan Woyak 4dad8ddd83 Actually use the screenshot icon. 2013-01-16 22:12:51 -06:00
Rachel Bryk e74dc0b41f Update title/status bar when pausing emulation. 2013-01-16 22:52:01 -05:00
Lioncash 12162a269b Change GetCmdForHotkey to use a switch. Cuts down on if-statement spam.
Also fixed a typo in ConfigMain.
2013-01-16 22:23:42 -05:00
Jordan Woyak 178b1b3862 Fix theme loading on non-Windows. 2013-01-16 20:27:35 -06:00
Rachel Bryk 196c2867ad Move DSP settings to dolphin.ini 2013-01-16 20:17:44 -05:00
Jordan Woyak 3cb4300439 Merge branch 'external-theme' 2013-01-16 19:00:19 -06:00
Jordan Woyak f7729b9a69 Remove some unused resource files. 2013-01-16 17:09:09 -06:00
Jordan Woyak 246b11791b More attempts at a Windows buildfix. 2013-01-16 16:14:23 -06:00
Jordan Woyak 54497be653 Untested Windows buildfix attempt. 2013-01-15 23:02:09 -06:00
Jordan Woyak b2acae44b7 Real wiimote continuous scanning working on Linux.
Windows and OS X totally broken from various refactoring.
2013-01-15 21:15:54 -06:00
Jordan Woyak 6612763a9a Change audio latency setting to a wxSpinCtrl, fixes layout problem on linux. 2013-01-15 20:04:11 -06:00
skidau 0a4272c96b Merge branch 'OpenAL'
* OpenAL:
  Changed SoundTouch to use float samples, allowing SSE to be used. Made the DPL2 decoder disabled by default. Re-added the audio hack used by the Accurate VBeam emulation option.
  Added a latency setting to the audio settings. Removed the Sample Rate setting.  It is now hardcoded to 48000hz (accurate audio timing).
  Skipped timestretching if the emulator is running below 10% speed to prevent buffer overflows.
  Removed the synchronisation between the CPU thread and the audio thread. Added code to detect and resume from buffer underruns. Disabled the ability to change the DPL2 option after the game has started. Fixed a memory leak that occurred in the DPL2 decoder. Fixed the OSX build.
  Build fix
  Added a Dolby Pro Logic II (DPL2) decoder in the OpenAL backend.  DPL2 audio is decoded to 5.1.  Code adapted from ffdshow. Added an option in the DSP settings to disable the DPL2 decoder in case Dolphin incorrectly detects a 5.1 audio system. Updated the OpenAL files to OpenAL Soft 1.15.1 in the Windows build.
  Removed the system timing hack which was activated when the Accurate VBeam option was enabled.
  Fixed the include directories in Audio Common for the Windows 32bit build.
  Fixed the include directories in Audio Common for the Windows build.
  Messed up the static include line
  Fix include paths and compiling in Linux. Externals soundtouch is 1.7.1, while Ubuntu 12.10 is 1.6.x. Externals soundtouch is compiled with integer samples, while ubuntu is compiled with float samples. Float samples is probably the more common route. If you're going to use soundtouch, you should probably use SAMPLETYPE instead of explicitly choosing short. This probably breaks the windows build since its includes aren't setup.
  OSX: typedef signed char BOOL
  OSX build fix
  Build fix
  Added audio time stretching by using the SoundTouch library.
  Implemented correct audio timing.
  OpenAL for Windows initial commit
2013-01-15 22:40:12 +11:00
skidau 6d4a566bc4 Changed SoundTouch to use float samples, allowing SSE to be used.
Made the DPL2 decoder disabled by default.
Re-added the audio hack used by the Accurate VBeam emulation option.
2013-01-15 22:29:26 +11:00
Jordan Woyak 6f17342b50 Improve an error message. 2013-01-14 20:40:16 -06:00
Ryan Houdek 30d4259bba This removes the Lock Thread to Core option. Please file your complaints appropriately. 2013-01-14 14:20:41 -06:00
Lioncash 4ea4f2eb45 'width' and 'height' parameters of wxBitmapFromMemoryRGBA should be unsigned.
Not a big deal, but it's good to do it for the sake of maintaining practicalities.
2013-01-13 23:42:18 -05:00
Jordan Woyak 13469f2db4 Merge branch 'pulseaudio-simple' 2013-01-13 21:36:26 -06:00
Lioncash 47792b02a5 Fix a small text overlapping issue in the MemcardManager. 2013-01-13 22:28:36 -05:00
Jordan Woyak c00339449a buildfix 2013-01-13 16:27:02 -06:00
Jordan Woyak 3510454a94 Hopeful Windows buildfix (this better not break OS X) 2013-01-13 16:13:38 -06:00
Jordan Woyak d3f8e8e8f3 remove some now-unused resource files 2013-01-13 15:51:44 -06:00
Jordan Woyak c6e8239fd9 theme selection working now 2013-01-13 15:39:53 -06:00
Jordan Woyak 6f7b11b9be themes directory stuffs 2013-01-13 14:12:19 -06:00
Jordan Woyak 0c95673478 Kill themes in the config and load pngs from "theme" directory for now. 2013-01-13 13:12:50 -06:00
Jordan Woyak 6b3a3ff054 Kill theme selection from GUI. 2013-01-13 13:12:50 -06:00
Jordan Woyak 70427b3f35 Replace all of Connect/Disconnect with Bind/Unbind. 2013-01-13 12:45:33 -06:00
Jordan Woyak 60a73bcd77 Replace a bunch of Connect calls with Bind. 2013-01-13 11:46:30 -06:00
Jordan Woyak 5dbc3b3219 replace this->Bind with Bind 2013-01-13 03:33:11 -06:00
Jordan Woyak 6e5c26a3d4 kill _connect_macro_ ugliness in BreakpointWindow. 2013-01-13 03:12:29 -06:00
Jordan Woyak eca93c4c19 Eliminate nearly all the _connect_macro_ ugliness by using wxw's newish Bind functions.
Unlike Connect, Bind is quite type-safe.
I also seem to have fixed some errors in the input config dialog.
2013-01-13 03:06:56 -06:00
Rachel Bryk 429324a773 Real fix for memcard manager. 2013-01-12 21:18:42 -05:00
Rachel Bryk 6f391a2df0 Set focus on memcard manager after losing it. 2013-01-12 20:47:02 -05:00
skidau 1c462a1eca Added a latency setting to the audio settings.
Removed the Sample Rate setting.  It is now hardcoded to 48000hz (accurate audio timing).

Fixes issue 5672.
2013-01-13 00:05:30 +11:00