aillieo da8c0e2f79 resolve conflicts

2017-08-16 22:16:45 +08:00

..

01 Getting started

fix error

2017-07-22 21:18:30 +08:00

02 Lighting

resolve conflicts

2017-08-16 22:16:45 +08:00

03 Model Loading

Fix the code in 03-02

2017-07-20 00:41:00 +08:00

04 Advanced OpenGL

resolve conflicts

2017-08-16 22:16:45 +08:00

05 Advanced Lighting

fix some errors; updated an image.

2017-06-10 17:05:28 +08:00

06 In Practice

Pre-process 06-03-05

2017-07-04 00:02:23 +08:00

07 PBR

fiexed title following the style guide

2017-06-10 17:23:56 +08:00

08 Effects

resolve conflicts

2017-08-16 22:16:45 +08:00

css

Implement #64

2017-04-24 18:51:27 +08:00

data

Rewrite 04-06

2017-07-15 22:27:06 +08:00

img

Rewrite 04-06

2017-07-15 22:27:06 +08:00

code_repo.md

Add code repo page

2017-06-18 01:01:42 +08:00

index.md

Add a link to LearnOpenGL's Github repo

2017-05-23 21:09:24 +08:00

intro.md

Update styleguide.md

2016-08-08 01:20:45 +08:00

legacy.md

Update 01-09

2017-06-17 23:36:42 +08:00