Commits · 0523a0fa3aa17f987074b7d3e27ac2eb863459c1 · macaronideath / fc-pregmod

Aug 10, 2020
- Merge branch 'pregmod-dev' into 'pregmod-master' · 0523a0fa
  Pregmodder authored 4 years ago
  
  children corrections See merge request !7428
  0523a0fa
- children corrections · 092f293a
  Pregmodder authored 4 years ago
  
  092f293a
- Merge branch 'pregmod-dev' into 'pregmod-master' · bb437cbb
  Pregmodder authored 4 years ago
  
  fix origin string See merge request pregmodfan/fc-pregmod!7427
  bb437cbb
- fix origin string · 727788ac
  Pregmodder authored 4 years ago
  
  727788ac
- Merge branch 'nursery-dev' into 'pregmod-master' · 36792773
  Pregmodder authored 4 years ago
  
  Children Report Rework See merge request !7243
  36792773
Aug 09, 2020
- Merge branch 'eslint-again' into 'pregmod-master' · 2ad152bb
  Pregmodder authored 4 years ago
  
  eslint again, spelling See merge request !7425
  2ad152bb
- eslint again · 3e1aee91
  lowercasedonkey authored 4 years ago
  
  3e1aee91
- Merge branch 'fixes' into 'pregmod-master' · db377de4
  Pregmodder authored 4 years ago
  
  Fixes/cleanup for saRivalries See merge request !7419
  db377de4
- Merge branch 'eslint-tweaks' into 'pregmod-master' · 30ce2ba2
  Pregmodder authored 4 years ago
  
  eslint tweaks See merge request !7424
  30ce2ba2
- Try to straighten out existing rivalry upgrade/downgrade logic. · d6c2542d
  svornost authored 4 years ago
  
  d6c2542d
- eslint tweaks · b5885a14
  lowercasedonkey authored 4 years ago
  
  b5885a14
- Merge branch 'TS-fix-fix-BC' into 'pregmod-master' · 527fe9ca
  Pregmodder authored 4 years ago
  
  TS fix for BC See merge request !7423
  527fe9ca
- TS fix for BC · ff265647
  lowercasedonkey authored 4 years ago
  
  ff265647
- Merge branch 'pregmod-master' of ssh.gitgud.io:pregmodfan/fc-pregmod into fixes · 4a9d4025
  svornost authored 4 years ago
  
  4a9d4025
- Merge branch 'fix-FCTV' into 'pregmod-master' · 53081c97
  Pregmodder authored 4 years ago
  
  Fix fctv Closes #2056 See merge request !7415
  53081c97
- more p tag fixes · 65bd5a3b
  lowercasedonkey authored 4 years ago
  
  65bd5a3b
- p tag fixes · 94b6fd02
  lowercasedonkey authored 4 years ago
  
  94b6fd02
- Merge branch 'patch-3' into 'pregmod-master' · c1a2736a
  Pregmodder authored 4 years ago
  
  Fix toys misclassed as clothing See merge request !7422
  c1a2736a
- Merge branch 'patch-2' into 'pregmod-master' · e5e1130d
  Pregmodder authored 4 years ago
  
  Fix DJ ignore/fix flaws toggle Closes #2063 See merge request !7421
  e5e1130d
- Toys misclassed as clothing · ba2fbc80
  Anu authored 4 years ago
  
  ba2fbc80
- Fix DJ ignore/fix flaws toggle · 34fd6d8f
  Anu authored 4 years ago
  
  34fd6d8f
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into nursery-dev · cc4235c3
  brickode authored 4 years ago
  
  cc4235c3
- Reworked Matron education effects to cause a malus if Matron is stupid and uneducated · a3f95a52
  brickode authored 4 years ago
  
  a3f95a52
- Merge branch 'choose-own-assignment-game-state' into 'pregmod-master' · baa67ec6
  Pregmodder authored 4 years ago
  
  Move choose own assignment texts to the game state See merge request !7420
  baa67ec6
- Merge branch 'pregmod-master' into 'pregmod-master' · 07f8b022
  Pregmodder authored 4 years ago
  
  Don't show "double team" options with slave officers the player hasn't appointed yet. Closes #2061 See merge request !7418
  07f8b022
- Merge branch 'fix-avail-checks-for-wardrobe' into 'pregmod-master' · 7a167f57
  Pregmodder authored 4 years ago
  
  Fix avail checks for wardrobe Closes #2058 See merge request !7417
  7a167f57
- Merge branch 'SF-TensionFix' into 'pregmod-master' · 1fcf9adf
  Pregmodder authored 4 years ago
  
  SF Tension Fix Closes #2049 See merge request !7416
  1fcf9adf
- SF Tension Fix · 9b696f98
  Blank_Alt authored 4 years ago and Pregmodder committed 4 years ago
  
  9b696f98
- Merge branch 'ts-fixes-fctv' into 'pregmod-master' · 6b4506b5
  Pregmodder authored 4 years ago
  
  Another bunch of TS-based fixes See merge request !7413
  6b4506b5
- Merge branch 'patch-2' into 'pregmod-master' · 40558343
  Pregmodder authored 4 years ago
  
  Minor text fixes See merge request !7412
  40558343
- Merge branch 'fix-buckets' into 'pregmod-master' · 60b4696d
  Pregmodder authored 4 years ago
  
  fix buckets Closes #2055 See merge request !7414
  60b4696d
- Merge branch 'minorSecExpBackport' into 'pregmod-master' · e450fc99
  Pregmodder authored 4 years ago
  
  minorSecExpBackport - 0 See merge request pregmodfan/fc-pregmod!7358
  e450fc99
- minorSecExpBackport - 0 · 44ad5bba
  Blank_Alt authored 4 years ago and Pregmodder committed 4 years ago
  
  44ad5bba
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into nursery-dev · 13557ca5
  brickode authored 4 years ago
  
  13557ca5
- Changes, formatting, and cleanup · 56dc6bee
  brickode authored 4 years ago
  
  56dc6bee
- Move choose own assignment texts to the game state · 492ac957
  ezsh authored 4 years ago
  
  They do not belong to the slave state and we will save a bit of spacein th saves.
  492ac957
- Another bunch of TS-based fixes · 116b729a
  ezsh authored 4 years ago
  
  This time for the FCTV code.
  116b729a
- Change wording · 127f5ccd
  Anu authored 4 years ago
  
  127f5ccd
- Don't try to output rivalry data that doesn't exist · c5e4ce73
  svornost authored 4 years ago
  
  c5e4ce73
- Fix class names too · a9a7f157
  svornost authored 4 years ago
  
  a9a7f157