601 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Patricio Gonzalez Vivo	d8b2ff51d5	Merge pull request #79 from nicoptere/master ... appendix: coming from JS +types +vectors	2016-05-22 12:25:35 -04:00
nicolas barradeau	86eb812e7d	appendix: coming from JS +types +vectors	2016-05-20 19:27:08 +02:00
Patricio Gonzalez Vivo	4d2249b96d	editor	2016-05-18 16:16:34 -04:00
Patricio Gonzalez Vivo	7009c65cdf	no URL on tags	2016-05-17 13:26:04 -04:00
Patricio Gonzalez Vivo	7cbdac3280	SSL and not	2016-05-17 13:15:41 -04:00
Patricio Gonzalez Vivo	76e4c441a4	tags	2016-05-17 11:14:30 -04:00
Patricio Gonzalez Vivo	735bd1a70b	Merge pull request #78 from nicoptere/master ... fr: various errata	2016-05-17 09:38:26 -04:00
nicolas barradeau	b810bb2133	fr: erratum	2016-05-17 14:40:34 +02:00
nicolas barradeau	594b105bba	Merge branch 'master' of https://github.com/patriciogonzalezvivo/thebookofshaders	2016-05-17 14:39:11 +02:00
nicolas barradeau	d20ade174d	fr: erratum	2016-05-17 10:35:06 +02:00
Patricio Gonzalez Vivo	816bb8d5db	update	2016-05-16 21:36:01 -04:00
nicolas barradeau	71db256e9c	fr: chapter 11 erratum	2016-05-16 18:27:07 +02:00
nicolas barradeau	30d5818d1d	fr: chapter 1 erratum	2016-05-16 17:44:13 +02:00
nicolas barradeau	98a26590db	fr: chapter 2 erratum	2016-05-16 17:38:05 +02:00
Patricio Gonzalez Vivo	d9399d00fc	Merge pull request #77 from nicoptere/master ... fr: chapter 11 + notes	2016-05-16 09:17:30 -04:00
Patricio Gonzalez Vivo	876190905b	twitter card	2016-05-16 09:11:11 -04:00
nicolas barradeau	636978c35f	fr: chapter 12	2016-05-15 23:31:24 +02:00
nicolas barradeau	485beeff18	fr: chapter 11 + notes	2016-05-15 17:12:20 +02:00
Patricio Gonzalez Vivo	8401f0181b	Merge pull request #76 from nicoptere/master ... fr: chapter 10 + notes	2016-05-15 07:29:14 -04:00
Patricio Gonzalez Vivo	a3cffa9fb9	Merge pull request #75 from patriciogonzalezvivo/karimnaaji/typos-fr ... Typos chapter 7 fr	2016-05-15 07:28:59 -04:00
nicolas barradeau	3dcbc1374d	fr: chapter 10 + notes	2016-05-15 11:12:53 +02:00
Karim Naaji	b8fcff630f	fr: Typos chapter 7	2016-05-13 16:31:20 -04:00
Patricio Gonzalez Vivo	0260cc78db	Merge pull request #74 from patriciogonzalezvivo/karimnaaji/typos-fr ... Typos chapter 9 fr	2016-05-13 14:31:16 -04:00
Karim Naaji	36c7043084	fr: Small typos chapter 9	2016-05-13 14:25:53 -04:00
Patricio Gonzalez Vivo	db7e0d12c5	fixing background	2016-05-13 13:57:05 -04:00
Patricio Gonzalez Vivo	78a19a363e	merge	2016-05-13 13:55:29 -04:00
Patricio Gonzalez Vivo	2ded75afc9	merge	2016-05-13 13:53:53 -04:00
Patricio Gonzalez Vivo	89ee7948a8	testing things	2016-05-13 13:53:39 -04:00
Patricio Gonzalez Vivo	ef32e1816b	Merge pull request #73 from patriciogonzalezvivo/karimnaaji/typos-fr ... Typos chapter 8 fr	2016-05-13 12:23:08 -04:00
Karim Naaji	fe97fe7e96	Corrections chapter 8 fr	2016-05-13 12:21:25 -04:00
Patricio Gonzalez Vivo	b686e864de	edit instead of editor	2016-05-13 09:53:13 -04:00
Patricio Gonzalez Vivo	54b838878c	do not load local stuff unless is needed	2016-05-13 09:51:39 -04:00
Patricio Gonzalez Vivo	f40931c188	replacing edit.html for editor.php	2016-05-13 08:37:19 -04:00
Patricio Gonzalez Vivo	7523326047	Merge pull request #72 from nicoptere/master ... fr: chapter 9 + index links to fr	2016-05-13 08:33:41 -04:00
nicolas barradeau	1bf6dbca9e	chapter 9: notes + 1 typo in fr version	2016-05-13 13:58:47 +02:00
nicolas barradeau	fb8f39539e	chapter 9: notes + 1 typo in fr version	2016-05-13 13:58:42 +02:00
nicolas barradeau	bd4a12fc57	fr: chapter 9 + index links to fr	2016-05-13 13:22:56 +02:00
Patricio Gonzalez Vivo	874d57440b	Merge pull request #71 from nicoptere/master ... fr: chapter 8	2016-05-13 06:25:10 -04:00
nicolas barradeau	850ba5b4b8	fr: chapter 8	2016-05-13 09:27:27 +02:00
Patricio Gonzalez Vivo	3a962a39b6	more color examples	2016-05-09 17:14:17 -04:00
Patricio Gonzalez Vivo	9a4d797aad	breaking the appendix in parts	2016-05-09 06:28:02 -04:00
Patricio Gonzalez Vivo	26579cb4b5	Merge pull request #70 from tornoteli/master ... proofread	2016-05-09 05:56:38 -04:00
Patricio Gonzalez Vivo	2c17dd1d0f	Merge pull request #69 from nicoptere/master ... fr: chapter 6 corrections/update and + chapter 7	2016-05-09 05:56:07 -04:00
tornoteli	0795b12991	proofread	2016-05-09 15:29:31 +08:00
nicolas barradeau	a8b865f3d8	fr: chapter 7	2016-05-08 17:09:47 +02:00
nicolas barradeau	b2d3b8a1c8	fr: chapter 6 update latest demos + typo	2016-05-08 09:10:06 +02:00
nicolas barradeau	4283e403e0	fr: chapter 6 update latest demos + typo	2016-05-08 09:07:00 +02:00
Patricio Gonzalez Vivo	5b0e52ee11	ssl links	2016-05-07 15:07:34 -04:00
Patricio Gonzalez Vivo	35f9a4fb77	adding colors	2016-05-07 12:04:39 -04:00
Patricio Gonzalez Vivo	87fa96a539	updating ch 06	2016-05-07 11:49:27 -04:00