Matthew Parlane
934e150596
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
Source/Core/Core/Src/ConfigManager.cpp
Source/Core/Core/Src/HLE/HLE_OS.h
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.h
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.h
2013-04-24 00:48:00 +12:00
Pierre
9a8dd7963e
Merge branch 'dspjit'
...
Conflicts:
Source/Core/Core/Src/DSP/Jit/DSPJitExtOps.cpp
Source/Core/Core/Src/DSP/Jit/DSPJitMisc.cpp
Source/Core/Core/Src/DSP/Jit/DSPJitRegCache.cpp
Source/Core/Core/Src/DSP/Jit/DSPJitUtil.cpp
2013-04-21 12:29:18 +02:00
lioncash
d244bca1f5
Fix a bunch of random typos in comments and logging.
...
Also update the comment headers for two functions in GCMemcard.cpp.
2013-04-19 09:21:45 -04:00
Ryan Houdek
491ffabb56
Android Clang doesn't support TLS, so do the same thing as OSX.
2013-04-18 22:52:53 -05:00
Ryan Houdek
f811d11863
Fix clang building the std headers.
2013-04-18 22:52:05 -05:00
Ryan Houdek
d68955c539
Clang uses __clear_cache instead of __builtin___clear_cache like GCC
2013-04-18 22:50:58 -05:00
Lioncash
bab9963b00
New license header introduced for DiscIO, AudioCommon, InputCommon, VideoCommon, and Common projects.
2013-04-17 23:09:55 -04:00
lioncash
ef85b9af45
Update the license file text (change SVN to Git) in all projects except Core since I was told a merge was happening soon. So for the sake of the merge going smoothly, I'll fix that when I remove the tab/space mismatches from the Core project.
...
Also, some tab/space mismatches removed from VideoOGL, and some places I missed in VideoDX[number] projects.
Now, the Core is literally the only project with tab/space mismatches (on a large scale).
2013-04-15 16:28:55 -04:00
Ryan Houdek
bde7ea00ef
Removes the Java ButtonManager for one in the C++ source so the OSD class can call in to it each frame for drawing the buttons. Copy our assets to the dolphin-emu directory for now. Remove NativeRenderer, ButtonManager, and Button Java classes since they aren't used anymore. Buttons A, B, and Start all work and are drawn on screen now. Button input on Android is still a bit hacky, needs a proper controller interface still. Android specific button drawing code is still hanging out in SWRenderer.cpp
2013-04-14 20:39:56 -05:00
Pierre
6b5b8ab5be
Implement and use MOVZX(64, 32,...)
...
Probably better to keep that same-register-MOV assert useful. Also,
explicit type extension documents whats happening.
Internally, this boils down to the original MOV, but without the assert.
2013-04-14 13:34:29 +02:00
Pierre
701b5916ab
Revert "In memory of calc84."
...
This reverts commit 539bf405f2
.
2013-04-14 13:34:29 +02:00
Ryan Houdek
605bbf5ca8
Merge remote-tracking branch 'origin/master' into Android-trash
2013-04-13 00:58:37 -05:00
Ryan Houdek
6d9c0c8863
Merge in latest changes to ArmEmitter from the PPSSPP crew. Should fix the dumb random crashes I had from IOS icache clearing not initializing a value.
2013-04-12 11:59:19 -05:00
Matthew Parlane
5eeed7aa9f
This should never have been committed. Sorry.
2013-04-12 00:14:38 +12:00
Matthew Parlane
0c9d8d34e1
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/CMakeLists.txt
2013-04-11 19:55:36 +12:00
Jordan Woyak
385d8e2b15
ChunkFile has allowed me to accidentally "Do" a non-POD for the last time!
2013-04-09 19:02:22 -05:00
Jordan Woyak
71f4bf25a7
Make FifoQueue take advantage of rvalue references to avoid std::vector copies.
2013-04-04 19:34:50 -05:00
Ryan Houdek
d06379fc59
Fix 32bit Linux. GCC's lrotl/lrotr instrinsic functions are 32bit when building for 32bit, we require 64bit at all times, so keep using our own instead.
2013-04-03 12:43:17 -05:00
Ryan Houdek
b5676fe82b
Fix GCC 4.8 compiling. GCC 4.8 now defines _rotl/_rotr/_lrotl/_lrotr.
2013-04-03 10:52:26 -05:00
Jordan Woyak
d951c4c374
real buildfix
2013-04-02 13:07:51 -05:00
Jordan Woyak
c65473d9d3
Probably a sloppy buildfix.
2013-04-01 23:30:05 -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
Pierre Bourdon
194ada2481
More MSVC 2010 build fixes
2013-03-29 07:55:56 -07:00
Pierre Bourdon
38db520617
MSVC 2010 does not have <mutex> or <thread> either, adding the Std* files back
2013-03-29 07:53:45 -07:00
Pierre Bourdon
a8513e4605
Re-add StdConditionVariable, MSVC 2010 does not support <condition_variable>
2013-03-29 07:42:41 -07:00
Pierre Bourdon
4895e38bd5
This change might work better if I git add the files
2013-03-29 07:31:15 -07:00
Pierre Bourdon
b73941c0ea
Use libc++ for Mac OS X builds now that we require >= 10.7 anyway
2013-03-29 07:29:31 -07:00
Lioncash
b1dd14c319
Fix a slight leak in LogManager.
...
m_debuggerLog wasn't ever deleted in the destructor.
2013-03-27 23:39:48 -04:00
skidau
7784fa4c67
Merge branch 'master' into wii-network
...
# By Ryan Houdek (185) and others
# Via degasus (12) and others
* master: (625 commits)
Revert "Don't open/close file for every file operation." as it was crashing PokePark in Windows builds.
Array overrun fixed in VertexShaderCache for the DX11 plugin.
Fixed DSPTool build.
Windows build fix
Go back to assuming every HID device is a wiimote on Windows. Fixed issue 6117. Unfixed issue 6031.
VideoSoftware: Improve fog range adjustment by using less magic and more comments.
revert RasterFont for VideoSoftware
ogl: fix virtual xfb
Windows build fix from web interface...
Adjusted the audio loop criteria, using >= on the Wii and == on GC. This fixes the audio static that occurred in Wii games after hours of play.
Forced the exception check only for ARAM DMA transfers. Removed the Eternal Darkness boot hack and replaced it with an exception check.
VideoSoftware: Implement fog range adjustment, fixing issue 6147.
implement 4xSSAA for OGL
move ogl-only settings into backend
Fix description of disable fog, and move it to enhancements tab.
Reverted rd76ca5783743 as it was made obsolete by r1d550f4496e4.
Removed the tracking of the FIFO Writes as it was made obsolete by r1d550f4496e4.
Forced the external exception check to occur sooner by changing the downcount.
Mark the Direct3D9 backend deprecated.
Prefer D3D11 and OpenGL over D3D9 by default.
...
Conflicts:
CMakeLists.txt
Source/Core/Common/Common.vcxproj.filters
Source/Core/Common/Src/CommonPaths.h
Source/Core/Core/Core.vcxproj.filters
Source/Core/Core/Src/Core.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2013-03-27 13:19:23 +11: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
NeoBrainX
bb3ce1f8d3
Mark the Direct3D9 backend deprecated.
2013-03-23 23:53:19 +01:00
NeoBrainX
816020f4eb
Prefer D3D11 and OpenGL over D3D9 by default.
2013-03-23 23:52:30 +01:00
Ryan Houdek
d11679a06e
Android mega commit of trash.
2013-03-19 21:53:09 -05:00
lioncash
edd9d0e0ef
Clean up more space/tab mismatches in AudioCommon, Common, and VideoCommon.
...
Not planning to touch Core since it's the most actively changed part of the project.
2013-03-19 21:51:12 -04:00
Ryan Houdek
7d74293170
Fix a typo in ArmEmitter noticed by LionCash.
2013-03-18 08:45:33 -05:00
Ryan Houdek
9ae9910490
Finish up VFP cleanup. A few more instructions are left for VFP, and a bunch of NEON ones if it will ever be used.
2013-03-18 00:10:56 +00:00
Pierre Bourdon
612c2e8516
Fix converting the charset of an empty string. Thanks to MrData on the forums for reporting this issue.
2013-03-17 14:37:00 +01: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
Ryan Houdek
e6c6053fcc
Beginning of VFP cleanup. Will finish when I have the hardware in front of me.
2013-03-14 10:45:26 -05:00
Ryan Houdek
b4830be9bc
Actually set the bIDIVa value in the ARM CPUDetect.
2013-03-14 08:48:01 -05:00
Ryan Houdek
c93f7760ce
Really clean up all the emitter loadstores on ARM. If a ARM device supports VFPv4, then it supports IDIVA, so handle that in CPUDetect.
2013-03-14 01:50:38 +00:00
Ryan Houdek
202e2fa5c8
Add a new WriteNewStoreOp emitter function for beginning of rewrite of the Arm Emitter LoadStores. Will finish when I have the hardware in front of me to test on.
2013-03-13 14:08:54 -05:00
degasus
382be2aabd
Merge branch 'master' into GLSL-master
...
Conflicts:
.gitignore
2013-03-12 11:28:56 +01:00
Ryan Houdek
8406d9972d
Fix JIT from rebasing on PPSSPP ArmEmitter.
2013-03-12 02:35:29 +00:00
Ryan Houdek
b94b4a9e8f
Rebase ArmEmitter on PPSSPP's base. The loadstores are making my heart cry at this point.
2013-03-11 13:57:55 -05:00
Ryan Houdek
be217bf096
Add a comment about Qualcomm in load stores.
2013-03-07 20:28:18 -05:00
degasus
12e84f918a
Merge branch 'master' into GLSL-master
...
this fix debug build
2013-03-07 17:05:32 +01:00
Ryan Houdek
f3528277c4
Make sure to mask out the FPU rounding mode correctly. Good spot from LionCash.
2013-03-07 09:52:38 -06:00
degasus
eaa5a77d9e
fix debug build
2013-03-06 20:47:48 +01: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
degasus
8d5299c20b
Merge branch 'vertex-loader-cleanup'
2013-03-06 14:08:02 +01:00
Ryan Houdek
d6558e1c31
Make the (V)LDR/(V)STR instructions support negative offsets. This fixes a bug where Arm Jit couldn't load the top 33 FPRs. Also makes it so the core can access all GPRs, FPRs, and SPRs in ppcState. This increases VPS 15-20 on SSBM intro movie on ODROIDX
2013-03-06 01:51:59 +00:00
Jordan Woyak
2095641af0
OK, seriously, buildfix. I shouldn't even have commit access!
2013-03-05 16:17:45 -06:00
Jordan Woyak
b34991c4c3
Buildfix for real.
2013-03-05 16:08:26 -06:00
Jordan Woyak
fe3a54d7fd
Buildfix!
2013-03-05 15:48:57 -06: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
Jordan Woyak
f3f89e1d00
Merge branch 'master' into vertex-loader-cleanup
...
Conflicts:
Source/Core/Common/Src/CommonFuncs.h
Source/Core/VideoCommon/Src/VertexLoader.cpp
2013-03-04 15:47:56 -06:00
Jordan Woyak
814c2ffdfd
Fix some leaking file handles and buildfix probably.
2013-03-03 19:20:35 -06:00
Jordan Woyak
989f0663eb
Make "Crypto" file opening unicode-safe on Windows.
2013-03-03 19:14:13 -06:00
Jordan Woyak
c07b8a6e37
Fix more of what I broke.
2013-03-03 17:08:41 -06:00
Jordan Woyak
aeb4fc9846
Fix what I broke.
2013-03-03 02:12:24 -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
b0630790c1
It's 2013! Why can't I use C++11 yet!?
2013-02-28 19:42:29 -06:00
Jordan Woyak
dea1e2827d
Open std::fstream in a unicode-safe manner.
2013-02-28 19:33:39 -06:00
NeoBrainX
1c9860246c
Build fixes for everyone!
2013-03-01 01:14:10 +01:00
NeoBrainX
7682ed22c6
Merge branch 'master' into perfqueries.
...
Conflicts:
Source/Core/VideoCommon/Src/VideoConfig.h
Source/Core/VideoCommon/VideoCommon.vcxproj.filters
Source/Plugins/Plugin_VideoDX11/Src/VertexManager.cpp
Source/Plugins/Plugin_VideoSoftware/Src/Rasterizer.cpp
Source/Plugins/Plugin_VideoSoftware/Src/Tev.cpp
2013-03-01 01:07:34 +01:00
Pierre Bourdon
07539b9a3f
Fix a StringUtil regression from the arm-noglsl merge
...
Fixes issue 6048. Thanks to Starscream for locating the regression.
2013-02-28 13:12:35 +01:00
Jordan Woyak
e82d976d2f
Buildfix for non-legacy OSes.
2013-02-27 20:55:19 -06:00
Jordan Woyak
65683ebc64
Hopefully fix all filename handling to support Unicode.
2013-02-27 20:03:06 -06:00
Jordan Woyak
69f7671ee8
Fix "Common" to build with "Unicode" project setting.
2013-02-27 19:19:38 -06:00
Jordan Woyak
0ea458b4dc
Add functions for converting between UTF-8/16.
2013-02-27 18:00:42 -06:00
Ryan Houdek
f1d727cf13
Merge latest ArmEmitter changes from ppsspp while we're at it.
2013-02-27 11:53:24 -06:00
Ryan Houdek
8c779bb242
Ah. I blame vim on this typo entirely.
2013-02-27 10:26:32 -06:00
Ryan Houdek
717b976875
ARM Support without GLSL
2013-02-26 13:49:00 -06:00
degasus
4883fa268f
Split VideoBackend::Cleanup from Shutdown.
...
First is called from ogl/d3d thread, second is called from emulation thread (x11...)
2013-02-26 16:42:32 +01:00
degasus
90ff648d00
shader cache based by git revision
2013-02-26 10:48:19 +01:00
Jordan Woyak
bd14ad5300
Merge branch 'master' into vertex-loader-cleanup
2013-02-25 17:55:44 -06:00
Jordan Woyak
46adbfa9ed
Merge branch 'real-wiimote-scanning'
2013-02-25 17:33:34 -06:00
Matthew Parlane
c30b8c9eae
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_FileIO.cpp
2013-02-23 17:02:58 +13:00
Jordan Woyak
6a13a4e5ed
Add template "swap" function to CommonFuncs.
2013-02-20 20:20:53 -06:00
Jordan Woyak
e9232280c4
Fix OSX!
2013-02-20 17:35:41 -06:00
Jordan Woyak
f3e91bc10d
Hopefully kill a stupid warning on Windows.
2013-02-20 17:30:34 -06: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
Jordan Woyak
fa9aafeed8
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.
2013-02-17 13:37:01 -06:00
Jordan Woyak
3330842505
Let's not CreateDir an empty string every time CreateFullPath is used, logging an error every time.
2013-02-17 01:33:22 -06:00
Jordan Woyak
206fdde933
Remove the core count from the cpu info OSD message. It was often wrong and not rather important.
2013-02-16 23:48:20 -06:00
Jordan Woyak
53aec6c476
Fix OGL perf queries and make them not slow!
2013-02-16 19:30:24 -06:00
Matthew Parlane
3d480c088f
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE.cpp
2013-02-09 20:13:11 +13:00
Jordan Woyak
8ce58759e3
Remove some old nonsense.
2013-02-07 23:52:50 -06:00
Glenn Rice
f7fa33f2d6
Fix remaining compiler warnings.
2013-01-31 15:29:29 -06:00
Matthew Parlane
bca2cac640
keys.bin support added.
...
Remove hollywood id from config.
Tidy HLE_Device_es.h (maybe)
Added const params to crypto stuff.
2013-01-29 01:18:53 +13:00
Matthew Parlane
2dd077028f
Merge branch 'master' into wii-network
2013-01-28 22:00:47 +13:00
Matthew Parlane
ca4ea817e0
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Common/Src/CommonPaths.h
Source/Core/Common/Src/FileUtil.h
Source/Core/Core/Src/HLE/HLE.cpp
Source/Core/Core/Src/PowerPC/Interpreter/Interpreter.cpp
2013-01-26 21:46:12 +13:00
Matthew Parlane
a354f47f98
Fixes for POLL on Linux and Mac.
2013-01-26 18:22:58 +13:00
degasus
d60cc373d1
Revert "Revert 30dd9c2
e9d00bf
db5f4c8
and bff0fae"
...
This reverts commit d0301ca89d
.
Conflicts:
.gitignore
2013-01-24 16:11:07 +01:00
lioncash
2db0c4270e
Fix a potential memory leak on non-windows systems.
...
Also added a FIXME to BPStructs.cpp and BPMemLoader.cpp
2013-01-24 08:21:08 -05: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
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
Jordan Woyak
a9ff3709e4
Attempt to make file searching stuff less crappy on Linux.
...
Supports a * search now.
2013-01-13 15:32:26 -06:00
Jordan Woyak
6f7b11b9be
themes directory stuffs
2013-01-13 14:12:19 -06:00
Matthew Parlane
6e58c50065
Merge branch 'master' into wii-network
2013-01-13 15:13:56 +13:00
Lioncash
dfc0c4b08d
Fix two signed/unsigned mismatch warnings.
...
Also tidied up SDCardUtil - made the variables make more sense (typewise)
2013-01-11 19:38:04 -05:00
Matthew Parlane
465df943a5
Merge branch 'master' into wii-network
2013-01-12 00:01:27 +13:00
Matthew Parlane
9754fda516
Merge branch 'wii-usb' into temp merge branch
...
Conflicts:
Source/Core/Common/Src/Log.h
Source/Core/Core/Core.vcxproj
Source/Core/Core/Core.vcxproj.filters
Source/VSProps/Dolphin.Win32.props
Source/VSProps/Dolphin.x64.props
2013-01-11 23:07:12 +13:00
Jordan Woyak
51a1d4cde7
Revert "Very tiny cleanup of ChunkFile.h."
...
int/size_t change without updating the rev# caused crash on Dolphin start
This reverts commit cf942450e0
.
2013-01-10 17:41:12 -06:00
lioncash
cf942450e0
Very tiny cleanup of ChunkFile.h.
...
Also changed the size parameter from DoVoid to size_t. As far as I know, that should never be negative.
Also changed the the count parameter of DoArray to size_t, this also should never be negative.
Got rid of some typecasts.
2013-01-10 17:38:38 -05:00
Jordan Woyak
4f4aa4860d
Fix a currently unused unique_lock function. Thanks to Lioncash.
2013-01-08 16:50:09 -06:00
Jordan Woyak
baa29f571c
Fix incorrect iterator usage in BreakPoints::Clear
2013-01-08 15:02:50 -06:00
NeoBrainX
4925a28f94
PixelShaderGen: Shader uid maintainance
2013-01-08 18:56:01 +01:00
NeoBrainX
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
NeoBrainX
876eee5e60
PixelShaderGen: Don't disable depth texture emulation if z writing is disabled (this is what VideoSoftware is doing).
2013-01-08 18:16:48 +01:00
Matthew Parlane
e8624cc0f2
Merge branch 'gdbstub' into wii-network
...
Conflicts:
Source/Core/Core/Src/ConfigManager.cpp
2013-01-08 21:21:05 +13:00
Matthew Parlane
5b96fb766f
Merge branch 'master' into wii-network
2013-01-08 21:18:48 +13:00
Matthew Parlane
0ec7ef4b99
Merge branch 'master' into gdbstub
2013-01-08 20:27:34 +13:00
Ryan Houdek
d0301ca89d
Revert 30dd9c2
e9d00bf
db5f4c8
and bff0fae
2013-01-07 13:47:34 -06:00
skidau
6df1dacca8
OpenAL for Windows initial commit
2013-01-07 12:16:04 +11:00
Matthew Parlane
b7fd1225ba
Started gdb stub support.
2013-01-06 23:28:27 +13:00
Matthew Parlane
67d0e66af4
Add generate id support.
...
Add hollywood id to config file.
SSL and WC24 have their own logs now.
2013-01-04 22:36:44 +13:00
Glenn Rice
9b51c99c6b
Make sure the null character is not included in the string.
2013-01-03 19:49:19 -06:00
Glenn Rice
12a606501c
Fix the name and description truncation issue in a cleaner way.
2013-01-03 19:21:20 -06:00
Glenn Rice
3da05af30a
Fix truncated names and descriptions in the game list on linux.
2013-01-03 10:35:07 -06:00
Matthew Parlane
e0c9a1fd09
Merge branch 'master' into wii-network
...
Conflicts:
Source/Core/Common/Src/CommonPaths.h
Source/Core/Core/CMakeLists.txt
Source/Core/Core/Src/Boot/Boot_BS2Emu.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_es.cpp
Source/Core/Core/Src/IPC_HLE/WII_IPC_HLE_Device_net.cpp
2013-01-01 23:28:46 +13:00
Matthew Parlane
d3f199273b
Fix warning level... someone let me commit this to master ;D
2013-01-01 19:23:45 +13:00
Matthew Parlane
86acde92e0
Merge branch 'master' into wii-usb
2012-12-30 17:09:35 +13:00
Matthew Parlane
539bf405f2
In memory of calc84.
...
http://dolphin-emu.org
2012-12-30 16:31:38 +13:00
Matthew Parlane
13bd235c11
Merge branch 'master' into wii-usb
2012-12-29 17:47:52 +13:00
Ryan Houdek
225d29f3f6
Fix this annoying warning in ChunkFile.h
2012-12-27 23:43:59 -06:00
rog
94116bf89c
Always use the right user dir on windows.
2012-12-26 19:55:45 -05:00
Ryan Houdek
67c1c6b062
Merge branch 'GLES-software'
2012-12-26 12:54:58 -06:00
Ryan Houdek
01953ff64a
Rename the interface files and hopefully fix OSX building.
2012-12-25 19:08:24 -06:00
degasus
bff0faea2d
Merge branch 'immediate-removal'
...
Conflicts:
Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
2012-12-25 12:39:00 +01:00
NeoBrainX
e3e14af0dd
Revert "VertexShaderGen: Fix a shader compilation error.". I'm an idiot :p
...
This reverts commit 4d868705fd
.
2012-12-24 21:29:24 +01:00
NeoBrainX
4d868705fd
VertexShaderGen: Fix a shader compilation error.
2012-12-24 19:50:16 +01:00
degasus
78ff8a769c
Merge branch 'osx-savegame-fix'
2012-12-24 13:30:59 +01:00
Matthew Parlane
f6418bd093
Merge branch 'master' into wii-usb
2012-12-24 12:58:15 +13:00
Matthew Parlane
59ec1fe180
Fix some random warnings.
2012-12-24 07:37:50 +13:00
degasus
bd0abb3d2f
revert last commit, add CheckInvalidState to VideoBackend
2012-12-23 13:32:23 +01:00
Matthew Parlane
a8ddc3e069
Function definition was not updated.
2012-12-24 00:00:25 +13:00
Ryan Houdek
2db4549174
Fix a memory leak based on Lioncash's patches.
2012-12-18 23:35:28 -06:00
Ryan Houdek
b78f5debe6
Initial push of GLES and GLUtil file breakup.
2012-12-17 14:54:20 -06:00
LPFaint99
351979795c
revert changes to banner background color
2012-12-16 15:29:25 -08:00
Ryan Houdek
3b559d89ec
If the HOME environment variable isn't set, fall back on to PWD. Closes 5584.
2012-12-14 11:47:12 -06:00
Ryan Houdek
532fdada96
Adds the Wii Korean settings file. It was handled in the wii-network branch in rev c42a6f156e
. Master handles the settings files differently. Until wii-network merges in to master, this closes issue 5642.
2012-12-14 11:37:26 -06:00
degasus
d0c4332d99
don't update vbo, if there are no changes in Renderer::Swap
...
Signed-off-by: Ryan Houdek <Sonicadvance1@gmail.com>
2012-12-13 15:28:13 -06:00