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

Terrain Uber Shader #100

Merged
merged 15 commits into from
Oct 11, 2022
Merged

Terrain Uber Shader #100

merged 15 commits into from
Oct 11, 2022

Commits on Aug 15, 2022

  1. Initial push of terrain uber shader work

    @JamesTKhan
    JamesTKhan committed Aug 15, 2022
    Configuration menu
    Copy the full SHA
    27222e8 View commit details
    Browse the repository at this point in the history

  2. Move terrain attributes to new package

    @JamesTKhan
    JamesTKhan committed Aug 15, 2022
    Configuration menu
    Copy the full SHA
    e1f9114 View commit details
    Browse the repository at this point in the history

Commits on Aug 16, 2022

  1. Fix boolean argument

    @JamesTKhan
    JamesTKhan committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    8e031c8 View commit details
    Browse the repository at this point in the history

  2. remove unused glsl code

    @JamesTKhan
    JamesTKhan committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    a3b2fe1 View commit details
    Browse the repository at this point in the history

  3. Fix hard coded size

    @JamesTKhan
    JamesTKhan committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    72ea94d View commit details
    Browse the repository at this point in the history

  4. Fix hard coded size

    @JamesTKhan
    JamesTKhan committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    5c05ca1 View commit details
    Browse the repository at this point in the history

  5. Fix fog on new shader

    @JamesTKhan
    JamesTKhan committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    5295c78 View commit details
    Browse the repository at this point in the history

  6. Merge remote-tracking branch 'origin/master' into terrain-uber-shader

    @JamesTKhan
    JamesTKhan committed Aug 16, 2022
    Configuration menu
    Copy the full SHA
    3577fe9 View commit details
    Browse the repository at this point in the history

Commits on Aug 17, 2022

  1. Merge remote-tracking branch 'origin/master' into terrain-uber-shader

    @JamesTKhan
    JamesTKhan committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    8830a7a View commit details
    Browse the repository at this point in the history

  2. Deprecate legacy TerrainShader

    @JamesTKhan
    JamesTKhan committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    0662a56 View commit details
    Browse the repository at this point in the history

  3. Merge remote-tracking branch 'origin/master' into terrain-uber-shader 

    # Conflicts:
#	editor/src/main/com/mbrlabs/mundus/editor/ui/modules/outline/OutlineRightClickMenu.kt
    @JamesTKhan
    JamesTKhan committed Aug 17, 2022
    Configuration menu
    Copy the full SHA
    2f0508c View commit details
    Browse the repository at this point in the history

Commits on Aug 18, 2022

  1. Fix dialog after merge

    @JamesTKhan
    JamesTKhan committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    84531b0 View commit details
    Browse the repository at this point in the history

  2. Clean up

    @JamesTKhan
    JamesTKhan committed Aug 18, 2022
    Configuration menu
    Copy the full SHA
    5a63997 View commit details
    Browse the repository at this point in the history

Commits on Aug 23, 2022

  1. Fix init call

    @JamesTKhan
    JamesTKhan committed Aug 23, 2022
    Configuration menu
    Copy the full SHA
    9b14ad1 View commit details
    Browse the repository at this point in the history

Commits on Oct 11, 2022

  1. Fix blending bug in uber terrain shader

    @JamesTKhan
    JamesTKhan committed Oct 11, 2022
    Configuration menu
    Copy the full SHA
    a82e1f2 View commit details
    Browse the repository at this point in the history