Skip to content

Commit 0cc4f4c

Browse files
author
ShinryakuTako
committed
Merge branch 'develop'
2 parents dbb54bc + 1ef1479 commit 0cc4f4c

File tree

5 files changed

+25
-19
lines changed

5 files changed

+25
-19
lines changed

‎Documentation/Coding Conventions & Design Decisions.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@
3636

3737
----
3838

39-
OctopusKit © 2018 InvadingOctopus.com, github.com/invadingoctopus/octopuskit
40-
[Apache License 2.0][license]
39+
OctopusKit © 2018 [Invading Octopus][website] • [Apache License 2.0][license] • [github.com/invadingoctopus/octopuskit][repository]
4140

41+
[repository]: https://github.com/invadingoctopus/octopuskit
42+
[website]: https://invadingoctopus.io
4243
[license]: https://www.apache.org/licenses/LICENSE-2.0.html
43-

‎Documentation/TODO & Roadmap.md‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,8 @@
4545

4646
----
4747

48-
OctopusKit © 2018 InvadingOctopus.com, github.com/invadingoctopus/octopuskit
49-
[Apache License 2.0][license]
48+
OctopusKit © 2018 [Invading Octopus][website] • [Apache License 2.0][license] • [github.com/invadingoctopus/octopuskit][repository]
5049

50+
[repository]: https://github.com/invadingoctopus/octopuskit
51+
[website]: https://invadingoctopus.io
5152
[license]: https://www.apache.org/licenses/LICENSE-2.0.html
52-
53-

‎Documentation/Tips & Troubleshooting.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@ If an entity needs multiple components of the same type but with different param
7676

7777
----
7878

79-
OctopusKit © 2018 InvadingOctopus.com, github.com/invadingoctopus/octopuskit
80-
[Apache License 2.0][license]
79+
OctopusKit © 2018 [Invading Octopus][website] • [Apache License 2.0][license] • [github.com/invadingoctopus/octopuskit][repository]
8180

81+
[repository]: https://github.com/invadingoctopus/octopuskit
82+
[website]: https://invadingoctopus.io
8283
[license]: https://www.apache.org/licenses/LICENSE-2.0.html

‎Documentation/Usage Guide.md‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,10 @@
2121

2222
3. Modify the `TitleScene.swift` and `PlayScene.swift` files in the `Scenes` folders to customize them for your game.
2323

24+
> The file names are prefixed with `Step #` so you can follow the flow of execution at a glance.
25+
>
26+
> 💡 Browse the `OctopusKit/Components` folder and try experimenting with the different components!
27+
>
2428
> 💡 If something goes wrong, see [Tips & Troubleshooting.][tips-&-troubleshooting]
2529
2630
### To import OctopusKit into a new or existing project:
@@ -270,9 +274,10 @@ Set the custom class of the scene as `OctopusScene` or a subclass of it. Load th
270274

271275
----
272276

273-
OctopusKit © 2018 InvadingOctopus.com, github.com/invadingoctopus/octopuskit
274-
[Apache License 2.0][license]
277+
OctopusKit © 2018 [Invading Octopus][website] • [Apache License 2.0][license] • [github.com/invadingoctopus/octopuskit][repository]
275278

279+
[repository]: https://github.com/invadingoctopus/octopuskit
280+
[website]: https://invadingoctopus.io
276281
[license]: https://www.apache.org/licenses/LICENSE-2.0.html
277282

278283
[quickstart-project]: ../../../releases

‎README.md‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Built upon Apple's SpriteKit, GameplayKit and Metal technologies.
77
2. [Overview](#overview)
88
3. [Design Goals](#design-goals)
99
4. [Getting Started](#getting-started)
10-
5. [Etcetera](#etcetera) (license, contact, etc.)
10+
5. [Etcetera](#etcetera) (license, contact etc.)
1111

1212
🚀 *Anxious to dive in? Download the [Quickstart project.][quickstart-project]*
1313

@@ -214,8 +214,14 @@ Set the custom class of the scene as `OctopusScene` or a subclass of it. Load th
214214

215215
----
216216

217-
OctopusKit © 2018 InvadingOctopus.com, github.com/invadingoctopus/octopuskit
218-
[Apache License 2.0][license]
217+
OctopusKit © 2018 [Invading Octopus][website] • [Apache License 2.0][license] • [github.com/invadingoctopus/octopuskit][repository]
218+
219+
[repository]: https://github.com/invadingoctopus/octopuskit
220+
[website]: https://invadingoctopus.io
221+
[license]: https://www.apache.org/licenses/LICENSE-2.0.html
222+
[twitter]: https://twitter.com/invadingoctopus
223+
[discord]: https://discord.gg/y3har7D
224+
[patreon]: https://www.patreon.com/invadingoctopus
219225

220226
[quickstart-&-usage-guide]: ./Documentation/Usage%20Guide.md
221227
[quickstart-project]: ../../releases
@@ -226,11 +232,6 @@ OctopusKit © 2018 InvadingOctopus.com, github.com/invadingoctopus/octopuskit
226232
[swift-book]: https://docs.swift.org/swift-book/GuidedTour/GuidedTour.html
227233
[swift-api-guidelines]: https://swift.org/documentation/api-design-guidelines/
228234
[wwdc-610]: https://developer.apple.com/videos/play/wwdc2016-610/?time=137
229-
230235
[composition-over-inheritance]: https://en.wikipedia.org/wiki/Composition_over_inheritance
231236
[entity–component–system]: https://en.wikipedia.org/wiki/Entity–component–system
232237

233-
[patreon]: https://www.patreon.com/invadingoctopus
234-
[twitter]: https://twitter.com/invadingoctopus
235-
[discord]: https://discord.gg/y3har7D
236-
[license]: https://www.apache.org/licenses/LICENSE-2.0.html

0 commit comments

Comments
 (0)