From 7963ffee91085275e4d4bbe58aaac7725a3c8214 Mon Sep 17 00:00:00 2001 From: Zott820 Date: Sat, 30 Nov 2013 19:52:59 -0800 Subject: [PATCH 1/3] Temporary Commit --- README.md | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c07cd09..cd61709 100644 --- a/README.md +++ b/README.md @@ -1,13 +1,33 @@ -## Overview of This Branch +![My image](https://raw.github.com/fernjager/game-off-2013/formula/Main-Screen-MockupV11-24.png) -Contains Audio and the mathematical Formulas describing the heat transfer into our Turkey +## Overview +It is another Thanksgiving holiday, a time of retrospect and blessings. +You have been invited over for dinner. +Wanting to make a good impression, you agreed to cook the turkey… + +# Turkey Cooking Simulator Features: +* Real-time cooking action! +* Unparalled turkey-based thermodyamics! +* Hours of gripping stories and drama! +* Accessorize your turkey with stuffing, frills, and other awesomeness! +* Day-night environmental cycle! +* High-definition stereo audio! +* Masterfully crafted scenes of an American household! +* Apply your culinary expertise to impress your family! -## Authors -Scott Mobley (Game Director / Math Guy) +## Compatibility -Robert Chen (Programming Slave) +* [Chrome](https://www.google.com/intl/en/chrome/) - Full compatibility, reccomended browser. +* [Safari](http://www.apple.com/safari/) - +* [Firefox](www.firefox.com) - Some issues with svg +* [Internet Explorer](http://windows.microsoft.com/en-us/internet-explorer/download-ie) - Not Reccomended. Sound issues + +## Authors -Ben Kwok (Art Master Crafter) +* [Robert J. Chen](www.youtube.com) - Programming +* [Benjamin Kwok](www.) - Art +* [Scott R. Mobley](ww.ww.ewwe) - Math and Dialogue +* [Sheen Kao](wwwwwjwhjehq) - Supreme Commissar Overlord MC From fa3def9dbd0d5f07038815b67d0df087180f835a Mon Sep 17 00:00:00 2001 From: Zott820 Date: Sat, 30 Nov 2013 20:19:54 -0800 Subject: [PATCH 2/3] Spelling and website updates --- README.md | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index cd61709..916b0ab 100644 --- a/README.md +++ b/README.md @@ -2,13 +2,13 @@ ## Overview -It is another Thanksgiving holiday, a time of retrospect and blessings. +It is another Thanksgiving holiday, a time of retrospect and blessings. You have been invited over for dinner. -Wanting to make a good impression, you agreed to cook the turkey… +Wanting to make a good impression, you agree to cook the turkey… # Turkey Cooking Simulator Features: * Real-time cooking action! -* Unparalled turkey-based thermodyamics! +* Unparalleled turkey-based thermodynamics! * Hours of gripping stories and drama! * Accessorize your turkey with stuffing, frills, and other awesomeness! * Day-night environmental cycle! @@ -18,16 +18,15 @@ Wanting to make a good impression, you agreed to cook the turkey… ## Compatibility - -* [Chrome](https://www.google.com/intl/en/chrome/) - Full compatibility, reccomended browser. -* [Safari](http://www.apple.com/safari/) - -* [Firefox](www.firefox.com) - Some issues with svg -* [Internet Explorer](http://windows.microsoft.com/en-us/internet-explorer/download-ie) - Not Reccomended. Sound issues +* [Firefox](www.firefox.com) - Recommended Browser, Gstreamer required for sound on Mac OS +* [Chrome 22](https://www.google.com/intl/en/chrome/) - Full compatibility, recommended browser. +* [Safari 6.0.5](http://www.apple.com/safari/) - Some incompatibility with SVG +* [Internet Explorer 11](http://windows.microsoft.com/en-us/internet-explorer/download-ie) - Not recommended . Sound looping issues ## Authors -* [Robert J. Chen](www.youtube.com) - Programming -* [Benjamin Kwok](www.) - Art -* [Scott R. Mobley](ww.ww.ewwe) - Math and Dialogue -* [Sheen Kao](wwwwwjwhjehq) - Supreme Commissar Overlord MC +* [Robert J. Chen](www.fernjager.net) - Programming +* [Benjamin Kwok](tengen1112@gmail.com) - Art +* [Scott R. Mobley](http://www.linkedin.com/in/mobleyscott) - Math and Dialogue +* Sheen Kao - Supreme Commissar Overlord MC From ac516d2b27875eeb2608833664f19a7928d2d5cb Mon Sep 17 00:00:00 2001 From: Robert Chen Date: Sat, 30 Nov 2013 20:24:54 -0800 Subject: [PATCH 3/3] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 916b0ab..f2d659a 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ It is another Thanksgiving holiday, a time of retrospect and blessings. You have been invited over for dinner. Wanting to make a good impression, you agree to cook the turkey… -# Turkey Cooking Simulator Features: +## Turkey Cooking Simulator Features: * Real-time cooking action! * Unparalleled turkey-based thermodynamics! * Hours of gripping stories and drama! @@ -25,7 +25,7 @@ Wanting to make a good impression, you agree to cook the turkey… ## Authors -* [Robert J. Chen](www.fernjager.net) - Programming +* [Robert J. Chen](http://fernjager.net) - Programming * [Benjamin Kwok](tengen1112@gmail.com) - Art * [Scott R. Mobley](http://www.linkedin.com/in/mobleyscott) - Math and Dialogue * Sheen Kao - Supreme Commissar Overlord MC