Skip to content

Commit

Permalink
Merge pull request #1270 from klembot/develop
Browse files Browse the repository at this point in the history
2.5.0 release
  • Loading branch information
klembot authored Aug 27, 2022
2 parents 9a5b72d + 859038c commit 8b536f7
Show file tree
Hide file tree
Showing 82 changed files with 2,818 additions and 1,047 deletions.
3 changes: 3 additions & 0 deletions .github/ISSUE_TEMPLATE/bug-report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ body:
- Issues in this repository are for tracking problems with the Twine application. "How do I?" type questions are better answered on community resources like the Intfiction.org forums, Reddit, or Discord.
- If you are having problems with your Twine story when it is being played, then you should report the problem with the story format you are using, not here.
- For those using the **Harlowe** story format (the default format), reports should be filed at [its issue tracker](https://foss.heptapod.net/games/harlowe/-/issues). Guidelines for bug reports are listed [here](https://twine2.neocities.org/#introduction_report-bugs-and-suggest-features).
- For those using the **SugarCube** format, reports should be filed at [its issue tracker](https://github.com/tmedwards/sugarcube-2/issues).
- For those using the **Chapbook** format, reports should be filed at [its issue tracker](https://github.com/klembot/chapbook/issues).
- In order for your issue to be addressed, someone else will need to be able to cause the bug to occur on their own computer in a predictable fashion. Otherwise, it will be impossible to tell if it was actually fixed when it's worked on. Please be as detailed as you can in your description below.
- Usually, new issues are reviewed around once a month. It may take longer.
- If work begins on your bug report, it will be added to a project in this repository. You can track the status of its implementation there.
Expand Down
13 changes: 13 additions & 0 deletions docs/en/src/editing-stories/editing-passages.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,19 @@ extensions](../story-formats/extensions.md).
Twine automatically saves your changes to a passage after you stop typing for a
moment.

## Automatically-Created Links

As you enter text in a passage, Twine will detect when you've added new links.
If the destination passage doesn't already exist, it will create an empty
passage for you. Deleting the link will delete this empty passage.

Twine won't delete an empty passage while editing if any of the criteria below are true:

- It is linked to from another passage
- It has any tags
- It has a different size than the default
- It is the story start

## Text Formatting, Code, Images, Sound, Video... Basically Everything Cool

You should consult the documentation of the story format you are using for how
Expand Down
13 changes: 13 additions & 0 deletions docs/en/src/editing-stories/navigating.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,19 @@ In one corner of the Story Map, you'll see three buttons showing squares of
different sizes. These let you zoom in and out of the map, showing different
levels of detail in your passages.

## Empty Passages

An empty passage is one you haven't written any text in (usually). These show up
in the Story Map as translucent cards with a dotted border. Twine automatically
creates and deletes empty passages when you [edit links in
passages](./editing-passages.md).

## Tags

If you have [assigned colors to passage tags](tagging.md), passages with those
tags will have a small stripe of that color at their top. Tags that do not have
colors assigned will not show a stripe.

## The Story Start

The story's start passage is drawn in the map with a green rocket icon connected
Expand Down
19 changes: 13 additions & 6 deletions docs/en/src/getting-started/getting-around.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,16 @@ Certain actions in Twine will open dialog boxes along one side of the screen
with more detail about a particular action. For example, editing a passage will
open a dialog box with the passage text.

Dialog boxes have an x button in their corner that closes the dialog. They also
have a chevron (›) button on the opposite side that collapses the dialog so that
only its title bar is visible.

You can have as many dialogs open as you have room onscreen from. Right now, the
order of dialogs can't be changed, nor can the size of dialogs onscreen.
Dialog boxes have a few controls in their title bar:

- An x button in their corner that closes the dialog.
- A chevron (›) button on the opposite side that collapses the dialog so that
only its title bar is visible.
- Some dialogs have a maximize button beside their close button which allows a
dialog to fill the available space. To restore a maximized dialog's original
size, use the maximize button again. Only one dialog can be maximized at a
time.

You can have as many dialogs open as you have room onscreen for. Right now, the
order of dialogs can't be changed, nor can their position onscreen be changed.
The width of dialogs can be changed in [preferences](../preferences).
6 changes: 6 additions & 0 deletions docs/en/src/preferences/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,12 @@ uses the theme that matches your system's theme setting, if Twine can determine
it. If Twine can't determine whether your system is using a dark or light theme,
it will default to a light theme.

## Changing Dialogs

The _Dialog Width_ menu controls the width of dialogs. The placement of dialogs
onscreen (e.g. switching them from the right side of the window) cannot be
changed.

## Changing Edit Dialogs

The _Blinking Cursor in Editors_ checkbox controls whether the cursor blinks in
Expand Down
20 changes: 18 additions & 2 deletions electron-builder.config.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,25 @@
const child_process = require('child_process');
const pkg = require('./package.json');

const isPreview =
/alpha|beta|pre/.test(pkg.version) || process.env.FORCE_PREVIEW;

module.exports = {
afterSign(context) {
// This step is necessary to ad hoc sign the app. Otherwise, on Apple
// Silicon you get repeated prompts for file access.
//
// If/when we are able to sign the app for real, this must be removed.
//
// This was cribbed from https://github.com/alacritty/alacritty/issues/5840.

if (context.packager.platform.name === 'mac') {
console.log('Ad hoc signing Mac app...');
child_process.execSync(
'codesign --force --deep --sign - dist/electron/mac-universal/Twine.app'
);
}
},
directories: {
output: 'dist/electron'
},
Expand All @@ -26,7 +42,7 @@ module.exports = {
},
win: {
artifactName: `Twine-${pkg.version}-Windows.exe`,
icon: `icons/app-${isPreview ? 'preview' : 'release'}.ico`,
target: 'nsis'
icon: `icons/app-${isPreview ? 'preview' : 'release'}-no-padding.ico`,
target: {arch: ['x64'], target: 'nsis'}
}
};
Binary file added icons/app-preview-no-padding.ico
Binary file not shown.
Binary file added icons/app-preview-no-padding.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added icons/app-release-no-padding.ico
Binary file not shown.
Binary file added icons/app-release-no-padding.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit 8b536f7

Please sign in to comment.