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
0ba1794df3
Fix AGL.cpp
2013-01-21 21:48:02 +00:00
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
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
83237a36e0
Save memory card paths relative to exe directory.
2013-01-20 18:47:59 -05:00
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
2f28d938cf
Add support for the mouse cursor and mouse clicking events on OS X.
2013-01-17 23:32:07 -08:00
d05d10d2a1
Improve "Enable Hotkeys" description.
...
Fixes issue 4607.
2013-01-17 19:54:29 -06:00
ba1a31248b
Fix typo.
2013-01-17 19:42:56 -06:00
2180c93347
Mention middle mouse button in "Free Look" description.
...
Fixes issue 5581.
2013-01-17 19:38:01 -06:00
cae8bb33c3
Fix initial theme selection.
2013-01-17 01:24:02 -06:00
4dad8ddd83
Actually use the screenshot icon.
2013-01-16 22:12:51 -06:00
e74dc0b41f
Update title/status bar when pausing emulation.
2013-01-16 22:52:01 -05:00
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
178b1b3862
Fix theme loading on non-Windows.
2013-01-16 20:27:35 -06:00
196c2867ad
Move DSP settings to dolphin.ini
2013-01-16 20:17:44 -05:00
3cb4300439
Merge branch 'external-theme'
2013-01-16 19:00:19 -06:00
f7729b9a69
Remove some unused resource files.
2013-01-16 17:09:09 -06:00
246b11791b
More attempts at a Windows buildfix.
2013-01-16 16:14:23 -06:00
54497be653
Untested Windows buildfix attempt.
2013-01-15 23:02:09 -06:00
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
6612763a9a
Change audio latency setting to a wxSpinCtrl, fixes layout problem on linux.
2013-01-15 20:04:11 -06:00
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
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
6f17342b50
Improve an error message.
2013-01-14 20:40:16 -06:00
30d4259bba
This removes the Lock Thread to Core option. Please file your complaints appropriately.
2013-01-14 14:20:41 -06:00
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
13469f2db4
Merge branch 'pulseaudio-simple'
2013-01-13 21:36:26 -06:00
47792b02a5
Fix a small text overlapping issue in the MemcardManager.
2013-01-13 22:28:36 -05:00
c00339449a
buildfix
2013-01-13 16:27:02 -06:00
3510454a94
Hopeful Windows buildfix (this better not break OS X)
2013-01-13 16:13:38 -06:00
d3f8e8e8f3
remove some now-unused resource files
2013-01-13 15:51:44 -06:00
c6e8239fd9
theme selection working now
2013-01-13 15:39:53 -06:00
6f7b11b9be
themes directory stuffs
2013-01-13 14:12:19 -06:00
0c95673478
Kill themes in the config and load pngs from "theme" directory for now.
2013-01-13 13:12:50 -06:00
6b3a3ff054
Kill theme selection from GUI.
2013-01-13 13:12:50 -06:00
70427b3f35
Replace all of Connect/Disconnect with Bind/Unbind.
2013-01-13 12:45:33 -06:00
60a73bcd77
Replace a bunch of Connect calls with Bind.
2013-01-13 11:46:30 -06:00
5dbc3b3219
replace this->Bind with Bind
2013-01-13 03:33:11 -06:00
6e5c26a3d4
kill _connect_macro_ ugliness in BreakpointWindow.
2013-01-13 03:12:29 -06:00
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
429324a773
Real fix for memcard manager.
2013-01-12 21:18:42 -05:00
6f391a2df0
Set focus on memcard manager after losing it.
2013-01-12 20:47:02 -05:00
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
104f5a4699
Set focus on game list after stopping emulation.
2013-01-11 17:53:34 -05:00
f405663576
Merge branch 'flat-flags'
...
Fixes issue 5837.
2013-01-11 15:17:25 -06:00
346922e39e
Update game cache revision, for "germany" games that were once "europe".
2013-01-11 15:16:56 -06:00
35dce209ae
Gave the "platform" icons a complete white background rather than a slightly-uglier white box.
...
(apparently XPM only supports a 1-bit alpha channel)
Centered the icons a bit better too.
2013-01-11 14:12:56 -06:00
cb71158df4
Be consistent with uppercase letters.
2013-01-11 13:47:19 -06:00
482360906b
Convert relative paths to absolute when opening containing folder of an iso.
...
Fixes issue 5879.
2013-01-11 11:24:52 -05:00
3632ce6df5
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.
2013-01-11 19:42:03 +11:00
80f4475e76
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.
Fixes issue 3023.
2013-01-11 14:03:09 +11:00
7fdfd1ef65
Make all flags 2 pixels taller.
...
Aspect-ratio is now correct for nearly all flags.
2013-01-10 19:20:47 -06:00
34a8273801
we don't need PNGs of the flags
2013-01-10 19:11:03 -06:00
561b09457c
Fix warnings.
...
Forgot to add Sdk flags.
2013-01-10 19:01:58 -06:00
6a13ae280d
Updated flag images to not have ugly gradient.
...
All images stolen from wikipedia.
Added "SDK" flag to separate it from "Unknown" flag.
2013-01-10 18:55:53 -06:00
58cbfdcbd3
Merge branch 'german-flag' into flat-flags
2013-01-10 18:21:59 -06:00
d6b53af115
Automatically set focus on game list window.
...
Fixes issue 5880.
2013-01-10 14:29:48 -05:00
ab24149b1b
Retain scroll position after refreshing game list.
...
Fixes issue 5878.
2013-01-10 13:35:56 -05:00
3ebe0718b8
Change theme selection to wxChoice.
2013-01-10 00:22:28 -05:00
14b8d3f107
Add support for german region flag. Still need to change image. (currently using a copy of europe flag)
2013-01-09 22:53:04 -06:00
a8a71fdd8c
Resize the KDE theme's "Open" icon from 24x24px to 22x22px to match the rest of the icons.
2013-01-09 20:57:10 -06:00
6598462aba
Display error messages when failing to compress/decompress games.
...
Fixes issue 4681.
2013-01-09 20:02:46 -06:00
488a679ca7
use pulseaudio "simple" api
2013-01-09 17:45:16 -06:00
bff02b3b73
Merge branch 'arb_framebuffer' into GLSL-master
...
Conflicts:
Source/Plugins/Plugin_VideoOGL/Src/FramebufferManager.cpp
Source/Plugins/Plugin_VideoOGL/Src/RasterFont.cpp
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2013-01-09 11:00:26 +01:00
84debc17d5
fix msaa
...
blitting between msaa fbos may not scale. So we need to resolve the efb before swapping.
2013-01-09 01:50:52 +01:00
00d303eead
clean up FifoPlayerDlg::OnBeginSearch a bit
2013-01-08 14:43:58 -06:00
815fd197d3
Fix a potential memleak in FifoPlayerDlg
2013-01-08 21:27:04 +01:00
b06f30f845
Remove the per pixel depth option.
...
Depth calculations are always done in the pixel shader now.
Due to the unpredictability of our zcomploc hacks this commit probably changes the behavior of some games which use zcomploc.
2013-01-08 18:16:48 +01:00
09197e0ffc
X11: Disable OSD hotkeys when the corresponding option is disabled.
2013-01-08 18:16:47 +01:00
6bd8474d05
Change the application name to "Dolphin Emulator" (from "Dolphin-emu").
2013-01-07 17:05:51 -06:00
bb7c262539
Add a linux .desktop file to add dolphin-emu to the menu, and install it
...
when running 'make install'.
2013-01-07 16:50:48 -06:00
4d6056f146
Added GC Steering Wheel emulation.
...
To set it up, change the Port 1 controller to "Steering Wheel" under the GameCube tab. This will tell the game that you have a force feedback steering wheel connected.
In the Gamecube Pad Settings, change the Rumble Motor to "Constant".
Configure the controls:
Main Stick Left/Right = Steer Left/Right
Main Stick Up = Accelerate
Main Stick Down = Brake
Thanks to ulao for the device communications info.
2013-01-04 14:08:09 +11:00
4f531fe122
Remove unused progressive scan option from iso properties, and disable audio settings while a game is running.
2013-01-03 16:43:58 -05:00
3da05af30a
Fix truncated names and descriptions in the game list on linux.
2013-01-03 10:35:07 -06:00
91023e133b
Move widescreen hack to enhancements tab.
2013-01-02 01:21:20 -05:00
4c374cd58a
Improve file search speeds by deleting an unused file.
2012-12-31 15:27:36 +13:00
bcf1f54c65
Optimized the Dolphin SEO process a bit
2012-12-31 02:31:55 +01:00
64afbade33
Fix 4 warnings on OSX
2012-12-30 04:32:37 -06:00
5ccbcf455e
Added preliminary GameCube Steering Wheel emulation via a PC Force Feedback Steering Wheel.
2012-12-30 13:41:48 +11:00
670ca7e993
Toggle wiimote status based on the actual status, instead of some dumb checkbox that is almost never even right.
...
The checkbox is still wrong when starting emulation, but it's now purely cosmetic.
Actually fixes issue 5594.
2012-12-29 02:48:20 -05:00
3ec3b7683e
Fix (dis)connecting wiimotes via hotkey.
...
Fixes issue 5594.
2012-12-28 11:21:08 -05:00
c303669dd0
Clean up some messy code issues that have been annoying me.
2012-12-28 09:58:06 -06:00
af2820ac88
Don't show multiple exit confirmation dialogues.
...
Pause emulation while waiting for confirmation to exit.
Fixes issue 5822.
2012-12-28 03:39:34 -05:00
d7f43c7a68
remove cg from windows project files
2012-12-28 01:08:29 +01:00
316a33d1e6
Merge branch 'master' into GLSL-master
...
Conflicts:
Source/Core/DolphinWX/Src/VideoConfigDiag.h
Source/Plugins/Plugin_VideoOGL/Src/GLUtil.h
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureCache.cpp
Source/Plugins/Plugin_VideoOGL/Src/TextureConverter.cpp
2012-12-27 10:36:54 +01:00
67c1c6b062
Merge branch 'GLES-software'
2012-12-26 12:54:58 -06:00
5169804a61
Remove duplicated X11 code.
2012-12-26 12:12:26 -06:00
93f72d8463
Don't add superfluous whitespace to the CMake file
2012-12-26 11:07:33 -06:00
9a58f9a3bb
Rename another function...
2012-12-26 00:34:09 -06:00
c43a0dac2e
Add to more than 32bit debug
2012-12-26 00:25:49 -06:00
fa9abfdc42
Add a include directory
2012-12-26 00:22:17 -06:00
a35c5a7f22
Add a include directory
2012-12-26 00:20:09 -06:00
f4e7a280a9
Remove cg.lib from some files for Windows and renaming a function.
2012-12-26 00:07:43 -06:00
e9099459bb
Maybe fix Windows compiling.
2012-12-25 22:52:30 -06:00
0de073edea
When using the "Keep window on top option" make sure that the effect of
...
that option ends when emulation ends when using render to main.
2012-12-25 21:12:51 -06:00
c884dbf654
Mistype in WX.cpp
2012-12-25 19:18:03 -06:00
01953ff64a
Rename the interface files and hopefully fix OSX building.
2012-12-25 19:08:24 -06:00
b3ed3bdb91
Define NvOptimusEnablement to tell the Nvidia driver we need high performance
2012-12-25 13:51:13 +01:00
b3714f4874
Don't show compress iso option for wbfs and ciso files.
...
Fixes issue 5809.
2012-12-25 06:31:31 -05:00
4798524b75
Dolphin 3.5 release.
2012-12-24 21:29:24 +01:00
249afa5eac
Change copyright year to 2013 in the about dialog.
2012-12-24 19:50:16 +01:00
2dd570c880
Should completely fix game list sorting.
2012-12-24 13:29:19 -05:00
53398ca5d8
Remove GLSL option from video options
2012-12-24 12:22:02 -06:00
da5e61b45b
Fix another sorting bug.
2012-12-24 13:04:57 -05:00
14a31d9b3a
Fix sorting bug.
2012-12-24 12:48:14 -05:00
09b05c0f6c
Add header guards to InterfaceBase.h
2012-12-24 09:46:37 -06:00
eedca57270
Revert "support retina display"
...
This reverts commit 3aa9901618
2012-12-24 08:01:44 +13:00
f865450b5a
Changed to non conflicting overload.
2012-12-24 00:00:45 +13:00
4dbd2ed7fb
Unused variable.
2012-12-23 23:59:44 +13:00
3aa9901618
support retina display
2012-12-23 21:33:52 +13:00
3a2c0b778a
Fixed stupid bool to int conversion warnings.
2012-12-23 19:53:15 +13:00
1c01fd9c9d
Remove warning about ambigious if/else.
2012-12-23 19:24:30 +13:00
d66dd970cd
Implement select audio backend CLI option.
...
Fixes issue 4920.
2012-12-22 18:25:52 -05:00
16ac7803f1
Add support for recording bongos.
2012-12-18 23:20:26 -05:00
1bd42b7acc
Merge branch 'rehash-msw-cursor-hide'
2012-12-18 08:07:47 -06:00
f6ef6fa0d9
I had the wrong header for Windows in GLVideoInterface.h
2012-12-17 16:23:02 -06:00
f2004b2474
Blindly add WGL.cpp file to the Windows project file. Just for Neo
2012-12-17 16:19:55 -06:00
6099148541
Blind coding fail
2012-12-17 15:33:19 -06:00
8082323c44
Should hopefully fix OSX
2012-12-17 15:29:38 -06:00
3cb5dffbc9
Missed the video interface files.
2012-12-17 15:01:52 -06:00
b78f5debe6
Initial push of GLES and GLUtil file breakup.
2012-12-17 14:54:20 -06:00
98ed34d50b
Use wxNullCursor to put the cursor back to its default instead of
...
explicitly setting the cursor to the arrow.
2012-12-17 11:32:10 -06:00
f1cc5c2ff9
Define the icon for "dolphin". The IDI_ICON1 seems to be preempted by the wx resource. This one does not.
2012-12-17 08:33:42 -06:00
4c7b63cf0e
Save secondary list sorting.
...
Allow sorting by platform ascending.
Fixes issue 5774.
2012-12-17 06:08:45 -05:00
0a918782cf
Reorder the inclusions to hopefully fix the icon issue.
2012-12-17 00:11:59 -06:00
ff7041804c
Make sure that the wxWidgets manifest does not override the dolphin one.
2012-12-16 23:55:22 -06:00
832a5a0b26
Add the resource include in only one place for all builds.
2012-12-16 23:39:05 -06:00
d34fb84734
Add the resource inclusion to the other builds.
2012-12-16 23:21:11 -06:00
a581c75a37
Make the resource include path relative.
2012-12-16 22:52:29 -06:00
d1a812231e
Rework the way that windows mouse cursor hiding is done to use the built
...
in wxWidgets methods.
2012-12-16 21:32:14 -06:00
8838944cd3
Revert "Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956."
...
This reverts commit 884006e4c8
2012-12-15 00:04:10 -06:00
884006e4c8
Use the global ::wxSetCursor instead of the local one from our panel object. Should close 3956.
2012-12-14 15:19:22 -06:00
a6374f25fd
Fix OSX build once again. Apparently OSX needs to get with the times.
2012-12-10 10:31:08 -06:00
e85438cba0
Clean up gcc/g++ compiler warnings that have accumulated.
2012-12-10 00:40:28 -06:00
43d673b576
Save game list sorting.
...
Fixes issue 5771.
2012-12-08 23:53:50 -05:00
4fc0125fb3
Fix OS X 10.6 compatibility.
...
Patch by mathieudel.
2012-12-07 19:49:08 +01:00
983d5d1f73
Making cheats manager resizeable, maximizable, hideable (parentless), higher by default.
2012-12-03 20:58:25 -05:00
97f5b1665f
what is this even...
2012-11-26 02:11:52 -05:00
d6697d50c7
Added option to toggle the display of On-Screen Display messages in the Interface tab.
2012-11-16 23:54:48 +01:00
a135512f9b
Build fix.
...
Fixes issue 5674.
2012-11-16 23:46:28 +01:00
3a8e8af2d5
Merge movie-fixes.
2012-11-16 12:07:22 -05:00
14aa7150d9
Add option for author name for movies. Also, minor cleanup for previous options i've added.
2012-11-14 16:23:20 -05:00
a5d210129d
Add an on screen lag counter.
2012-11-11 17:57:06 -05:00
35e5a1e592
Add an option to pause on the last frame of a movie.
2012-11-10 21:57:31 -05:00
e8c0fea16e
Retain dsp JIT setting when switching to HLE. Fixes issue 5691.
2012-11-09 12:08:56 -05:00
d13163380d
Bye mamario, you won't be missed
2012-11-02 02:48:55 +01:00
d032c40a58
- Added a new wilcard for importing savegames, which basically shows all saves (gci, gcs and sav). This is set as default (I really got frustrated of having to change the type every single time when making tests for GCMM, and I think it makes more sense at user level to just show all saves regardless the format)
...
- In icon retrieving I removed the "format check" as it shouldn't really matter to have mixed icon formats. Also removed the "Time splitters hack" as there's no reason for it since we are only checking the last 3 bits and I'm pretty sure having bits 1 and 2 set is the same as having them unset.
- Icon retrieving uses AnimSpeed as stop signal (every icon must have an speed set, the first speed that is 0 means there are no more icons)
- Also, in icon retrieving I added support for "blank frames"(Luigi's Mansion and Pikmin that I know of). With this the base for icon animation is complete.
- Fixed PSOIII savegame patch which was wrong before.
Signed-off-by: LPFaint99 <lpfaint99@gmail.com>
2012-10-29 21:02:59 -07:00
f7edfc0118
FifoPlayer: Copy selected object commands to clipboard when pressing ctrl+c
2012-10-22 12:32:57 +02:00
a366521d13
Correct the hotkey labels for undo load state, and load last overwritten state buttons
2012-10-18 03:30:44 -04:00
degasus