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

3751fd33

Commit 3751fd33 authored 6 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'fixes' into 'pregmod-master'

Fixes

See merge request !2894

parents 34d84def 2285627a

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

devNotes/twine JS.txt 5 additions, 5 deletions

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

src/init/storyInit.tw
src/js/removeActiveSlave.tw 5 additions, 5 deletions

src/js/removeActiveSlave.tw
src/npc/acquisition.tw 1 addition, 1 deletion

src/npc/acquisition.tw
src/pregmod/incubator.tw 4 additions, 2 deletions

src/pregmod/incubator.tw
src/utility/descriptionWidgets.tw 1 addition, 3 deletions

src/utility/descriptionWidgets.tw

with 16 additions and 29 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