Commits · 7bc414c7e2beb76d2baf697ec27593b32a033cdb · macaronideath / fc-pregmod

Jul 05, 2021
- fixes · 7bc414c7
  Pregmodder authored 3 years ago
  
  7bc414c7
- event cleaning · d4fde70b
  Pregmodder authored 3 years ago
  
  d4fde70b
- Merge branch 'JS-Conversion-reBusy-TW' into 'pregmod-master' · 40af8ada
  Pregmodder authored 3 years ago
  
  Js conversion re busy tw [Tested and ready to merge] See merge request pregmodfan/fc-pregmod!9790
  40af8ada
- Js conversion re busy tw [Tested and ready to merge] · 1570194a
  Blank_Alt authored 3 years ago and Pregmodder committed 3 years ago
  
  1570194a
- Merge branch 'pregmod-dev' into 'pregmod-master' · 2520085d
  Pregmodder authored 3 years ago
  
  Sort by trust See merge request pregmodfan/fc-pregmod!9811
  2520085d
- added sort by trust · e292dd38
  Pregmodder authored 3 years ago
  
  e292dd38
- Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev · 746946df
  Pregmodder authored 3 years ago
  
  746946df
- Merge branch 'royalblood-prince' into 'pregmod-master' · 243f0ae0
  Pregmodder authored 3 years ago
  
  Remove involuntary facial surgery from royalBlood prince See merge request pregmodfan/fc-pregmod!9805
  243f0ae0
- Merge branch 'linting' into 'pregmod-master' · 8982688b
  Pregmodder authored 3 years ago
  
  Linting See merge request pregmodfan/fc-pregmod!9808
  8982688b
- Linting · 6e7cf7a5
  DCoded authored 3 years ago
  
  6e7cf7a5
- Merge branch 'Blank_Alt-pregmod-master-patch-16443' into 'pregmod-master' · de888bd7
  Pregmodder authored 3 years ago
  
  Fix reSlaveMarriage Closes #3273 See merge request pregmodfan/fc-pregmod!9807
  de888bd7
- Fix reSlaveMarriage · a281f77f
  Blank_Alt authored 3 years ago and Pregmodder committed 3 years ago
  
  a281f77f
- Don't involuntarily commit facial surgery · 7880e300
  Anu authored 3 years ago
  
  7880e300
- Merge branch 'minor-fixes' into 'pregmod-master' · f945f3f4
  Pregmodder authored 3 years ago
  
  Tweaks and proofreading See merge request pregmodfan/fc-pregmod!9804
  f945f3f4
Jul 04, 2021
- FCTV proofreading · 83d4b3fb
  Anu authored 3 years ago
  
  83d4b3fb
- capitalize · bdb2db7c
  Anu authored 3 years ago
  
  bdb2db7c
- Standardize isBellyHeavy with tooBigBelly · c0196637
  Anu authored 3 years ago
  
  c0196637
- Fuckdoll belly proofreading · 28c31fae
  Anu authored 3 years ago
  
  28c31fae
- Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-dev · cf449523
  Pregmodder authored 3 years ago
  
  cf449523
- Merge branch 'fix-appending-results-to-wrong-node' into 'pregmod-master' · 98f50e20
  Pregmodder authored 3 years ago
  
  fix appending results to wrong node Closes #3269 See merge request pregmodfan/fc-pregmod!9802
  98f50e20
- fix appending results to wrong node · d787f7e5
  lowercasedonkey authored 3 years ago
  
  d787f7e5
- typos · 9d8a4f31
  Anu authored 3 years ago
  
  9d8a4f31
- Fix missing pinktext, wrong breath/breathe · f9ee83b1
  Anu authored 3 years ago
  
  f9ee83b1
- Merge branch 'dcoded-dev' into 'pregmod-master' · 5d03da67
  Pregmodder authored 3 years ago
  
  pFoodCrisis to JS, Penthouse tweaking See merge request pregmodfan/fc-pregmod!9794
  5d03da67
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into dcoded-dev · cbb70e98
  DCoded authored 3 years ago
  
  cbb70e98
- Replaced event link note with tooltip · 37aa4a1b
  DCoded authored 3 years ago
  
  37aa4a1b
- Merge branch 'quickFixAndMinorCleanup' into 'pregmod-master' · 0eded6cf
  Pregmodder authored 3 years ago
  
  quickFixAndMinorCleanup See merge request pregmodfan/fc-pregmod!9801
  0eded6cf
- fix · c6c971c5
  Pregmodder authored 3 years ago
  
  c6c971c5
- quickFixAndMinorCleanup · 754b1e99
  Blank_Alt authored 3 years ago
  
  754b1e99
- Merge branch 'revert-80df3868 ' into 'pregmod-master' · 74f63c2a
  Pregmodder authored 3 years ago
  
  Revert "Merge branch 'cleanGlobals' into 'pregmod-master'" See merge request pregmodfan/fc-pregmod!9800
  74f63c2a
- Revert "Merge branch 'cleanGlobals' into 'pregmod-master'" · 71472f4f
  Pregmodder authored 3 years ago
  
  This reverts merge request !9766
  71472f4f
- Merge branch 'pregmod-dev' into 'pregmod-master' · 8cd267de
  Pregmodder authored 3 years ago
  
  Tweak reBusyServantsQuarters.js sex act counts See merge request pregmodfan/fc-pregmod!9799
  8cd267de
- Removed unneeded variable · 2c246c12
  DCoded authored 3 years ago
  
  2c246c12
- Merge branch 'pregmod-master' of https://gitgud.io/pregmodfan/fc-pregmod into dcoded-dev · 94675a76
  DCoded authored 3 years ago
  
  94675a76
- Removed spans from note · 166d92ba
  DCoded authored 3 years ago
  
  166d92ba
- Tweak reBusyServantsQuarters.js sex act counts · 219b0e36
  Pregmodder authored 3 years ago
  
  219b0e36
- Replaced single event file with multiple event files · d62d27bf
  DCoded authored 3 years ago
  
  d62d27bf
- Merge branch 'p-coup-aftermath' into 'pregmod-master' · c2eb19aa
  Pregmodder authored 3 years ago
  
  P coup aftermath See merge request pregmodfan/fc-pregmod!9798
  c2eb19aa
- cleanup · 0fd285a5
  lowercasedonkey authored 3 years ago
  
  0fd285a5
Jul 03, 2021

Merge branch 'cleanGlobals' into 'pregmod-master' · 80df3868

Pregmodder authored 3 years ago

Replaced (V.eligibleSlaves) with a global function / Improved randomNonindividualEvent selection readability

See merge request pregmodfan/fc-pregmod!9766

80df3868