Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

fc-pregmod
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Incidents
- Service Desk

Snippets Groups Projects

da2e20fa

Commit da2e20fa authored 6 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'pregmod-dev' into 'pregmod-master'

fixes

See merge request !3183

parents 80aaf69d 176562d8

Branches

Tags

1 merge request!3183fixes

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

devNotes/twine JS.txt 20 additions, 5 deletions

devNotes/twine JS.txt
src/init/storyInit.tw 21 additions, 0 deletions

src/init/storyInit.tw
src/js/familyTree.tw 6 additions, 5 deletions

src/js/familyTree.tw
src/uncategorized/arcmgmt.tw 1 addition, 1 deletion

src/uncategorized/arcmgmt.tw
src/uncategorized/slaveInteract.tw 1 addition, 1 deletion

src/uncategorized/slaveInteract.tw

with 49 additions and 12 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment