Merge v0.2.0 branch #838
Draft
Merge v0.2.0 branch #838
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Linear rendering is always enabled by means of either FP16 or sRGB framebuffer (thus making EXT_framebuffer_sRGB mandatory)
It’s safe to do this because entire the rendering pipeline now uses the linear color space.
Note that LimboView.cpp no longer exists in v0.2.0 because it was replaced with LimboWindow.as. # Conflicts: # Sources/Client/Client_Update.cpp # Sources/Client/LimboView.cpp
# Conflicts: # OpenSpades.xcodeproj/project.pbxproj
# Conflicts: # Sources/Client/Client.cpp # Sources/Client/Client_Input.cpp # Sources/Client/Client_NetHandler.cpp # Sources/Client/FTFont.cpp # Sources/Client/LimboView.h # Sources/Gui/StartupScreen.cpp
Currently, the following steps are used: * <90: green * <120: yellow * <200: orange * >200: red It currently looks waaay to colorful. I think a colored bar or something might look best, but for now this works and lets you quickly see how good you can expect the connection to be
Add color coding to ping
# Conflicts: # Resources/Scripts/Gui/ClientUI.as # Resources/Scripts/Gui/MainScreen.as # Resources/Scripts/Gui/StartupScreen.as # Resources/Scripts/Gui/UIControls.as
# Conflicts: # Resources/PackageInfo.json # XSpades/PackageInfo.json
This commit fixes the issue by explicitly requesting a sRGB-capable default framebuffer. Fixes #827.
|
I understand you are looking forward to merging these branches, is v0.2.0 the one us testers should use? |
I'm sorry I haven't been able to answer your question for a while. No, The current plan is as follows:
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changes
Requirements
The GPU requirement for the OpenGL renderer was raised:
EXT_framebuffer_object(part of OpenGL 3.0)EXT_framebuffer_sRGB(part of OpenGL 3.0)Highlights
LimboViewin AngelScriptMiscellaneous
r_srgbandr_srgb2dwere removed. (cf3e187)LINEAR_FRAMEBUFFERwas removed. (af35e30)Issues
r_hdr 0) rendering path is brokenr_fogShadowis broken (maybe remove it?)EXT_framebuffer_sRGB.