Commit Graph

1931 Commits

Author SHA1 Message Date
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
Ryan Houdek 818a376bd4 Fix header guard and definitions not being set to 1 2013-02-12 14:11:29 -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
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 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