mirrors/dolphin
0
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-10-05 23:59:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
33718 commits 11 branches 17 tags 1.7 GiB
Commit graph

56 commits

Author SHA1 Message Date
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
R2DLiu
510f848777 universally scales across all resolutions 2020-11-29 20:14:40 -05:00
R2DLiu
9ac3a60020 bad 2020-11-29 17:45:54 -05:00
r2dliu
1be7b3967c refactored 2020-11-26 15:11:12 -05:00
r2dliu
dd38c14133 fix bar 2020-11-25 20:14:38 -05:00
JosJuice
161f99b864 Android: Move OSD out of the way when menu is open 
https://bugs.dolphin-emu.org/issues/12256
 2020-09-16 18:36:15 +02:00
R2DLiu
e7b9a20805 remove more logging 2020-09-06 13:38:49 -04:00
R2DLiu
845b990f29 remove extraneous logging 2020-09-06 13:36:28 -04:00
R2DLiu
4f1d0f306f working volume 2020-09-06 01:31:56 -04:00
r2dliu
347ed3681b hacks 2020-08-29 23:33:59 -04:00
R2DLiu
fb1a9aecd4 more youtube style implementation. hovering on buttons or bar prevents fadeout 2020-08-23 17:42:16 -04:00
R2DLiu
836162a76a lots of cleanup. fixes destructor crash. also solves #50 2020-08-23 17:25:54 -04:00
R2DLiu
78ef189315 add info and fullscreen buttons. Make a lot more robust 2020-08-22 20:11:52 -04:00
JosJuice
b0f9bb9f13 Port some settings to the new config system 
Other than the controller settings and JIT debug settings,
these are the only settings which were defined in Java code
but not defined in the new config system in C++. (There are
still a lot of settings that are defined in the new config
system but not yet saveable in the new config system, though.)
 2020-08-03 15:07:53 +02:00
Felk
f775e9b99d OnScreenDisplay: fix names rgba -> argb 2020-08-02 01:37:20 +02:00
JosJuice
571fa77be4 Fix some Android compilation errors 
There is a linking error with SliderCalcRatioFromValueT in
OnScreenDisplay.cpp left that I didn't manage to fix.
 2020-07-17 23:51:37 +02:00
R2DLiu
646140c38e Add setting to hide seek bar 2020-07-16 21:00:13 -04:00
R2DLiu
10588ff22c hotkeys work 2020-07-16 18:39:07 -04:00
R2DLiu
68680b7e8b hotkeys 2020-07-16 18:39:07 -04:00
R2DLiu
1780d6bd52 more work 2020-07-16 18:39:06 -04:00
R2DLiu
4f154bce3c fix bug, working seek bar 2020-07-16 18:39:06 -04:00
R2DLiu
76adf9000e sort of working save states 2020-07-16 18:39:06 -04:00
R2DLiu
5fa1476592 remove margins. Seek bar updates with replay 2020-07-16 18:39:06 -04:00
R2DLiu
1ed0f8e01d more logic for disappearing bar 2020-07-16 18:39:06 -04:00
R2DLiu
f565855b85 working disappearing buttons. TODO opacity over time, disappearing bar 2020-07-16 18:39:06 -04:00
R2DLiu
788df02026 better isHeld logic 2020-07-16 18:39:06 -04:00
R2DLiu
97e7c7a674 V1 of ui design 2020-07-16 18:39:06 -04:00
R2DLiu
d6d43b9d01 Move out of externals into osd 2020-07-16 18:38:28 -04:00
R2DLiu
c9a8039957 hack out a test gui 2020-07-16 18:38:28 -04:00
Jordan Woyak
c08671c4ce VideoCommon/OSD: Process OSD messages even when they are disabled. 2020-01-24 11:00:58 -06:00
Lioncash
6fbbc2683e VideoCommon: Make use of fmt outside of shader generators 
Migrates most of VideoCommon over to using fmt, with the exception being
the shader generator code. The shader generators are quite large and
have more corner cases to deal with in terms of conversion (shaders have
braces in them, so we need to make sure to escape them).

Because of the large amount of code that would need to be converted, the
conversion of VideoCommon will be in two parts:

- This change (which converts over the general case string formatting),
- A follow up change that will specifically deal with converting over
  the shader generators.
 2019-11-23 16:00:45 -05:00
