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
Shawn Hoffman
fcc8dfd189
Common/Assert: no longer needs special impl for msvc
2020-08-23 13:57:05 -07:00
R2DLiu
6857a445e4
More errors pounded down
2020-07-16 18:35:28 -04:00
Lioncash
c792961000
Common: Unify logging namespace with Common
...
Previously the logging was a in a little bit of a disarray. Some things
were in namespaces, and other things were not.
Given this code will feature a bit of restructuring during the
transition over to fmt, this is a good time to unify it under a single
namespace and also remove functions and types from the global namespace.
Now, all functions and types are under the Common::Log namespace. The
only outliers being, of course, the preprocessor macros.
2019-11-28 05:13:21 -05:00
Silent
518d96ad48
Remove duplicated "Ignore and countinue?"
2019-07-21 15:36:24 +02:00
Lioncash
75f5fcdfee
Assert: Remove unused parameter from DEBUG_ASSERT
...
This brings the macro in line with the regular ASSERT macro, which only has one
macro parameter.
2018-03-16 13:01:11 -04:00
Lioncash
f44e2dc425
Assert: Wrap assertion macro bodies in do {} while (0)
...
Enforces the termination of the macro with a semicolon. Aside from that
requirement, behavior remains the same.
2018-03-16 12:35:23 -04:00
Lioncash
50a476c371
Assert: Uppercase assertion macros
...
Macros should be all upper-cased. This is also kind of a wart that's
been sticking out for quite a while now (we avoid prefixing
underscores).
2018-03-14 22:03:12 -04:00
Michael M
1ade08c607
Fix two small lint errors
2017-08-13 19:06:10 -07:00
Dan Ravensloft
982663c728
Explain what Yes/No means in an assert window
...
It's a bit confusing to get a yes/no dialogue box without any indication
of what yes or no will do in this situation, so add a short explanatory
sentence.
2017-07-05 20:00:52 +00:00
Pierre Bourdon
3570c7f03a
Reformat all the things. Have fun with merge conflicts.
2016-06-24 10:43:46 +02:00
JosJuice
74ea765427
Mark more strings for translation
2015-11-20 11:33:47 +01:00
James Cowgill
386159c74e
Remove uses of __DATE__ and __TIME__
2015-11-14 00:52:41 +00:00
Lioncash
19ac565e0d
Common: Move asserts to their own header
2015-09-26 18:51:27 -04:00