Commit graph

33851 commits

Author SHA1 Message Date
Nicholas Marcott
70ebcfa74d remote copying overwrite/users from slippi-desktop-app 2021-01-10 13:48:33 +09:00
Nicholas Marcott
74530b38e7 remove echo set-env 2021-01-10 13:11:35 +09:00
Nicholas Marcott
067f362843 rm 2to3 python link before installing brew dependencies 2021-01-09 23:26:48 +09:00
R2DLiu
17950c77e2 Set some defaults for config. look into music bug 2020-12-31 22:25:20 -05:00
R2DLiu
fcb44de8a4 even with 2.2.3. missing dumping stuff and couts 2020-12-27 19:28:23 -05:00
R2DLiu
ffc708972b Don't remove xfb efb cache layer for playback dolphin 2020-12-27 18:00:48 -05:00
R2DLiu
23aee0ebe0 add back in boot default iso behavior 2020-12-26 23:32:58 -05:00
R2DLiu
404f362bd5 merge 2020-12-26 21:29:40 -05:00
David Liu
a187c66ff9
Merge pull request #44 from r2dliu/input_lag
Input lag
2020-12-26 21:22:33 -05:00
R2DLiu
8a71f3c421 revert flush removal 2020-12-26 21:22:07 -05:00
R2DLiu
33af54b797 Fix login fullscreen issue. Merge master 2020-12-26 20:42:01 -05:00
R2DLiu
81968b9e3c Merge branch 'master' of https://github.com/r2dliu/dolphin into input_lag 2020-12-26 17:39:16 -05:00
R2DLiu
084e805a0a even with ishii 148fc7f36727c5a6947386368acf6066d61c11a4 2020-12-07 00:58:00 -05:00
R2DLiu
c6c92764a8 remove download gecko codes capability 2020-12-07 00:44:53 -05:00
R2DLiu
4e00af9220 even with 5ae73c8e228e0eb8bc3368fbb96b15685d0f3ef4 2020-12-07 00:42:31 -05:00
R2DLiu
6d3cea0093 new codes, even with d3398cb929dda567fa515738cbf36a6f18a5e8a0 2020-12-07 00:31:03 -05:00
R2DLiu
f933b3f42d Merge branch 'master' of https://github.com/r2dliu/dolphin into task/update 2020-12-06 23:23:26 -05:00
R2DLiu
a41c72e2d9 Working speed controls 2020-12-05 20:42:10 -05:00
David Liu
04eb363df3
Merge pull request #64 from r-burns/darwin-objc-flags
Apply -fno-objc-exceptions flag for ObjC sources only
2020-12-04 00:37:24 -05:00
Ryan Burns
547c3a6805 Disable fmt exceptions 2020-12-03 20:01:07 -08:00
Ryan Burns
7c8576085a Apply -fno-objc-exceptions flag for ObjC sources only 2020-12-03 18:43:10 -08:00
David Liu
fdea0f3cc0
Merge pull request #63 from JosJuice/fix-osd-merge
Fix merge of OnScreenDisplay.cpp which I messed up
2020-12-02 18:31:37 -05:00
JosJuice
f13d09516f Fix merge of OnScreenDisplay.cpp which I messed up
I accidentally discarded the changes made in upstream.

