mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-08-26 12:16:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
33779 commits 10 branches 16 tags 1.7 GiB
Commit graph

33779 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
JosJuice
5642772ec4 Movie: Fix 83b9fef regressions 
1. Comparing string_views does not behave the same as strncmp
   in the case where SConfig's game ID is longer than 6 chars.
2. DTMHeader::GetGameID wasn't excluding null bytes for game IDs
   shorter than 6 chars.
3. == was accidentally used instead of !=.
 2020-11-28 23:35:55 +01:00
Léo Lam
cf32c4d479
 		Merge pull request #9296 from JosJuice/issue-12327-workaround 
JitArm64: Add a workaround for issue 12327
 2020-11-28 22:44:37 +01:00
JosJuice
d2a34fdab7 JitArm64: Add a workaround for issue 12327 
This issue is both severe and surprisingly difficult to find
the root cause of, so I think it would make sense to add a simple
hotfix for now. https://bugs.dolphin-emu.org/issues/12327
 2020-11-28 22:35:49 +01:00
JosJuice
01e0aba30f
 		Merge pull request #9294 from leoetlino/fix-assert 
Core: Fix an assertion that mistakenly uses a fmt format string
 2020-11-28 21:51:45 +01:00
Vincent Cunningham
db5aec019c
 		Add Fallback Region to configuration menu 
Fallback Region
A user-selected fallback to use instead of the default PAL

This is used for unknown region or region free titles to give them
the ability to force region to use. This replaces the current fallback region
of PAL. This can be useful if a user is trying to play a region free
tilte that is originally NTSC and expects to be run at NTSC speeds. This
may be done when a user attempts to dump a WAD of their own without
understanding the settings they have chosen, or could be an intentional
decision by a developer of a ROM hack that can be injected into a
Virtual Console WAD.

Remove using System Menu region being checked in GetFallbackRegion

Use DiscIO::Region instead of std::String for fallback

Add explanation text for Fallback Region
 2020-11-28 15:40:21 -05:00
Léo Lam
c0f7f91507
 		Core: Fix an assertion that mistakenly uses a fmt format string 
Unfortunately, adding a DEBUG_ASSERT_MSG_FMT isn't actually possible
right now because of compiler bugs:
https://github.com/dolphin-emu/dolphin/pull/9284

We could require a newer version of GCC (10) but that would require
updating GCC on the build machines.

For what it's worth, older versions of GCC (8, 9) are broken in
many ways: adding constexpr to some Matrix functions causes GCC 8
to generate bugged code that causes the Wii IR pointer to disappear,
which means that the generated builds are already unusable
(see https://dolp.in/i12324).

Additionally,  we've already had to add workarounds for those versions
in the format macros to fix compilation bugs. This time, it looks like
workarounds won't cut it; even applying the workaround
described in https://github.com/fmtlib/fmt/pull/1580 does not help.
 2020-11-28 21:11:27 +01:00
iwubcode
cc837a59d6 Core / DolphinQt: Add ini only option to force low-contrast tooltips 2020-11-28 11:49:14 -06:00
iwubcode
9c204428fe DolphinQt: Add tooltip support to Software Renderer Graphics tab 2020-11-28 11:49:14 -06:00
iwubcode
2bfb8ebf96 DolphinQt: Add tooltip support to Hacks Graphics tab 2020-11-28 11:49:14 -06:00
iwubcode
1673442794 DolphinQt: Add tooltip support to Advanced Graphics tab 2020-11-28 11:49:14 -06:00
iwubcode
d083dae7fd DolphinQt: Add tooltip support to Enhancements Graphics tab 2020-11-28 11:49:14 -06:00
iwubcode
b9eae86704 DolphinQt: Add tooltip support to General Graphics tab 2020-11-28 11:49:14 -06:00
iwubcode
a9271aa167 DolphinQt: Add the ability to show a tooltip for custom graphics controls 2020-11-28 11:49:14 -06:00
iwubcode
af0161cafd DolphinQt: Add generic tooltip controls 2020-11-28 11:49:14 -06:00
iwubcode
613d8b1cba DolphinQt: Remove description box handling from graphics widget and window 2020-11-28 11:49:14 -06:00
iwubcode
c754b02aae DolphinQt: Add BalloonTip which is built off of an internal Qt class. It gives the ability to show a tooltip with an arrow! 2020-11-28 11:49:14 -06:00
Léo Lam
a9845e0a3d
 		Merge pull request #9191 from sepalani/net-interface 
IP/Top: Add Android network interface
 2020-11-28 18:22:33 +01:00
Léo Lam
a34f19cb96
 		Merge pull request #9291 from lioncash/alert-audio 
AudioCommon: Convert alerts over to fmt-based variants
 2020-11-28 16:33:50 +01:00
Léo Lam
5a554e8e5d
 		Merge pull request #9292 from Dentomologist/fix-liblzma-config-on-macOS 
Fix liblzma config on macOS
 2020-11-28 16:32:56 +01:00
Dentomologist
6136ac82b9 Fix liblzma config on macOS 
/Externals/liblzma/config.h #defines HAVE_PTHREAD_CONDATTR_SETCLOCK
which results in /Externals/liblzma/tuklib/mythread.h calling the
function pthread_condattr_setclock.  This function doesn't exist in
macOS 10.12+, which are the only macOS versions Dolphin supports, but
inserting an include guard makes macOS use an alternate function.
 2020-11-28 05:51:45 -08:00
Nikhil Narayana
3bacc97db4 stop using deprecated set-env 2020-11-27 18:50:08 -08:00
Sepalani
20ebed51bb IP/Top: Add Android network interface 2020-11-27 19:10:28 +04:00