52 Commits

Author	SHA1	Message	Date
Sergey Karchevsky	8a049e9611	Proofread Russian translation.	2017-11-12 03:57:52 +07:00
Sergey Karchevsky	6b830bd008	Merge remote-tracking branch 'upstream/master'	2017-10-26 21:49:58 +07:00
Sergey Karchevsky	65568eb3c6	Fix Russian translation typesetting.	2017-10-26 21:42:02 +07:00
Z	2bf2785cb9	Fix typo	2017-09-13 13:01:09 -04:00
Sergey Karchevsky	8111f6c881	Translated chapter 04 (Running your shader) into Russian.	2017-09-06 22:22:56 +07:00
Sergey Karchevsky	bbcfa433b1	Added missing period.	2017-09-06 01:26:36 +07:00
Patricio Gonzalez Vivo	dd5f116d18	Merge pull request #173 from yvan-sraka/en-04 ... Corrects some mistakes in the English version of Chapter 04	2017-08-26 13:25:43 +00:00
Yvan Sraka	dfcefc3aaa	Corrects some mistakes in the English version of Chapter 04	2017-08-24 17:45:12 +02:00
Yvan Sraka	c496d7ce8c	Corrects some mistakes in the French translation of Chapter 04	2017-08-24 17:38:08 +02:00
Yvan Sraka	3f448205f0	% find . -type f -print0 | xargs -0 dos2unix	2017-08-23 11:34:44 +02:00
Yvan Sraka	2410899756	Remove trailing whitespaces	2017-08-23 11:34:44 +02:00
MITI67	a8d20f0947	read it all again ... some typos, some long sentences splitted, its all fine now	2016-11-17 09:11:10 +01:00
MITI67	be4d255b33	Merge remote-tracking branch 'refs/remotes/patriciogonzalezvivo/master'	2016-11-11 14:22:11 +01:00
MITI67	6b41b65f77	new: german translation	2016-11-10 19:20:27 +01:00
kenichiy	db17d0cf5d	Update chapter 04 to the latest	2016-10-31 17:33:51 +09:00
kenichiy	ba470565ad	Merge branch 'master' into translation-jp	2016-10-30 14:20:16 +09:00
Matt Richardson	abc3b72684	RaspberryPi to Raspberry Pi	2016-10-27 15:10:27 -04:00
follower	5f5e87a477	Use phrase "live examples" rather than "life examples" ... I think the concept you're expressing is "live examples"? An alternate way of expressing this that might also be clearer is "interactive examples".	2016-09-27 17:14:10 +13:00
follower	42838e5cf4	Fix "embebed" -> "embedded"	2016-09-27 14:12:28 +13:00
riibiax	ba05351b16	errata corrige chapters 04 in italian	2016-08-30 23:47:29 +02:00
riibiax	20a7c157de	chapter 04 in italian	2016-08-29 00:35:51 +02:00
Brandon Liu	854d9c02d8	fix link to openframeworks shader tutorial.	2016-06-16 18:40:02 -04:00
Patricio Gonzalez Vivo	26579cb4b5	Merge pull request #70 from tornoteli/master ... proofread	2016-05-09 05:56:38 -04:00
tornoteli	0795b12991	proofread	2016-05-09 15:29:31 +08:00
nicolas barradeau	e3f05307b0	fr: chapter 4 + typos in en	2016-05-05 23:00:24 +02:00
Patricio Gonzalez Vivo	ce98876cad	adding subnails	2016-04-23 14:13:44 -04:00
kynd	6421d53afc	updated chapter 4	2016-04-09 02:06:34 -07:00
Patricio Gonzalez Vivo	6441e53bcf	adding new tools	2016-04-06 11:29:12 -04:00
necsoft	c7d9544f9d	Translated the first 7 chapters to spanish	2016-03-02 11:19:12 -03:00
Adam Pearce	64aad383ba	Adds u_mouse to three.js boilerplate	2016-02-16 00:36:57 -05:00
Jae Hyun Yoo	9871f6c168	chapter 3 and 4 korean translation	2016-02-05 20:07:20 -08:00
Patricio Gonzalez Vivo	e55f68436c	Merge pull request #27 from tornoteli/translation-ch ... add chapter 03,04 of translation-ch	2015-12-31 19:17:34 -05:00
tornote	371c46711a	add ch chapter 03,04	2015-12-31 23:20:59 +08:00
kynd	bac200ad28	minor tweaks to enforce writing conventions	2015-12-27 15:35:04 -08:00
Patricio Gonzalez Vivo	7df31a2dc4	fixing WebGL detect	2015-09-10 09:15:07 -04:00
Patricio Gonzalez Vivo	7c1f6ce838	Merge branch 'master' into translation-jp	2015-08-24 10:01:49 -03:00
kynd	dbc978b659	04 - translated	2015-08-18 22:22:13 -07:00
kynd	17582302a7	04 draft	2015-08-16 11:31:45 -07:00
Patricio Gonzalez Vivo	9e3e5201dc	adding glslCanvas	2015-08-06 14:44:01 -03:00
Patricio Gonzalez Vivo	9b83d28c46	adding files and main README-JP.md	2015-08-05 08:39:27 -03:00
Patricio Gonzalez Vivo	7e1cc55cfb	adding php links to translations	2015-08-05 07:55:39 -03:00
Patricio Gonzalez Vivo	9301b03b53	dynamic titles	2015-07-18 14:50:10 -04:00
Patricio Gonzalez Vivo	1c190ea336	relative paths as variables, glossary querry, code style	2015-07-17 16:24:23 -04:00
Patricio Gonzalez Vivo	408c1d4020	porting to PHP using Markdown parser	2015-07-15 08:12:44 -04:00
Patricio Gonzalez Vivo	2927a74370	updating to glslCanvas.min.js	2015-07-14 10:34:43 -04:00
Patricio Gonzalez Vivo	0e16932359	Merge branch 'master' into non-edited	2015-03-27 10:57:43 -04:00
Patricio Gonzalez Vivo	f71f0eb470	adding scott feedback	2015-03-27 10:49:26 -04:00
Andreas Wilcox	10ae7a7256	Fixed some spelling and syntax.	2015-03-25 21:58:31 +01:00
Patricio Gonzalez Vivo	7565766024	Merge branch 'master' of github.com:patriciogonzalezvivo/thebookofshaders	2015-03-18 06:48:10 -04:00
Patricio Gonzalez Vivo	9bc0460fee	fixing links	2015-03-18 06:46:59 -04:00