782 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Patricio Gonzalez Vivo	4ea77a79aa	Merge pull request #68 from nicoptere/master ... fr: chapter 6 + 1 typo in 'en'	2016-05-07 11:46:39 -04:00
Patricio Gonzalez Vivo	0c8ef133a2	français	2016-05-07 11:39:49 -04:00
Patricio Gonzalez Vivo	a16d374f79	fixing problems... and adding Kynds examples to chapter 5	2016-05-07 11:37:15 -04:00
nicolas barradeau	e419aede55	en: chapter 6 additional vector description (take 2)	2016-05-07 17:32:57 +02:00
nicolas barradeau	50c5c21fdb	Merge branch 'master' of https://github.com/patriciogonzalezvivo/thebookofshaders	2016-05-07 17:31:23 +02:00
nicolas barradeau	82ebf1fbbe	merging master	2016-05-07 17:30:22 +02:00
nicolas barradeau	c6d0a751f3	en: chapter 6 additional description of vectors	2016-05-07 17:11:00 +02:00
nicolas barradeau	65d97f7384	fr: chapter 6	2016-05-07 15:36:59 +02:00
Patricio Gonzalez Vivo	a8a4742456	Merge pull request #67 from nicoptere/master ... fr: chapter 5 + 1 note	2016-05-06 17:01:30 -04:00
nicolas barradeau	33031c0f8d	fr: chapter 5 + 1 note	2016-05-06 22:57:20 +02:00
Patricio Gonzalez Vivo	8d22c33ca0	adding adding	2016-05-05 17:09:37 -04:00
Patricio Gonzalez Vivo	e16eb48f7a	Merge pull request #66 from nicoptere/master ... fr: chapter 4 + typos in en	2016-05-05 17:02:46 -04:00
nicolas barradeau	e3f05307b0	fr: chapter 4 + typos in en	2016-05-05 23:00:24 +02:00
Patricio Gonzalez Vivo	24e33093ac	adding images	2016-05-05 10:36:31 -04:00
Patricio Gonzalez Vivo	3fb6ed8540	updating	2016-05-05 10:08:15 -04:00
Patricio Gonzalez Vivo	5b829266c7	adding pictures	2016-05-05 08:38:03 -04:00
Patricio Gonzalez Vivo	bf214eeb93	Merge pull request #65 from patriciogonzalezvivo/karimnaaji/typos-fr ... Minor typos in FR version	2016-05-04 13:00:34 -04:00
Karim Naaji	fa02d94224	Fix minor typos in fr version	2016-05-04 12:51:56 -04:00
Patricio Gonzalez Vivo	d1ede2794e	replacing for images	2016-05-04 08:07:57 -04:00
Patricio Gonzalez Vivo	a10d225516	fixies	2016-05-04 06:41:28 -04:00
Patricio Gonzalez Vivo	519c62e9a4	fixing scroll	2016-05-04 06:31:31 -04:00