Code

Shader from string#2

Code

Open

tebjan wants to merge 19 commits intomastervvvv/stride:masterfrom shader-patchingvvvv/stride:shader-patchingCopy head branch name to clipboard

+384-216

Commits

Commits on Nov 9, 2019

• set version to -beta03

  tebjan

  committed
  ced9c72

  Copy full SHA for ced9c72

• better null check in ComputeBinaryBase

  tebjan

  committed
  0b65acd

  Copy full SHA for 0b65acd

Commits on Nov 11, 2019

• Merge remote-tracking branch 'xenko/master-3.1' into shader-patching

  tebjan

  committed
  aaa87db

  Copy full SHA for aaa87db

Commits on Nov 12, 2019

• bumped version to 3.1.0.2-beta01

  tebjan

  committed
  f92f606

  Copy full SHA for f92f606

• added ShaderClassString and a common base class ShaderClassCode, most places now use the common base class.

  Show description for a4b2c5a
  tebjan

  committed
  a4b2c5a

  Copy full SHA for a4b2c5a

• [Build] Bump version to 3.1.0.2

  xen2

  committed
  1a3f467

  Copy full SHA for 1a3f467

• Merge remote-tracking branch 'virgile/master-3.1' into shader-patching

  tebjan

  committed
  0fa86c4

  Copy full SHA for 0fa86c4

• incremented version of MaterialAssetCompiler to 5

  tebjan

  committed
  06de3ea

  Copy full SHA for 06de3ea

Commits on Nov 15, 2019

• added asset upgrader for .xkeffectlog files

  tebjan

  committed
  4f4650d

  Copy full SHA for 4f4650d

Commits on Dec 5, 2019

• set version to 3.2.0.1-beta02 so it's the same as main branch

  tebjan

  committed
  df4eff0

  Copy full SHA for df4eff0

• fixed Materials.cd and some ghost change from git

  tebjan

  committed
  653999e

  Copy full SHA for 653999e

• another git ghost

  tebjan

  committed
  94158f3

  Copy full SHA for 94158f3

• Merge remote-tracking branch 'xenko/master' into shader-patching

  tebjan

  committed
  2a8a575

  Copy full SHA for 2a8a575

Commits on Dec 14, 2019

• Merge remote-tracking branch 'xenko/master' into shader-patching

  tebjan

  committed
  2021c29

  Copy full SHA for 2021c29

Commits on Dec 29, 2019

• Merge branch 'master' into shader-patching

  tebjan

  committed
  a61e4e7

  Copy full SHA for a61e4e7

Commits on Mar 26, 2020

• Merge remote-tracking branch 'xenko/master' into shader-patching

  tebjan

  committed
  0b3ce88

  Copy full SHA for 0b3ce88

• [Temp] changed version suffix for clear nuget distinction

  tebjan

  committed
  da64c9c

  Copy full SHA for da64c9c

Commits on Mar 27, 2020

• [Test] Added TestShaderLoadingString

  tebjan

  committed
  5160550

  Copy full SHA for 5160550

Commits on Mar 30, 2020

• Merge branch 'master' into shader-patching

  tebjan

  committed
  9005043

  Copy full SHA for 9005043