Commits · 766d18059c41d0ae9f3bebd91245c3d340606168 · pregmodfan / fc-pregmod

May 13, 2020
- Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev · 766d1805
  Pregmodder authored 4 years ago
  
  766d1805
- Resync · 48f3341e
  Pregmodder authored 4 years ago
  
  48f3341e
- Merge branch 'issue-1793' into 'pregmod-master' · 59e212c3
  Pregmodder authored 4 years ago
  
  Fix conditions for displaying chubby slaves in slave summary Closes #1793 See merge request !6793
  59e212c3
- Fix conditions for displaying chubby slaves in slave summary · 4b29a93d
  ezsh authored 4 years ago
  
  The condition for preferring positive description has to be wide hips _or_ hedonistic decadance active. The table was using _and_ instead. Fixes #1793.
  4b29a93d
May 12, 2020
- Merge branch 'patch-2' into 'pregmod-master' · 82fa5c84
  Pregmodder authored 4 years ago
  
  Hyperpreg sex actions had redundant duplicates See merge request !6791
  82fa5c84
- Update slaveInteract.js · 67dc42da
  Anu authored 4 years ago
  
  67dc42da
- Merge branch 'patch-2' into 'pregmod-master' · a5a6c7b6
  Pregmodder authored 4 years ago
  
  desctiption See merge request pregmodfan/fc-pregmod!6790
  a5a6c7b6
- Update slaveInteract.js · 532ffadd
  Anu authored 4 years ago
  
  532ffadd
- Merge branch 'patch-2' into 'pregmod-master' · 89f422f1
  Pregmodder authored 4 years ago
  
  No "buts" for Decadence See merge request pregmodfan/fc-pregmod!6789
  89f422f1
- Merge branch 'fix' into 'pregmod-master' · 7139b3b5
  Pregmodder authored 4 years ago
  
  fix typo See merge request !6788
  7139b3b5
- Merge branch 'options' into 'pregmod-master' · 651463e0
  Pregmodder authored 4 years ago
  
  convert options in starting slaves See merge request pregmodfan/fc-pregmod!6787
  651463e0
- Update longSlaveDescription.tw · 51a2a5d6
  Anu authored 4 years ago
  
  51a2a5d6
- fix typo · a4415894
  Arkerthan authored 4 years ago
  
  a4415894
- add <<includeDOM>> to replace App.UI.DOM.includeDOM() · e0e13475
  Arkerthan authored 4 years ago
  
  e0e13475
- update to fit updated code style · 4fb8dc2c
  Arkerthan authored 4 years ago
  
  4fb8dc2c
- remove obsolete options macro · f8a98c6f
  Arkerthan authored 4 years ago
  
  f8a98c6f
- convert playerAging toggle for NG+ · 08b6e593
  Arkerthan authored 4 years ago
  
  08b6e593
- convert starting girls to new options system · 5249fbd3
  Arkerthan authored 4 years ago
  
  5249fbd3
- disable range buttons that are already on the exact value · 23701d53
  Arkerthan authored 4 years ago
  
  23701d53
- add an option to display units for the options textbox · 88930f5a
  Arkerthan authored 4 years ago
  
  88930f5a
- Merge branch 'fixes' into 'pregmod-master' · 69a92f58
  Pregmodder authored 4 years ago
  
  Fix See merge request !6786
  69a92f58
- Fix · 6bd2c2ca
  kopareigns authored 4 years ago
  
  6bd2c2ca
- Merge branch 'fixes' into 'pregmod-master' · 30b2bba6
  Pregmodder authored 4 years ago
  
  Fixes See merge request !6785
  30b2bba6
- Fixes · 12f89e47
  kopareigns authored 4 years ago
  
  12f89e47
- Merge branch 'SC-script-random-to-jsRandom' into 'pregmod-master' · a4fc7a3b
  Pregmodder authored 4 years ago
  
  random to jsRandom See merge request !6783
  a4fc7a3b
- random to jsRandom · 50d056a6
  lowercasedonkey authored 4 years ago
  
  50d056a6
- Merge branch 'pregmod-master' into 'pregmod-master' · 49c4f133
  Pregmodder authored 4 years ago
  
  Added additional stat tracking - abortions, miscarriages, pit wins/losses, and... See merge request pregmodfan/fc-pregmod!6779
  49c4f133
May 11, 2020
- Added abortion and miscarriage counts to player object for future use. · e9ac7227
  Dirk_Tungsten authored 4 years ago
  
  e9ac7227
- Version number incremented. · 19c9996d
  Dirk_Tungsten authored 4 years ago
  
  19c9996d
- Apply suggestion to src/uncategorized/longSlaveDescription.tw · 7c6c79f2
  Birdstrike authored 4 years ago
  
  7c6c79f2
- Merge branch 'bc-rules' into 'pregmod-master' · cca0c024
  Pregmodder authored 4 years ago
  
  Rule BC for collars See merge request !6782
  cca0c024
- rule bc for collars · af78a269
  lowercasedonkey authored 4 years ago
  
  af78a269
- Merge branch 'fixes' into 'pregmod-master' · 76ccce19
  Pregmodder authored 4 years ago
  
  Fix first period event trigger. Prepubescent slaves should not be on contraceptives. Closes #1788 See merge request !6780
  76ccce19
- Merge branch 'pregmod-master' into 'pregmod-master' · ac9cab73
  Pregmodder authored 4 years ago
  
  Re-enable PE Pit Fight See merge request !6781
  ac9cab73
- Re-enable PE Pit Fight · 13f6cea1
  svornost authored 4 years ago
  
  13f6cea1
- Don't need this check, GeneratePuberty takes care of it and is called on all slaves under 15. · 68c2f35e
  svornost authored 4 years ago
  
  68c2f35e
- Merge branch 'pregmod-master' of ssh.gitgud.io:pregmodfan/fc-pregmod into fixes · 0dbdc55a
  svornost authored 4 years ago
  
  0dbdc55a
- Fix first period event trigger. Prepubescent slaves should not be on contraceptives. · f82b6084
  svornost authored 4 years ago
  
  f82b6084
- Added additional stat tracking - abortions, miscarriages, pit wins/losses, and... · 90d3c426
  Dirk_Tungsten authored 4 years ago
  
  Added additional stat tracking - abortions, miscarriages, pit wins/losses, and total arcology fight count.
  90d3c426
- Merge branch 'face-slot' into 'pregmod-master' · 0767bb83
  Pregmodder authored 4 years ago
  
  Split both gags and masks out of collar slot. Closes #1785 See merge request !6777
  0767bb83