Code

Submission: xinyue zhu#12

Code

Open

Zhuxinyue909 wants to merge 48 commits intoCIS565-Fall-2015:masterCIS565-Fall-2015/Project5-GLSL-Ray-Marcher:masterfrom Zhuxinyue909:masterZhuxinyue909/Project5-GLSL-Ray-Marcher:masterCopy head branch name to clipboard

+431-170

Commits

Commits on Oct 19, 2015

• requires

  Zhuxinyue909

  committed
  2865d14

  Copy full SHA for 2865d14

• occ+softshadow

  Zhuxinyue909

  committed
  d99c752

  Copy full SHA for d99c752

• terr

  Zhuxinyue909

  committed
  a59aaa8

  Copy full SHA for a59aaa8

• Update README.md

  Zhuxinyue909

  committed
  61a0800

  Copy full SHA for 61a0800

• Update README.md

  Zhuxinyue909

  committed
  0c86ecb

  Copy full SHA for 0c86ecb

• image

  Zhuxinyue909

  committed
  7a8d0cf

  Copy full SHA for 7a8d0cf

• Merge branch 'master' of http://www.github.com/Zhuxinyue909/Project5-GLSL-Ray-Marcher

  Zhuxinyue909

  committed
  cd0c300

  Copy full SHA for cd0c300

• Update README.md

  Zhuxinyue909

  committed
  635ad8a

  Copy full SHA for 635ad8a

• image

  Zhuxinyue909

  committed
  ae7ef34

  Copy full SHA for ae7ef34

• Update README.md

  Zhuxinyue909

  committed
  f587e4d

  Copy full SHA for f587e4d

• Update README.md

  Zhuxinyue909

  committed
  3d2f067

  Copy full SHA for 3d2f067

• Update README.md

  Zhuxinyue909

  committed
  673728f

  Copy full SHA for 673728f

• Update README.md

  Zhuxinyue909

  committed
  b7af974

  Copy full SHA for b7af974

• Update README.md

  Zhuxinyue909

  committed
  5df9742

  Copy full SHA for 5df9742

• Update README.md

  Zhuxinyue909

  committed
  9fc936e

  Copy full SHA for 9fc936e

• Update README.md

  Zhuxinyue909

  committed
  8bf48be

  Copy full SHA for 8bf48be

• pic

  Zhuxinyue909

  committed
  74bbac4

  Copy full SHA for 74bbac4

• Update README.md

  Zhuxinyue909

  committed
  254d3b5

  Copy full SHA for 254d3b5

• Update README.md

  Zhuxinyue909

  committed
  5720c2a

  Copy full SHA for 5720c2a

Commits on Oct 20, 2015

• Update README.md

  Zhuxinyue909

  committed
  b33f90d

  Copy full SHA for b33f90d

• Update README.md

  Zhuxinyue909

  committed
  5e90b94

  Copy full SHA for 5e90b94

• Update README.md

  Zhuxinyue909

  committed
  30dd379

  Copy full SHA for 30dd379

• Update README.md

  Zhuxinyue909

  committed
  8814831

  Copy full SHA for 8814831

• Update README.md

  Zhuxinyue909

  committed
  56e8114

  Copy full SHA for 56e8114

• Update README.md

  Zhuxinyue909

  committed
  80c9a30

  Copy full SHA for 80c9a30

• Update README.md

  Zhuxinyue909

  committed
  1430493

  Copy full SHA for 1430493

• Update README.md

  Zhuxinyue909

  committed
  bf4c2c5

  Copy full SHA for bf4c2c5

• Update README.md

  Zhuxinyue909

  committed
  017d0b6

  Copy full SHA for 017d0b6

• Update README.md

  Zhuxinyue909

  committed
  4e838b0

  Copy full SHA for 4e838b0

• Update README.md

  Zhuxinyue909

  committed
  07aefd1

  Copy full SHA for 07aefd1

• pic

  Zhuxinyue909

  committed
  ad9d5b7

  Copy full SHA for ad9d5b7

• Update README.md

  Zhuxinyue909

  committed
  1f44ddc

  Copy full SHA for 1f44ddc

• Update README.md

  Zhuxinyue909

  committed
  b349ad0

  Copy full SHA for b349ad0

• Update README.md

  Zhuxinyue909

  committed
  0abccc4

  Copy full SHA for 0abccc4

• Update README.md

  Zhuxinyue909

  committed
  b2526b3

  Copy full SHA for b2526b3

• Update README.md

  Zhuxinyue909

  committed
  2b7f9fc

  Copy full SHA for 2b7f9fc

• Update README.md

  Zhuxinyue909

  committed
  489e07c

  Copy full SHA for 489e07c

• Update README.md

  Zhuxinyue909

  committed
  b7fcfd1

  Copy full SHA for b7fcfd1

• Update README.md

  Zhuxinyue909

  committed
  23f9c22

  Copy full SHA for 23f9c22

• fi

  Zhuxinyue909

  committed
  05bb5bd

  Copy full SHA for 05bb5bd

• Update README.md

  Zhuxinyue909

  committed
  4a6c7c4

  Copy full SHA for 4a6c7c4

• thumb

  Zhuxinyue909

  committed
  8319494

  Copy full SHA for 8319494

• final

  Zhuxinyue909

  committed
  8ae8ddd

  Copy full SHA for 8ae8ddd

• Update README.md

  Zhuxinyue909

  committed
  a923d30

  Copy full SHA for a923d30

• Update README.md

  Zhuxinyue909

  committed
  270292c

  Copy full SHA for 270292c

• final

  Zhuxinyue909

  committed
  26bcfb9

  Copy full SHA for 26bcfb9

• Merge branch 'master' of http://www.github.com/Zhuxinyue909/Project5-GLSL-Ray-Marcher

  Zhuxinyue909

  committed
  78a34e4

  Copy full SHA for 78a34e4

• Update README.md

  Zhuxinyue909

  committed
  b74b200

  Copy full SHA for b74b200