736 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Krasjet	13a1b62c81	fix duplicates	2018-04-20 05:05:59 -04:00
Meow J	2b25f377bb	Merge pull request #99 from fuzhenn/patch-1 ... fix typo in glsl	2018-03-01 15:50:54 -05:00
Meow J	6f46edfc5d	Merge pull request #98 from sanerror/new-theme ... Update 02 Stencil testing.md	2018-03-01 15:49:55 -05:00
Fu Zhen	0eb75a5ddc	fix typo in glsl ... 修正了两个GLSL中的小错误，整数会导致GLSL编译出错	2018-02-28 14:32:13 +08:00
sanerror	f83a46bf03	Update 02 Stencil testing.md	2018-02-28 09:50:21 +08:00
Meow J	38d7a80c79	Merge pull request #95 from fuzhenn/patch-1 ... add texture links in Normal Mapping.md	2018-02-22 18:49:52 -05:00
Fu Zhen	ad9c8fa8f3	add texture links in Normal Mapping.md	2018-02-22 15:31:25 +08:00
Meow J	ddf277b3e1	Merge pull request #94 from fuzhenn/patch-2 ... fix typo in bloom.md	2018-02-21 19:41:03 -05:00
Meow J	8e6e364aef	Merge pull request #93 from fuzhenn/patch-1 ... fix typo in advanced lightning/05 parallax mapping	2018-02-21 19:40:25 -05:00
Fu Zhen	3fb3d39dcb	fix typo in bloom.md ... 对照原文，此段代码变量名应为pingpongBuffer https://learnopengl.com/Advanced-Lighting/Bloom	2018-02-21 23:31:34 +08:00
Fu Zhen	7a80e13ea0	fix typo in advanced lightning/05 parallax mapping	2018-02-21 18:22:46 +08:00
Meow J	1ca912c2ef	code update	2018-02-19 23:17:03 -05:00
Meow J	a19476d644	apparently it's not supposed to be THIS large	2018-02-19 23:04:21 -05:00
Meow J	fd2017aedf	missing files from last commit	2018-02-19 22:58:46 -05:00
Meow J	b5e005a24f	link to paypal	2018-02-19 22:55:55 -05:00
Meow J	2d8ea5e0be	warning	2018-02-19 22:38:57 -05:00
Meow J	8ed6129046	rewrite 04-11	2018-02-19 22:26:11 -05:00
Meow J	054ddde666	Merge pull request #88 from ShirokoSama/new-theme ... In Practice章节剩余篇章的翻译	2017-11-24 00:24:38 -05:00
ShirokoSama	b08d08a6fc	06 In Practice\2D-Game\11 Final thoughts 翻译	2017-11-24 01:21:48 +08:00
ShirokoSama	b588aeb982	06 In Practice\2D-Game\09 Audio翻译 part1	2017-11-23 01:09:14 +08:00
ShirokoSama	6519309d80	06 In Practice\2D-Game\09 Audio翻译	2017-11-22 01:25:57 +08:00
包纸	4d8464e98d	06 In Practice\2D-Game\08 PowerUps翻译	2017-11-21 16:35:21 +08:00
包纸	a093ec7837	06 In Practice\2D-Game\07 Postprocessing翻译	2017-11-20 19:32:48 +08:00
Meow J	66d1c3246a	Merge pull request #87 from ShirokoSama/new-theme ... 06 In Practice\2D-Game\04 Levels翻译	2017-11-18 01:11:11 -05:00
包纸	e55de6fe2a	06 In Practice\2D-Game\04 Levels翻译	2017-11-15 21:04:17 +08:00
Meow J	c7d865a67d	No spaces	2017-11-01 23:30:53 -04:00
Meow J	8c086c08d7	Stick with the old version	2017-11-01 23:28:55 -04:00
Meow J	d108a9eaeb	Fix the building error	2017-11-01 23:22:26 -04:00
Meow J	d9d24b88ed	Fix duplicates in 04-08	2017-11-01 23:09:31 -04:00
Meow J	6efae815be	Merge branch 'new-theme' of github.com:LearnOpenGL-CN/LearnOpenGL-CN into new-theme	2017-10-11 19:23:32 -04:00
Meow J	7cd0e0a0ca	Update the code in 01-05	2017-10-11 19:23:00 -04:00
Gary Wang	9ab834126c	fix #48	2017-10-10 23:36:39 +08:00
Meow J	64dc95b9f0	Fix #86	2017-09-21 17:27:25 -04:00
Meow J	099e57e0ca	Of course not 10	2017-09-19 19:40:58 -04:00
Meow J	d5aece4c04	Rewrite 04-10	2017-09-19 19:25:03 -04:00
Meow J	64b2f91ea0	Rewrite 04-09	2017-09-10 00:36:13 -04:00
Meow J	70b282baa5	Merge pull request #84 from aillieo/new-theme ... fix error	2017-09-03 15:34:30 -04:00
aillieo	03f43a4af0	fix error	2017-09-03 20:30:22 +08:00
Meow J	0d2dcc78c0	Fix #48	2017-08-29 08:01:04 -04:00
Meow J	5c19e947bf	Merge pull request #82 from aillieo/new-theme ... fix error	2017-08-20 00:43:49 +08:00
aillieo	ab5e6955fa	resolve coflicts	2017-08-16 22:20:42 +08:00
aillieo	da8c0e2f79	resolve conflicts	2017-08-16 22:16:45 +08:00
aillieo	cb2d02b9d9	fix error	2017-08-16 21:59:00 +08:00
Meow J	fbf5c57d0e	Rewrite 04-08	2017-08-12 17:44:07 +08:00
Meow J	666950d8d5	Fix #81	2017-08-01 00:24:19 +08:00
aillieo	a026f502df	Merge branch 'new-theme' of https://github.com/aillieo/LearnOpenGL-CN into new-theme	2017-07-31 16:31:24 +08:00
aillieo	b55b6fa5a2	fix error	2017-07-31 16:28:43 +08:00
Meow J	7f7fc409da	Rewrite 04-07	2017-07-26 02:50:15 +08:00
Meow J	d1abbc5be7	Merge pull request #80 from aillieo/new-theme ... fix error	2017-07-23 18:57:44 +08:00
aillieo	792dfee867	fix error	2017-07-22 21:18:30 +08:00