Skip to content
Snippets Groups Projects
Commit 16f0a3a1 authored by Arkerthan's avatar Arkerthan
Browse files

Update SC2 to v2.36.1

parent 9e4dc785
No related branches found
No related tags found
1 merge request!10542Update SC2 to v2.36.1
...@@ -52,7 +52,7 @@ sanity: ...@@ -52,7 +52,7 @@ sanity:
./sanityCheck.sh ./sanityCheck.sh
sugarcube: sugarcube:
(cd submodules/sugarcube-2/ && node build.js -6 -b 2) (cd submodules/sugarcube-2/ && node build.js -n -b 2)
mv submodules/sugarcube-2/build/twine2/sugarcube-2/format.js devTools/tweeGo/storyFormats/sugarcube-2/format.js mv submodules/sugarcube-2/build/twine2/sugarcube-2/format.js devTools/tweeGo/storyFormats/sugarcube-2/format.js
(cd submodules/sugarcube-2/ && git diff master fc > sugarcube-fc-changes.patch) (cd submodules/sugarcube-2/ && git diff master fc > sugarcube-fc-changes.patch)
mv submodules/sugarcube-2/sugarcube-fc-changes.patch devNotes/"sugarcube stuff"/sugarcube-fc-changes.patch mv submodules/sugarcube-2/sugarcube-fc-changes.patch devNotes/"sugarcube stuff"/sugarcube-fc-changes.patch
......
...@@ -30,8 +30,8 @@ The SC2 sources are a git submodule. ...@@ -30,8 +30,8 @@ The SC2 sources are a git submodule.
Run the build.js script. If you use Git bash, you can run the `build.js` file directly, otherwise run Run the build.js script. If you use Git bash, you can run the `build.js` file directly, otherwise run
it as `node build.js`. See `build.js -h` for options, but reasonable sets are the following. it as `node build.js`. See `build.js -h` for options, but reasonable sets are the following.
* for release version: `node build.js -6 -b 2` * for release version: `node build.js -n -b 2`
* for debug version: `node build.js -6 -b 2 -u -d` * for debug version: `node build.js -n -b 2 -u -d`
Find result files in the `build` directory. After each build you have to copy the release `format.js` to Find result files in the `build` directory. After each build you have to copy the release `format.js` to
`devTools/tweeGo/storyFormats/sugarcube-2`. Do not forget to `git add` the file. `devTools/tweeGo/storyFormats/sugarcube-2`. Do not forget to `git add` the file.
......
diff --git a/README.md b/README.md diff --git a/README.md b/README.md
index 94f98a2..f8bc5c4 100644 index 1203114..645f68b 100644
--- a/README.md --- a/README.md
+++ b/README.md +++ b/README.md
@@ -1,3 +1,39 @@ @@ -1,3 +1,39 @@
...@@ -43,10 +43,10 @@ index 94f98a2..f8bc5c4 100644 ...@@ -43,10 +43,10 @@ index 94f98a2..f8bc5c4 100644
[SugarCube](http://www.motoslave.net/sugarcube/) is a free (gratis and libre) story format for [Twine/Twee](http://twinery.org/). [SugarCube](http://www.motoslave.net/sugarcube/) is a free (gratis and libre) story format for [Twine/Twee](http://twinery.org/).
diff --git a/build.js b/build.js diff --git a/build.js b/build.js
index 661ddb2..fd063f2 100644 index cfe166c..78614d5 100644
--- a/build.js --- a/build.js
+++ b/build.js +++ b/build.js
@@ -29,6 +29,7 @@ const CONFIG = { @@ -31,6 +31,7 @@ const CONFIG = {
'src/lib/jquery-plugins.js', 'src/lib/jquery-plugins.js',
'src/lib/util.js', 'src/lib/util.js',
'src/lib/simplestore/simplestore.js', 'src/lib/simplestore/simplestore.js',
......
This diff is collapsed.
Subproject commit 4ca9372cf5104c97f564f1bf01ea1860e50deffc Subproject commit 9b7d1c4b0760638ce1f4bf788e919cd449a9538c
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment