Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge v0.2.0 branch #838

Draft
wants to merge 63 commits into
base: master
Choose a base branch
from
Draft

Merge v0.2.0 branch #838

wants to merge 63 commits into from

Conversation

yvt
Copy link
Owner

@yvt yvt commented Jun 9, 2019 •
edited

Changes

Requirements

The GPU requirement for the OpenGL renderer was raised:

  • Video card supporting OpenGL 2.1 and following extensions:
    • EXT_framebuffer_object (part of OpenGL 3.0)
    • NEW: EXT_framebuffer_sRGB (part of OpenGL 3.0)

Highlights

  • Rewrite LimboView in AngelScript
  • Temporal antialiasing
  • Ping in the server list (17b4100)
  • Rendering Scale (feature to change the 3D rendering resolution independently from 2D to improve the performance while keeping 2D rendering sharp) (3cd32b5)
  • GUI now supports DPI scaling (ff3af0f)
  • GUI redesign
  • etc.

Miscellaneous

  • All rendering, including GUI, is done in the linear colorspace. This simplifies the code base.
    • r_srgb and r_srgb2d were removed. (cf3e187)
    • LINEAR_FRAMEBUFFER was removed. (af35e30)
  • The legacy setting importer was removed. (daf3732)
  • GUI: Blur effect
  • GUI: Rectangular clipping (4c8e9b2), which is useful for smooth scrolling

Issues

  • The non-HDR (r_hdr 0) rendering path is broken
  • r_fogShadow is broken (maybe remove it?)
  • Not sure if it's okay to drop support for GPUs without EXT_framebuffer_sRGB.

yvt added 30 commits January 9, 2017 23:53
@yvt
V2 GUI: Update some GUI design (wip)
529a1a3
@yvt
GUI: clip children
4c8e9b2
@yvt
Merge branch 'master' into 0.2.0
427e83b
@yvt
Implement GLRenderer::Blur()
f795743
@yvt
Implement transform matrices and 2D drawing state stack in IRenderer
61b2c42
@yvt
Initial support of DPI scaling
ff3af0f
@yvt
Fix to compile on older GCC
4b9299d
@yvt
Hi-DPI unaware SW render views are no longer created with Hi-DPI mode
c02368b
@yvt
Fix GLRenderer
69b25a5
@yvt
Reimplement LimboView using AngelScript
78b7894
@yvt
GLUIBlurFilter: more blurry
493354f
@yvt
Merge branch 'master' into 0.2.0
0e0cc33
@yvt
Fix some bugs
280bd49
@yvt
3D render scaling (r_scale)
3cd32b5
@yvt
Remove legacy setting importer
daf3732
@yvt
Remove r_srgb and r_srgb2d
cf3e187 
Linear rendering is always enabled by means of either FP16 or sRGB framebuffer (thus making EXT_framebuffer_sRGB mandatory)
@yvt
Merge branch 'master' into 0.2.0
3045ff6
@yvt
Fix an issue causing the first frame to be corrupted
78c2d9a
@yvt
DPI scaling for in-game UIs
e0a93c8
@yvt
Update blending of additive 2D element
8f0decb
@yvt
Merge branch 'master' into v0.2.0
6eb059c
@yvt
Merge branch 'master' into v0.2.0
4b2ec72
@yvt
Update PackageInfo.json
9d3464b
@yvt
Remove the shader constant LINEAR_FRAMEBUFFER
af35e30 
It’s safe to do this because entire the rendering pipeline now uses the linear color space.
@yvt
Merge branch 'master' into v0.2.0
b9cace4 
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
@yvt
Merge branch 'master' into v0.2.0
e27d3b0
@yvt
Merge branch 'master' into v0.2.0
8442086
@yvt
Merge branch 'master' into v0.2.0
bb4efbb
@yvt
Merge branch 'master' into v0.2.0
11423fe
@yvt
Merge branch 'master' into v0.2.0
dd0b0a0
yvt and others added 25 commits September 5, 2017 01:03
@yvt
Merge branch 'master' into v0.2.0
8e5b18e 
# Conflicts:
#	OpenSpades.xcodeproj/project.pbxproj
@yvt
Merge branch 'master' into v0.2.0
e482ba1
@yvt
Merge remote-tracking branch 'origin/master' into v0.2.0
45f6f2c
@yvt
Merge remote-tracking branch 'origin/master' into v0.2.0
8ddfb6b
@yvt
Merge branch 'master' into v0.2.0
da091d3 
# 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
@yvt
Merge branch 'master' into v0.2.0
8553509
@yvt
Merge branch 'master' into v0.2.0
ca07376
@yvt
Merge branch 'master' into v0.2.0
58c1c1e
@yvt
Display server ping in the server list
17b4100 
Fixes #685.
@NotAFile
Add color coding to ping
d0bc024 
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
@yvt
Merge pull request #694 from NotAFile/v0.2.0
82ceeeb 
Add color coding to ping
@yvt
Merge branch 'master' into v0.2.0
44f832f
@yvt
Merge branch 'master' into v0.2.0
6a57d1b 
# Conflicts:
#	Resources/Scripts/Gui/ClientUI.as
#	Resources/Scripts/Gui/MainScreen.as
#	Resources/Scripts/Gui/StartupScreen.as
#	Resources/Scripts/Gui/UIControls.as
@yvt
Fix StartupScreenGraphicsAntialiasConfig broken in the previous merge
6e7b2d3
@yvt
Merge branch 'master' into v0.2.0
e2e0b06 
# Conflicts:
#	Resources/PackageInfo.json
#	XSpades/PackageInfo.json
@yvt
Merge branch 'master' into v0.2.0
ca1937b
@yvt
Bump version to 0.1.3
dcf449c
@yvt
Merge branch 'master' into v0.2.0
7650d2d
@yvt
Merge branch 'master' into v0.2.0
7e03e09
@yvt
Merge branch 'master' into v0.2.0
cb82969
@yvt
Fix colors being too dark on non-macOS platforms
31fb726 
This commit fixes the issue by explicitly requesting a sRGB-capable
default framebuffer.

Fixes #827.
@yvt
Fix indentation
e36693b
@yvt
Remove an unused function
6bcdef4
@yvt
Merge remote-tracking branch 'origin/master' into v0.2.0
0ea3220
@yvt
Merge branch 'master' into v0.2.0
d502cb6
@yvt yvt added the enhancement request/proposal to add a new feature label Jun 9, 2019
@yvt yvt self-assigned this Jun 9, 2019
@sudodouuuuuu
Copy link

I understand you are looking forward to merging these branches, is v0.2.0 the one us testers should use?

@yvt
Copy link
Owner Author

yvt commented Nov 26, 2020 •
edited

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, master or #844 is what you might want to use. The v0.2.0 branch won't be merged anytime soon because of many incomplete features and its stricter system requirements, which I'm not sure users are okay with.

The current plan is as follows:

@yvt yvt mentioned this pull request May 12, 2022
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@yvt yvt

Labels
enhancement request/proposal to add a new feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@yvt @sudodouuuuuu @feikname @NotAFile