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

a5e76234

Commit a5e76234 authored 5 years ago by Pregmodder

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev

parents 75a8cff3 0d6e62bf

Branches

Tags

1 merge request!4423Fixes + other stuff

Changes 11

Expand all Hide whitespace changes

Inline Side-by-side

Showing

src/002-config/mousetrapConfig.js 4 additions, 1 deletion

src/002-config/mousetrapConfig.js
src/SpecialForce/SpecialForce.js 6 additions, 5 deletions

src/SpecialForce/SpecialForce.js
src/SpecialForce/Upgrades.tw 268 additions, 159 deletions

src/SpecialForce/Upgrades.tw
src/endWeek/saChoosesOwnClothes.js 4 additions, 4 deletions

src/endWeek/saChoosesOwnClothes.js
src/init/storyInit.tw 1 addition, 0 deletions

src/init/storyInit.tw
src/js/slaveSummaryWidgets.js 3 additions, 3 deletions

src/js/slaveSummaryWidgets.js
src/pregmod/killSlave.tw 6 additions, 5 deletions

src/pregmod/killSlave.tw
src/pregmod/killedSlave.tw 6 additions, 3 deletions

src/pregmod/killedSlave.tw
src/pregmod/saInflation.tw 1 addition, 1 deletion

src/pregmod/saInflation.tw
src/uncategorized/BackwardsCompatibility.tw 3 additions, 0 deletions

src/uncategorized/BackwardsCompatibility.tw
src/uncategorized/storyCaption.tw 144 additions, 111 deletions

src/uncategorized/storyCaption.tw

with 446 additions and 292 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