455 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Patricio Gonzalez Vivo	e31f1c65ba	collaborate	2016-04-24 15:03:09 -04:00
kynd	26d0952be4	a little more spacing for more	2016-04-24 11:24:36 -07:00
kynd	e083551946	edited gallery credit	2016-04-24 11:16:56 -07:00
kynd	70bf7dd91b	more button	2016-04-24 11:02:16 -07:00
Patricio Gonzalez Vivo	2ea536a30b	adding collaboration section	2016-04-24 13:57:01 -04:00
Patricio Gonzalez Vivo	4d5d8419b7	french version not very far away	2016-04-24 11:28:09 -04:00
Patricio Gonzalez Vivo	5d37b89432	styling	2016-04-24 11:26:26 -04:00
kynd	b3b07fc514	roughly stylized gallery	2016-04-23 23:27:26 -07:00
Patricio Gonzalez Vivo	fcf3118444	minor ajustments	2016-04-23 20:08:07 -04:00
Patricio Gonzalez Vivo	cbbd9b46e4	all in one php	2016-04-23 19:57:01 -04:00
Patricio Gonzalez Vivo	1cda999118	fixing stuff	2016-04-23 19:26:11 -04:00
Patricio Gonzalez Vivo	c30baccb02	no featured exampes on chp3	2016-04-23 18:14:06 -04:00
Patricio Gonzalez Vivo	15167aa1ee	fixing gallery thumbnails	2016-04-23 17:59:57 -04:00
Patricio Gonzalez Vivo	a363055286	improving galleries	2016-04-23 16:21:36 -04:00
Patricio Gonzalez Vivo	ce98876cad	adding subnails	2016-04-23 14:13:44 -04:00
Patricio Gonzalez Vivo	ddba3744c2	adding examples	2016-04-23 11:58:02 -04:00
Patricio Gonzalez Vivo	871adb32c7	redistributing	2016-04-23 11:57:33 -04:00
Patricio Gonzalez Vivo	6d20480e5e	uploading students work as log	2016-04-23 11:09:53 -04:00
Patricio Gonzalez Vivo	d1f744fdea	mergin master in	2016-04-23 10:57:33 -04:00
Patricio Gonzalez Vivo	dbaacce15f	updating	2016-04-23 10:56:28 -04:00
kynd	857340cc63	gallery top loads texts from each chapter	2016-04-22 23:03:47 -07:00
Patricio Gonzalez Vivo	177cbb9f75	adding some fbm	2016-04-18 22:14:12 -04:00
kynd	da1e141582	fixed data persing bug	2016-04-17 16:56:31 -07:00
kynd	683eba0d69	deleted backup file	2016-04-17 12:54:43 -07:00
kynd	46a069c750	adopted new GlslGallery	2016-04-17 12:48:36 -07:00
Patricio Gonzalez Vivo	678a71e18b	start writing chp 12	2016-04-17 12:26:30 -04:00
kynd	9fc35c7c0d	all examples open in the editor	2016-04-15 22:34:32 -07:00
kynd	16deec9b27	updated from master	2016-04-13 21:33:47 -07:00
kynd	bef64d4659	Merge branch 'master' into gallery	2016-04-13 21:32:54 -07:00
kynd	443367034d	fixed a few broken thumbnails	2016-04-13 21:32:25 -07:00
Patricio Gonzalez Vivo	157cb445c1	submodule glslGallery	2016-04-12 11:03:39 -04:00
Patricio Gonzalez Vivo	3a7614706f	glslGallery module	2016-04-12 11:02:11 -04:00
Patricio Gonzalez Vivo	a6fec2ea54	adding glslGallery	2016-04-12 11:01:18 -04:00
Patricio Gonzalez Vivo	05464ec854	glslGallery	2016-04-12 11:00:56 -04:00
kynd	78e4a80592	simplified script using glslGallery	2016-04-10 19:23:35 -07:00
Patricio Gonzalez Vivo	2d35fde4f4	folder structure for glossary	2016-04-06 11:44:45 -04:00
Patricio Gonzalez Vivo	6441e53bcf	adding new tools	2016-04-06 11:29:12 -04:00
kynd	78600b082f	fixed js/css path	2016-04-04 19:45:51 -07:00
Patricio Gonzalez Vivo	0f4b59f2eb	adding more thumbs	2016-04-03 17:59:19 -04:00
Patricio Gonzalez Vivo	32c7fc1fe1	adding thumbs	2016-04-03 17:25:06 -04:00
Patricio Gonzalez Vivo	e9bcec4e53	adding makeThumbs script	2016-04-03 17:21:59 -04:00
Patricio Gonzalez Vivo	80381dbabd	merging	2016-04-03 17:21:23 -04:00
Patricio Gonzalez Vivo	fb1d171a10	adding python script to make thumbs	2016-04-03 17:20:30 -04:00
Patricio Gonzalez Vivo	9e402878ee	Merge pull request #58 from tornoteli/translation-ch ... proofread ch07	2016-04-03 12:34:05 -04:00
tornote	d2caf1cb1d	proofread ch07	2016-04-04 00:04:53 +08:00
Patricio Gonzalez Vivo	49b75ba196	Merge pull request #57 from yishn/master ... Proper Chinese font	2016-03-29 11:42:07 -04:00
Yichuan Shen	e56a57a103	Proper Chinese font	2016-03-29 17:34:01 +02:00
Patricio Gonzalez Vivo	1ebcbe1ced	Merge pull request #56 from tornoteli/translation-ch ... translation-ch Proofread	2016-03-29 09:34:53 -04:00
tornote	cf76aa22ab	update to upstream Merge branch 'master' of https://github.com/patriciogonzalezvivo/thebookofshaders into translation-ch	2016-03-29 21:14:07 +08:00
tornote	05ebf99aee	proofread	2016-03-26 15:58:48 +08:00