Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

F

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

Snippets Groups Projects

7d3ffa69

Commit 7d3ffa69 authored 7 years ago by Pregmodder

Downloads
- Plain Diff

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

Pregmod v1010-27

See merge request !283

parents 516a8e8e 66d197ae

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

slave variables documentation - Pregmod.txt 2 additions, 0 deletions

slave variables documentation - Pregmod.txt
src/js/storyJS.tw 8 additions, 0 deletions

src/js/storyJS.tw
src/npc/fFeelings.tw 10 additions, 1 deletion

src/npc/fFeelings.tw
src/npc/fKiss.tw 32 additions, 2 deletions

src/npc/fKiss.tw
src/player/actions/fCaress.tw 12 additions, 2 deletions

src/player/actions/fCaress.tw
src/player/actions/fEmbrace.tw 12 additions, 1 deletion

src/player/actions/fEmbrace.tw
src/uncategorized/genericPlotEvents.tw 1 addition, 1 deletion

src/uncategorized/genericPlotEvents.tw

with 77 additions and 7 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