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

cf5e4749

Commit cf5e4749 authored 4 years ago by Pregmodder

Downloads
- Plain Diff

Merge branch 'storyCaption' into 'pregmod-master'

Story caption to DOM

See merge request pregmodfan/fc-pregmod!7753

parents 6d8f4d89 e8a75dd7

Branches

Tags

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

.eslintignore 1 addition, 2 deletions

.eslintignore
.jshintignore 0 additions, 1 deletion

.jshintignore
src/gui/css/mainStyleSheet.css 5 additions, 3 deletions

src/gui/css/mainStyleSheet.css
src/gui/storyCaption.js 482 additions, 0 deletions

src/gui/storyCaption.js
src/gui/storyCaption.tw 1 addition, 328 deletions

src/gui/storyCaption.tw
src/js/bugReport.js 0 additions, 2 deletions

src/js/bugReport.js
src/js/displayVariables.js 2 additions, 1 deletion

src/js/displayVariables.js
src/js/economyJS.js 36 additions, 17 deletions

src/js/economyJS.js
src/uncategorized/arcmgmt.tw 1 addition, 1 deletion

src/uncategorized/arcmgmt.tw
src/uncategorized/manageArcology.tw 1 addition, 1 deletion

src/uncategorized/manageArcology.tw
tsconfig.json 0 additions, 1 deletion

tsconfig.json

with 529 additions and 357 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