Also fixing the include order while I'm at it.
2020-12-02 10:54:57 +01:00
David Liu
fb1798791f
Update Readme.md 2020-12-02 00:33:36 -05:00
David Liu
0f94aa9ef2
Merge pull request #62 from JosJuice/merge-upstream
Merge remote-tracking branch 'upstream/master'
2020-12-02 00:26:56 -05:00
R2DLiu
a218374541 Merge branch 'master' of https://github.com/r2dliu/dolphin 2020-12-02 00:26:14 -05:00
R2DLiu
8ae8a60cd1 add new command line argument for hiding seekbar 2020-12-02 00:26:06 -05:00
Nikhil Narayana
c17133df16
Merge pull request #56 from r2dliu/fix/ci
stop using deprecated set-env
2020-12-01 15:26:34 -08:00
JosJuice
24a62eec41 Merge remote-tracking branch 'upstream/master' into merge-upstream
# Conflicts:
#	CMakeLists.txt
#	CMakeSettings.json
#	Data/Sys/GameSettings/GLR.ini
#	Data/Sys/GameSettings/HA9.ini
#	Data/Sys/GameSettings/MB3.ini
#	Data/Sys/GameSettings/MBA.ini
#	Data/Sys/GameSettings/MCV.ini
#	Data/Sys/GameSettings/MCY.ini
#	Data/Sys/GameSettings/NAK.ini
#	Data/Sys/GameSettings/NAL.ini
#	Data/Sys/GameSettings/NAT.ini
#	Data/Sys/GameSettings/R8P.ini
#	Data/Sys/GameSettings/R9I.ini
#	Data/Sys/GameSettings/REF.ini
#	Data/Sys/GameSettings/RES.ini
#	Data/Sys/GameSettings/RMHE08.ini
#	Data/Sys/GameSettings/RMHP08.ini
#	Data/Sys/GameSettings/SE2.ini
#	Data/Sys/GameSettings/WW2.ini
#	Data/Sys/GameSettings/WW3.ini
#	Data/Sys/GameSettings/WWI.ini
#	Externals/Bochs_disasm/Bochs_disasm.vcxproj
#	Externals/FreeSurround/FreeSurround.vcxproj
#	Externals/LZO/LZO.vcxproj
#	Externals/SFML/build/vc2010/SFML_Network.vcxproj
#	Externals/bzip2/bzip2.vcxproj
#	Externals/cpp-optparse/cpp-optparse.vcxproj
#	Externals/cubeb/msvc/cubeb.vcxproj
#	Externals/curl/curl.vcxproj
#	Externals/curl/lib/CMakeLists.txt
#	Externals/discord-rpc/src/discord-rpc.vcxproj
#	Externals/ed25519/ed25519.vcxproj
#	Externals/enet/enet.vcxproj
#	Externals/glslang/glslang.vcxproj
#	Externals/imgui/imgui.vcxproj
#	Externals/liblzma/liblzma.vcxproj
#	Externals/libpng/png/png.vcxproj
#	Externals/libusb/libusb_static_2013.vcxproj
#	Externals/mbedtls/mbedTLS.vcxproj
#	Externals/miniupnpc/miniupnpc.vcxproj
#	Externals/minizip/minizip.vcxproj
#	Externals/picojson/picojson.vcxproj
#	Externals/pugixml/pugixml.vcxproj
#	Externals/soundtouch/SoundTouch.vcxproj
#	Externals/xxhash/xxhash.vcxproj
#	Externals/zlib/zlib.vcxproj
#	Externals/zstd/zstd.vcxproj
#	Languages/Languages.vcxproj
#	Source/Android/jni/MainAndroid.cpp
#	Source/Core/AudioCommon/AudioCommon.vcxproj
#	Source/Core/Common/Common.vcxproj
#	Source/Core/Common/Common.vcxproj.filters
#	Source/Core/Common/Logging/Log.h
#	Source/Core/Common/StringUtil.cpp
#	Source/Core/Core/CMakeLists.txt
#	Source/Core/Core/ConfigManager.cpp
#	Source/Core/Core/ConfigManager.h
#	Source/Core/Core/Core.vcxproj
#	Source/Core/Core/Core.vcxproj.filters
#	Source/Core/Core/HotkeyManager.cpp
#	Source/Core/Core/State.cpp
#	Source/Core/DiscIO/DiscIO.vcxproj
#	Source/Core/DolphinNoGUI/DolphinNoGUI.vcxproj
#	Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
#	Source/Core/DolphinQt/DolphinQt.vcxproj
#	Source/Core/InputCommon/InputCommon.vcxproj
#	Source/Core/InputCommon/InputCommon.vcxproj.filters
#	Source/Core/UICommon/UICommon.vcxproj
#	Source/Core/UpdaterCommon/UpdaterCommon.vcxproj
#	Source/Core/VideoBackends/D3D/D3D.vcxproj
#	Source/Core/VideoBackends/D3D12/D3D12.vcxproj
#	Source/Core/VideoBackends/D3DCommon/D3DCommon.vcxproj
#	Source/Core/VideoBackends/Null/Null.vcxproj
#	Source/Core/VideoBackends/OGL/OGL.vcxproj
#	Source/Core/VideoBackends/Software/Software.vcxproj
#	Source/Core/VideoBackends/Vulkan/Vulkan.vcxproj
#	Source/Core/VideoCommon/OnScreenDisplay.cpp
#	Source/Core/VideoCommon/OnScreenDisplay.h
#	Source/Core/VideoCommon/VideoCommon.vcxproj
#	Source/Core/WinUpdater/WinUpdater.vcxproj
#	Source/DSPTool/DSPTool.vcxproj
#	Source/PCH/pch.vcxproj
#	Source/UnitTests/UnitTests.vcxproj
2020-12-01 23:44:32 +01:00
JosJuice
5be5b7e0b7 Fix OnScreenDisplay.cpp formatting
Done automatically using clang-format. Merges with upstream
are pretty nasty to handle when the indentation is wrong.
2020-12-01 22:30:22 +01:00
JosJuice
5abae61a8c Translation resources sync with Transifex 2020-11-30 21:53:49 +01:00
LC
ea2ec64ab4
Merge pull request #9298 from Ebola16/AClearLog
Android: Clear Log file
2020-11-30 09:34:57 -05:00
LC
558ba19314
Merge pull request #9301 from Ebola16/ADebug
Android: Add "Disable Fastmem" debug setting
2020-11-30 09:33:59 -05:00
LC
35d8867056
Merge pull request #9302 from leoetlino/tooltip-translations
Qt: Add missing tr calls for tooltip descriptions
2020-11-30 09:33:05 -05:00
Léo Lam
a5880fa402
Qt: Add missing tr calls for tooltip descriptions 2020-11-30 14:04:08 +01:00
R2DLiu
fd57c9eca3 Merge branch 'master' of https://github.com/r2dliu/dolphin into task/update 2020-11-29 20:17:51 -05:00
David Liu
d91d146c0e
Merge pull request #61 from r2dliu/test2
universal resolution
2020-11-29 20:15:34 -05:00
R2DLiu
510f848777 universally scales across all resolutions 2020-11-29 20:14:40 -05:00
R2DLiu
2007db85e4 bad 2020-11-29 17:46:24 -05:00
R2DLiu
9ac3a60020 bad 2020-11-29 17:45:54 -05:00
Ryan Meredith
777da89830 Android: Add "Disable Fastmem" debug setting 2020-11-29 17:41:10 -05:00
r2dliu
c93f803d9a more spectator additions 2020-11-29 12:07:19 -05:00
Léo Lam
d043c5f81d
Merge pull request #9153 from iwubcode/qt_custom_tooltip
Remove description box in graphics tabs and use custom tooltips instead
2020-11-29 12:37:31 +01:00
Ryan Meredith
f18cd9e288 Android: Clear Log file 2020-11-29 02:37:22 -05:00
r2dliu
58912f9d91 fix compile 2020-11-28 22:53:48 -05:00
r2dliu
a3672b08e2 Merge branch 'master' of https://github.com/r2dliu/dolphin into task/update 2020-11-28 22:53:40 -05:00
David Liu
20d27dce4b
Merge pull request #55 from r2dliu/playback-controls-refactor
Playback controls refactor
2020-11-28 22:52:20 -05:00
r2dliu
99a801752b pull in spectate class 2020-11-28 20:31:30 -05:00
Léo Lam
361bf25cf8
Merge pull request #9254 from flagrama/fallback-region-selection
Fallback Region Option
2020-11-29 00:19:15 +01:00
Léo Lam
738e1a6dbb
Merge pull request #9297 from JosJuice/movie-game-id-comparison
Movie: Fix 83b9fef regressions
2020-11-29 00:09:30 +01:00