Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add More Example Games #20

Merged
merged 24 commits into from
Apr 10, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
eda89ab
add option to re-create the default games if needed
amiantos Apr 5, 2023
11aae6b
reorganize buttons
amiantos Apr 5, 2023
b018902
rename button for clarity
amiantos Apr 5, 2023
82bbe2b
Merge master into more-default-books
amiantos Apr 5, 2023
378ebe8
Merge master into more-default-books
amiantos Apr 5, 2023
61cccf8
Merge master into more-default-books
amiantos Apr 5, 2023
280eab3
fix trailing whitespace that swiftlint didn't like
amiantos Apr 5, 2023
31eb0c6
add the beginning of a sample game
amiantos Apr 5, 2023
06f83ac
Merge master into more-default-books
amiantos Apr 6, 2023
241a3d1
fix cache maybe
amiantos Apr 6, 2023
e8031db
run swiftformat
amiantos Apr 6, 2023
cfccc28
remove mac catalyst option
amiantos Apr 6, 2023
35a318c
update settings according to warning
amiantos Apr 6, 2023
621d6ea
disable opening brace rule due to swiftformat
amiantos Apr 6, 2023
ff6e5a0
Merge master into more-default-books
amiantos Apr 6, 2023
9911979
update book
amiantos Apr 7, 2023
f370f39
turn catalyst back on
amiantos Apr 7, 2023
e09762c
add another sample book, "a pirate adventure"
amiantos Apr 7, 2023
baf85df
Merge master into more-default-books
amiantos Apr 7, 2023
682bce6
Merge master into more-default-books
amiantos Apr 10, 2023
396952e
remove unfinished defeat the dragon story
amiantos Apr 10, 2023
2ecdf9f
update a pirate adventure
amiantos Apr 10, 2023
32c3d12
change game name to Pirate Adventure so it's sorted under the intro book
amiantos Apr 10, 2023
96dc599
switch to cancelablealert
amiantos Apr 10, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/swift.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,15 +24,15 @@ jobs:
- uses: actions/cache@v2
with:
path: .build/release/swiftformat
key: $-linting-swiftformat-$
key: linting-swiftformat-0.51.4
- name: Build nicklockwood/SwiftFormat
run: |
if [ -f ".build/release/swiftformat" ]; then
if ! [ -x "$(command -v swift-format)" ]; then
sudo cp -f .build/release/swiftformat /usr/local/bin/swiftformat
fi
else
git clone --depth 1 --branch master https://github.com/nicklockwood/SwiftFormat
git clone --depth 1 --branch 0.51.4 https://github.com/nicklockwood/SwiftFormat
cd SwiftFormat
swift build --disable-sandbox -c release
mv .build .. && cd ..
Expand Down
1 change: 1 addition & 0 deletions .swiftlint.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
disabled_rules:
- trailing_comma
- opening_brace
opt_in_rules:
- empty_count
- empty_string
Expand Down
10 changes: 10 additions & 0 deletions GamebookEngine.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
44C522EB232F0B6D00E7AC95 /* GamePlayer.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44C522EA232F0B6D00E7AC95 /* GamePlayer.swift */; };
44CB58C32326CFB6009E49D9 /* An Introduction to Gamebook Engine.gbook in Resources */ = {isa = PBXBuildFile; fileRef = 44CB58C22326CFB6009E49D9 /* An Introduction to Gamebook Engine.gbook */; };
44CB58C523286792009E49D9 /* Logging.swift in Sources */ = {isa = PBXBuildFile; fileRef = 44CB58C423286792009E49D9 /* Logging.swift */; };
44DE965929E3C687002E932B /* A Pirate Adventure.gbook in Resources */ = {isa = PBXBuildFile; fileRef = 44DE965829E3C687002E932B /* A Pirate Adventure.gbook */; };
B402FFEE2315FEFA00900020 /* MarkdownEditorViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = B402FFEC2315FEFA00900020 /* MarkdownEditorViewController.swift */; };
B402FFEF2315FEFA00900020 /* MarkdownEditorViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = B402FFED2315FEFA00900020 /* MarkdownEditorViewController.xib */; };
B402FFF22316055000900020 /* BRMarkdownParser.swift in Sources */ = {isa = PBXBuildFile; fileRef = B402FFF12316055000900020 /* BRMarkdownParser.swift */; };
Expand Down Expand Up @@ -149,6 +150,7 @@
44C522EA232F0B6D00E7AC95 /* GamePlayer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GamePlayer.swift; sourceTree = "<group>"; };
44CB58C22326CFB6009E49D9 /* An Introduction to Gamebook Engine.gbook */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "An Introduction to Gamebook Engine.gbook"; sourceTree = "<group>"; };
44CB58C423286792009E49D9 /* Logging.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Logging.swift; sourceTree = "<group>"; };
44DE965829E3C687002E932B /* A Pirate Adventure.gbook */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "A Pirate Adventure.gbook"; sourceTree = "<group>"; };
B402FFEC2315FEFA00900020 /* MarkdownEditorViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MarkdownEditorViewController.swift; sourceTree = "<group>"; };
B402FFED2315FEFA00900020 /* MarkdownEditorViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MarkdownEditorViewController.xib; sourceTree = "<group>"; };
B402FFF12316055000900020 /* BRMarkdownParser.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BRMarkdownParser.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -299,6 +301,7 @@
44CB58BF2326CDDB009E49D9 /* Built-in Gamebooks */ = {
isa = PBXGroup;
children = (
44DE965829E3C687002E932B /* A Pirate Adventure.gbook */,
44CB58C22326CFB6009E49D9 /* An Introduction to Gamebook Engine.gbook */,
);
path = "Built-in Gamebooks";
Expand Down Expand Up @@ -618,6 +621,7 @@
44ADBA8923404BBB00855649 /* fileicon-ipad-320px.png in Resources */,
B4A13AD6230F6D24004929B8 /* PageEditorDecisionTableViewCell.xib in Resources */,
B448875623063A0E000E2FDD /* Assets.xcassets in Resources */,
44DE965929E3C687002E932B /* A Pirate Adventure.gbook in Resources */,
B4A13AD2230F5B08004929B8 /* PlayDecisionTableViewCell.xib in Resources */,
44ADBA8723404BBB00855649 /* fileicon-ipad-64px.png in Resources */,
4407F51929DD22C800119893 /* LICENSE in Resources */,
Expand Down Expand Up @@ -928,6 +932,9 @@
);
PRODUCT_BUNDLE_IDENTIFIER = net.amiantos.BRGamebookEngine;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand All @@ -950,6 +957,9 @@
);
PRODUCT_BUNDLE_IDENTIFIER = net.amiantos.BRGamebookEngine;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES;
SWIFT_VERSION = 5.0;
TARGETED_DEVICE_FAMILY = "1,2";
};
Expand Down
Loading