806 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Patricio Gonzalez Vivo	b79b4831c6	more changes	2016-12-13 16:25:58 -05:00
Patricio Gonzalez Vivo	9d94155128	adding glslviewer	2016-12-13 16:20:19 -05:00
Patricio Gonzalez Vivo	b2124b6dd7	Merge pull request #125 from donmccurdy/patch-1 ... Fix small typo in chapter 01.	2016-12-07 13:42:35 -08:00
Don McCurdy	47cd4d6b4a	Fix small typo in chapter 01.	2016-12-07 11:41:23 -10:00
Patricio Gonzalez Vivo	e060b0e81a	Merge pull request #124 from patriciogonzalezvivo/translation-jp ... Fix errors about iteration	2016-11-30 14:00:22 -08:00
kynd	8903d0d1aa	Fix errors about iteration	2016-11-30 13:10:46 -08:00
Patricio Gonzalez Vivo	442d918d73	second error	2016-11-30 15:59:29 -05:00
Patricio Gonzalez Vivo	88af21945e	error catch in chapter 12	2016-11-30 15:53:46 -05:00
Patricio Gonzalez Vivo	b748d43c8a	Merge pull request #123 from patriciogonzalezvivo/translation-jp ... Translate chapter 13	2016-11-30 09:30:08 -08:00
kynd	d686fb5246	Merge branch 'master' into translation-jp	2016-11-30 05:09:34 -08:00
kynd	361e7d5b43	Proofread and fix 12 JP	2016-11-30 05:09:28 -08:00
kynd	66aad8bfc7	Removed English from chapter 13 JP	2016-11-29 08:56:09 -08:00
kynd	21723bedc4	Translate chapter 13	2016-11-29 08:38:49 -08:00
Patricio Gonzalez Vivo	03dbfa05bd	Merge pull request #120 from patriciogonzalezvivo/gallery ... Add note on cellular noise	2016-11-28 13:27:43 -08:00
kynd	cb22099ba6	Add Procedural Textures to the gallery	2016-11-28 13:21:19 -08:00
kynd	7a7bc37a92	Merge branch 'master' into gallery	2016-11-27 10:27:26 -08:00
kynd	be5dcb3f85	Merge branch 'master' into translation-jp	2016-11-26 03:47:45 -08:00
Patricio Gonzalez Vivo	5921ddcf15	Merge pull request #121 from patriciogonzalezvivo/translation-jp ... Update index	2016-11-21 09:49:49 -08:00
kynd	6b2f0d2d8f	Merge branch 'master' into translation-jp	2016-11-22 02:27:29 +09:00
kynd	c9f6b18581	Update index	2016-11-22 02:27:25 +09:00
kynd	753e5c47f6	Merge branch 'master' into gallery	2016-11-22 02:26:03 +09:00
kynd	3b2ba8e8f5	fix typo	2016-11-22 02:26:00 +09:00
kynd	a680b571ce	Add note on cellular noise	2016-11-22 02:24:41 +09:00
Patricio Gonzalez Vivo	1f2d717530	Merge pull request #119 from patriciogonzalezvivo/translation-jp ... Translate chapter 12 to JP	2016-11-21 09:20:18 -08:00
kynd	bfa08c071d	Merge branch 'master' into translation-jp	2016-11-22 02:18:08 +09:00
kynd	a0e1ce43fe	Translate chapter 12 to JP	2016-11-22 02:18:04 +09:00
Patricio Gonzalez Vivo	8f0ed0b7bd	Merge pull request #118 from patriciogonzalezvivo/gallery ... Add procedural texture examples	2016-11-21 05:08:30 -08:00
kynd	62a7d09b01	Add procedural texture examples	2016-11-21 19:21:06 +09:00
kynd	94820c5d40	Merge branch 'master' into gallery	2016-11-21 04:43:02 +09:00
Patricio Gonzalez Vivo	5fda8a94d7	Merge pull request #117 from MITI67/master ... read it all again	2016-11-17 06:07:00 -08: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
Patricio Gonzalez Vivo	87486ceb7d	Merge pull request #112 from hisaac/patch-1 ... Fixed a small typo	2016-11-15 05:40:49 -08:00
Patricio Gonzalez Vivo	30c02df168	deuthc	2016-11-15 08:37:50 -05:00
Patricio Gonzalez Vivo	d2a9cc5a38	fixing README.md	2016-11-15 08:34:28 -05:00
Patricio Gonzalez Vivo	5b64cf8ac4	Merge pull request #116 from MITI67/master ... Four german translated files updated, characeter set was wrong (not UTF-8)	2016-11-15 05:33:18 -08:00
MITI67	6c46f2482e	Merge remote-tracking branch 'refs/remotes/patriciogonzalezvivo/master'	2016-11-15 09:34:27 +01:00
MITI67	fa9f7d8322	the last missing german chapters	2016-11-15 09:26:30 +01:00
Isaac Halvorson	904bb4a3c5	Graphic card -> graphics card ... I just pluralized 'graphics card' again. I think this is the more accurate way of writing it.	2016-11-11 07:42:26 -06:00
MITI67	50b893cc98	Merge remote-tracking branch 'refs/remotes/patriciogonzalezvivo/master' ... # Conflicts: # README.md	2016-11-11 14:23:11 +01:00
MITI67	be4d255b33	Merge remote-tracking branch 'refs/remotes/patriciogonzalezvivo/master'	2016-11-11 14:22:11 +01:00
Patricio Gonzalez Vivo	73381155a5	Merge pull request #114 from hisaac/patch-2 ... pluralize graphic to graphics	2016-11-11 03:09:19 -08:00
Isaac Halvorson	c94fd3e22a	pluralize graphic to graphics ... I've pluralized the word 'graphic' in 'graphics card processes'.	2016-11-10 19:49:57 -06:00
MITI67	78ad1de5a2	new: german translation	2016-11-10 19:30:30 +01:00
MITI67	d6fe79f61d	new: german translation	2016-11-10 19:30:15 +01:00
MITI67	4ff4c5e837	new: german translation	2016-11-10 19:29:38 +01:00
MITI67	f355e85440	new: german translation	2016-11-10 19:29:07 +01:00
MITI67	37a20a3c92	new: german translation	2016-11-10 19:28:47 +01:00
MITI67	e35654e936	new: german translation	2016-11-10 19:28:23 +01:00
MITI67	5f142f5dcc	new: german translation	2016-11-10 19:28:00 +01:00
MITI67	b008862ab5	new: german translation	2016-11-10 19:26:52 +01:00