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

Dev #11

Merged
merged 7 commits into from
Jun 2, 2019
Merged

Dev #11

merged 7 commits into from
Jun 2, 2019

Commits on May 29, 2019

  1. 修改demo名称

    @BobLChen
    BobLChen committed May 29, 2019
    Configuration menu
    Copy the full SHA
    7f0650f View commit details
    Browse the repository at this point in the history

  2. 1、添加texture array demo 

    2、assimp只解析fbx、glb、obj格式
    @BobLChen
    BobLChen committed May 29, 2019
    Configuration menu
    Copy the full SHA
    5a3c7a3 View commit details
    Browse the repository at this point in the history

  3. instance draw

    @BobLChen
    BobLChen committed May 29, 2019
    Configuration menu
    Copy the full SHA
    ec1c73e View commit details
    Browse the repository at this point in the history

  4. temp

    @BobLChen
    BobLChen committed May 29, 2019
    Configuration menu
    Copy the full SHA
    1c44af6 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2019

  1. TextureArray Demo

    @BobLChen
    BobLChen committed May 30, 2019
    Configuration menu
    Copy the full SHA
    fd61065 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2019

  1. TextureArray demo

    @BobLChen
    BobLChen committed May 31, 2019
    Configuration menu
    Copy the full SHA
    d79777d View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2019

  1. Merge branch 'master' of https://github.com/BobLChen/VulkanTutorials.git 

     into dev

# Conflicts:
#	external/assimp/revision.h
    @BobLChen
    BobLChen committed Jun 2, 2019
    Configuration menu
    Copy the full SHA
    ef8cf08 View commit details
    Browse the repository at this point in the history