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

869c3189

Commit 869c3189 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

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

Rework the beginning of the end-week sequence

See merge request !6665

parents 8d8ab385 bc46469f

No related branches found

No related tags found

Loading

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

js/003-data/gameVariableData.js 0 additions, 1 deletion

js/003-data/gameVariableData.js
src/endWeek/endWeek.js 340 additions, 0 deletions

src/endWeek/endWeek.js
src/gui/storyCaptionWidgets.tw 1 addition, 10 deletions

src/gui/storyCaptionWidgets.tw
src/js/economyJS.js 2 additions, 0 deletions

src/js/economyJS.js
src/uncategorized/endWeek.tw 0 additions, 268 deletions

src/uncategorized/endWeek.tw
src/uncategorized/main.tw 1 addition, 1 deletion

src/uncategorized/main.tw
src/uncategorized/nextWeek.tw 1 addition, 1 deletion

src/uncategorized/nextWeek.tw
src/uncategorized/randomNonindividualEvent.tw 3 additions, 1 deletion

src/uncategorized/randomNonindividualEvent.tw
src/uncategorized/reShelterInspection.tw 2 additions, 11 deletions

src/uncategorized/reShelterInspection.tw
src/uncategorized/slaveAssignmentsReport.tw 3 additions, 4 deletions

src/uncategorized/slaveAssignmentsReport.tw

with 353 additions and 297 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