806 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Patricio Gonzalez Vivo	abfa452c0d	adding gallery	2016-05-04 06:28:52 -04:00
Patricio Gonzalez Vivo	1b8736ac6f	adding voronoi images	2016-05-04 06:16:35 -04:00
Patricio Gonzalez Vivo	ed3d5e8d88	fixing scroll	2016-05-04 06:10:03 -04:00
Patricio Gonzalez Vivo	a38324d630	grammar correction	2016-05-04 05:56:13 -04:00
Patricio Gonzalez Vivo	897d307dbd	finishing	2016-05-03 17:33:11 -04:00
Patricio Gonzalez Vivo	43765a183e	adding images	2016-05-03 14:31:56 -04:00
Patricio Gonzalez Vivo	5a8f7a23f6	voro	2016-05-03 09:41:52 -04:00
Patricio Gonzalez Vivo	8517e5c4a1	voro	2016-05-03 07:47:51 -04:00
Patricio Gonzalez Vivo	01d2ebc27c	voro	2016-05-02 21:54:13 -04:00
Patricio Gonzalez Vivo	2bb9971c7e	Merge pull request #64 from nicoptere/master ... FR : chapter 3, notes (+ 1 typo in EN version)	2016-05-02 21:05:33 -04:00
Patricio Gonzalez Vivo	7ac4d9ca71	correcting typos	2016-05-02 21:05:14 -04:00
Patricio Gonzalez Vivo	b5f3b1ffcf	notes	2016-05-02 17:20:03 -04:00
Patricio Gonzalez Vivo	6aaba1705c	voro	2016-05-02 17:19:51 -04:00
nicolas barradeau	5c8887cf4f	FR : chapter 3, notes (+ 1 typo in EN version)	2016-05-02 22:56:15 +02:00
Patricio Gonzalez Vivo	8c656e3617	voronoi example	2016-05-02 07:21:16 -04:00
Patricio Gonzalez Vivo	c90a8baa7d	italian	2016-05-02 06:40:14 -04:00
Patricio Gonzalez Vivo	327de614b3	moving things around	2016-05-02 06:39:39 -04:00
Patricio Gonzalez Vivo	f49969f0f1	Merge pull request #63 from riibiax/italiano ... italian chapters: intro, 00 & 01	2016-05-02 06:23:47 -04:00
riibiax	8059db273a	italian chapters: intro, 00 & 01	2016-05-01 21:05:25 +02:00
Patricio Gonzalez Vivo	b0120ca139	Merge pull request #61 from nicoptere/master ... bonjour world!	2016-04-29 16:21:15 -04:00
nicolas barradeau	777395c365	-ignore .idea files & src	2016-04-29 20:03:39 +02:00
nicolas barradeau	42126a1ab2	FR first 3 chapters + 1 note	2016-04-29 20:01:57 +02:00
Patricio Gonzalez Vivo	2bf83cb714	hosting tools on sever	2016-04-26 19:29:03 -04:00
Patricio Gonzalez Vivo	08cd1f523c	fixing button	2016-04-24 15:46:15 -04:00
Patricio Gonzalez Vivo	d72f15fc78	add more button only if there are enouth examples	2016-04-24 15:35:58 -04:00
Patricio Gonzalez Vivo	e31f1c65ba	collaborate	2016-04-24 15:03:09 -04:00