Lioncash
3f947f086f VideoCommon/OnScreenDisplay: Use deduction guides for std::lock_guard 
Same behavior without hardcoding the type of the mutex within the lock
guards. This means the type of the mutex would be able to be changed
without needing to also change all occurrences lock guards are used.
 2019-07-28 23:08:21 -04:00
Lioncash
a565e41cb8 VideoCommon/OnScreenDisplay: Remove unused headers 
While we're at it, fix up the imgui include to use the convention we use
for referencing external library headers.
 2019-07-28 23:04:52 -04:00
Lioncash
c212310fbe VideoCommon/OnScreenDisplay: Take Message's std::string parameter by value 
Allows callers to std::move strings into the functions (or automatically
assume the move constructor/move assignment operator for rvalue
references, potentially avoiding copies altogether.
 2019-07-28 23:00:58 -04:00
Lioncash
50b240fcbd VideoCommon/OnScreenDisplay: Default initialize all Message members 
Provides a deterministic initial state in the case of the default
constructor.
 2019-07-28 22:42:45 -04:00
Lioncash
c0c0e412e0 Core/ConfigManager: Use forward declarations where applicable 
Avoids dragging in IniFile, EXI device and SI device headers in this header which is
quite widely used throughout the codebase.

This also uncovered a few cases where indirect inclusions were being
relied upon, which this also fixes.
 2019-06-07 19:54:39 -04:00
Techjar
ff972e3673 Reformat repo to clang-format 7.0 rules 2019-05-06 18:48:04 +00:00
Stenzek
600d1fc0bc Renderer: Use imgui for drawing debug text and OSD 2019-01-25 11:15:57 +10:00
degasus
1cc1876002 Revert "Merge pull request #4286 from shuffle2/Aestek-clean-osd" 
This reverts commit 5c0fa4db4f, reversing
changes made to b8731eb818.
 2016-10-15 12:44:37 +02:00
Shawn Hoffman
fa5fa8e094 Clean OSD messages code 
Some OSD messages were displayed in RenderBase.cpp using global variables and some code duplicated
in OnScreeDisplay.cpp.
Now all messages are displayed using functions in the OSD namepace.

* OSDChoice and OSDTime global variables are gone
* All OSD logic is kept at the same place
* All messages are properly aligned
* Clean characters for all OSD messages

Original commit:

commit f0ec61c057
Author: Aestek <thib.gilles@gmail.com>
Date:   Sun Aug 7 16:08:41 2016 +0200
 2016-10-03 19:37:18 -07:00
Aestek
6a0fc4c438 Improve netplay setup dialog UX 
* Focus "Hash Code" / "IP address" text box by default in "Connect"
* Focus game list in "Host" tab
* RETURN keypress now host/join depending on selected tab
* Remember last hosted game
* Remove PanicAlertT:
	* Simply log message to netplay window
	* Remove them when they are useless
* Show some netplay message in OSD
	* Chat messages
	* Pad buffer changes
	* Desync alerts
* Stop the game consistently when another player disconnects / crashes
* Prettify chat textbox
* Log netplay ping to OSD

Join scenario:
* Copy netplay code
* Open netplay
* Paste code
* Press enter

Host scenario:
* Open netplay
* Go to host tab
* Press enter
 2016-07-23 20:58:51 +02:00
Pierre Bourdon
3570c7f03a Reformat all the things. Have fun with merge conflicts. 2016-06-24 10:43:46 +02:00
Lioncash
edda018d54 OnScreenDisplay: Make CallbackType an enum class 2016-01-02 14:57:55 -05:00
Lioncash
daa205990f Use emplace() instead of insert() where applicable for maps. 2015-06-28 19:52:40 -04:00
degasus
c375111076 Options: merge SCoreStartupParameter into SConfig 2015-06-12 19:07:45 +02:00
Tillmann Karras
30ebb2459e Set copyright year to when a file was created 2015-05-25 13:22:31 +02:00
Tillmann Karras
cefcb0ace9 Update license headers to GPLv2+ 2015-05-25 13:22:31 +02:00
Lioncash
9d5c6c55fe OnScreenDisplay: Allow for different colored messages 2015-02-07 17:35:21 -05:00
degasus
3f9b52e555 OGL: draw shadows within rasterfont itself 2014-12-20 13:31:41 +01:00