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

5eb9905d

Commit 5eb9905d authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'private-tutoring' into 'pregmod-master'

Private Tutoring System

See merge request !7343

parents 804302b3 893fd1c8

Branches

Tags

1 merge request!7343Private Tutoring System

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

js/003-data/gameVariableData.js 17 additions, 0 deletions

js/003-data/gameVariableData.js
src/endWeek/saTakeClasses.js 200 additions, 15 deletions

src/endWeek/saTakeClasses.js
src/endWeek/schoolroomReport.js 2 additions, 1 deletion

src/endWeek/schoolroomReport.js
src/facilities/schoolroom/schoolroomFramework.js 2 additions, 1 deletion

src/facilities/schoolroom/schoolroomFramework.js
src/gui/Encyclopedia/encyclopedia.tw 1 addition, 1 deletion

src/gui/Encyclopedia/encyclopedia.tw
src/interaction/slaveInteract.js 59 additions, 0 deletions

src/interaction/slaveInteract.js
src/js/utilsFC.js 459 additions, 6 deletions

src/js/utilsFC.js

with 740 additions and 24 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