Merge branch 'master' into viraji-incubator

camerons · Nov 29, 2020 · faf2cbb · faf2cbb
2 parents 2330767 + ecb5851
commit faf2cbb
Show file tree

Hide file tree

Showing 33 changed files with 13,313 additions and 694 deletions.
diff --git a/ia-guide/.github/workflows/build.yml → .github/workflows/build.yml b/ia-guide/.github/workflows/build.yml → .github/workflows/build.yml
@@ -6,25 +6,24 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v1
 
       - name: Use Go 1.13
         uses: actions/setup-go@v1
         with:
           go-version: 1.13.x
-          persist-credentials: false
 
-      - name: build game
+      - name: build
         run: |
           go get github.com/tmedwards/tweego
           export PATH=$PATH:$(go env GOPATH)/bin
-          tweego ia-cyoa.tw -o dist/index.html
+          tweego -f chapbook-1 ia-guide/ia-cyoa.tw -o dist/ia-cyoa.html
 
 
       - name: Deploy
-        uses: loquacity/actions-gh-pages@v2
+        uses: peaceiris/actions-gh-pages@v2
         env:
           PERSONAL_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           PUBLISH_BRANCH: gh-pages
           PUBLISH_DIR: ./dist
-          CLEAN: true
+          CLEAN: true
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "twee3LanguageTools.storyformat.current": ""
+}
diff --git a/dist/ia-cyoa.html b/dist/ia-cyoa.html
diff --git a/ia-guide/example.html b/ia-guide/example.html
diff --git a/ia-guide/ia-cyoa.tw b/ia-guide/ia-cyoa.tw
diff --git a/ia-guide/ia-static.md b/ia-guide/ia-static.md
diff --git a/ia-guide/images/banana.png b/ia-guide/images/banana.png
diff --git a/ia-guide/images/banana.svg b/ia-guide/images/banana.svg
diff --git a/ia-guide/images/car.png b/ia-guide/images/car.png
diff --git a/ia-guide/images/car.svg b/ia-guide/images/car.svg
diff --git a/ia-guide/images/dog.PNG b/ia-guide/images/dog.PNG
diff --git a/ia-guide/images/dog.svg b/ia-guide/images/dog.svg
diff --git a/ia-guide/images/hello_peeps.png b/ia-guide/images/hello_peeps.png
diff --git a/ia-guide/images/hello_peeps.svg b/ia-guide/images/hello_peeps.svg
diff --git a/ia-guide/images/name.png b/ia-guide/images/name.png
diff --git a/ia-guide/images/name.svg b/ia-guide/images/name.svg
diff --git a/ia-guide/images/platypus.PNG b/ia-guide/images/platypus.PNG
diff --git a/ia-guide/images/platypus.svg b/ia-guide/images/platypus.svg
diff --git a/ia-guide/images/reader_world.png b/ia-guide/images/reader_world.png
diff --git a/ia-guide/images/reader_world.svg b/ia-guide/images/reader_world.svg
diff --git a/ia-guide/images/stuck.png b/ia-guide/images/stuck.png
diff --git a/ia-guide/images/stuck.svg b/ia-guide/images/stuck.svg
diff --git a/ia-guide/images/tooster.png b/ia-guide/images/tooster.png
diff --git a/ia-guide/images/tooster.svg b/ia-guide/images/tooster.svg
diff --git a/ia-guide/images/unirat.PNG b/ia-guide/images/unirat.PNG
diff --git a/ia-guide/images/unirat.svg b/ia-guide/images/unirat.svg
diff --git a/ia-guide/images/wave.png b/ia-guide/images/wave.png
diff --git a/ia-guide/images/wave.svg b/ia-guide/images/wave.svg
diff --git a/ia-guide/output.html b/ia-guide/output.html
diff --git a/ia-guide/storyformats/chapbook-1/LICENSE → storyformats/chapbook-1/LICENSE b/ia-guide/storyformats/chapbook-1/LICENSE → storyformats/chapbook-1/LICENSE
diff --git a/ia-guide/storyformats/chapbook-1/format.js → storyformats/chapbook-1/format.js b/ia-guide/storyformats/chapbook-1/format.js → storyformats/chapbook-1/format.js
diff --git a/ia-guide/storyformats/chapbook-1/logo.svg → storyformats/chapbook-1/logo.svg b/ia-guide/storyformats/chapbook-1/logo.svg → storyformats/chapbook-1/logo.svg
diff --git a/style-guide/template-style-guide.md b/style-guide/template-style-guide.md
@@ -123,9 +123,9 @@ The following table describes the history of all decisions and revisions made to
 this style guide over time. This guide uses the Major.Minor.Patch
 [semantic versioning](https://semver.org/) convention.
 
-Edition  |  Date      |  Lead Author(s)    |  Link to Repository Commit/Tag
--------  |  ----      |  --------------    |  -----------------------------
-{0.1}    |  {1/1/11}  |  {Your name here}  |  First draft of Style Guide
+Edition  |  Date          |  Lead Author(s)    |  Link to Repository Commit/Tag
+-------  |  ----          |  --------------    |  -----------------------------
+{0.1}    |  {YYYY-MM-DD}  |  {Your name here}  |  First draft of Style Guide
 
 
 ## Decision log
@@ -136,6 +136,6 @@ needed.}
 The following table describes the history of all decisions made to this style
 guide over time:
 
-Ref  |  Date     |  Description                               |  Agreed to by
----  |  ----     |  -----------                               |  ------------
-1    | {1/1/11}  |  {Explain the decision that was made here} |  {Name or role}
+Ref  |  Date         |  Description                               |  Agreed to by
+---  |  ----         |  -----------                               |  ------------
+1    | {YYYY-MM-DD}  |  {Explain the decision that was made here} |  {Name or role}