search

ltouroumov / worm-cyoa-v6-fork

Fork of the Worm CYOA V6
21 stars 8 forks source link

Merge latest requests from Discord #19

Closed Arzte closed 1 year ago

Arzte commented 1 year ago

For ease of tracking the individual changes and to allow for easier reverts, each request is a separate commit.

Igor's changes, despite having been submitted last merged first for ease of git conflict (as Igor's changes will inadvertently overwrite Punchingtucan's changes otherwise)

The changes made are within the commits messages/descriptions, however, links to the discord messages for the requests are here and here for convenience.

Notably, I "upgraded" Punchingtucan's spelling fixes with more comprehensive grammar and spelling fixes.

Arzte commented 1 year ago

Making a couple of changes to the first commit, please hold on merging.

Arzte commented 1 year ago

Okay, this is good to merge, I've removed Punchingtucan's merge request as the changes Igor made to CHIM perform the patch that Punchingtucan made already, alongside my own grammar/spelling fixes I made to that and other objects.

ltouroumov commented 1 year ago

I had to do a manual merge since the branch was modifying the row conditions that I fixed in 9150818c19b526707d46388f1d4b6fb4bd9b2f1e

Arzte commented 1 year ago

Must have forgotten to pull from master before the last push, whoops.