Commits · 93c442d49b6632ff43f2f29b84f152a03db4b189 · macaronideath / fc-pregmod

May 17, 2019
- Merge branch 'pregmod-dev' into 'pregmod-master' · 93c442d4
  Pregmodder authored 5 years ago
  
  added dick and testicle branding See merge request !4533
  93c442d4
- added dick and testicle branding · f2575dcc
  Pregmodder authored 5 years ago
  
  f2575dcc
- Merge branch 'pregmod-dev' into 'pregmod-master' · c1cdd4f4
  Pregmodder authored 5 years ago
  
  Slapped pasties on slaves See merge request !4532
  c1cdd4f4
- Slapped pasties on slaves · d51a6089
  Pregmodder authored 5 years ago
  
  d51a6089
- Merge branch 'SF+SecExp_Tweaking' into 'pregmod-master' · 0141b016
  Pregmodder authored 5 years ago
  
  SF+SecExp_Tweaking See merge request pregmodfan/fc-pregmod!4530
  0141b016
- SF+SecExp_Tweaking · eeee56ef
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  eeee56ef
- Merge branch 'pregmod-dev' into 'pregmod-master' · 55e70e92
  Pregmodder authored 5 years ago
  
  basic 'pasties' support See merge request !4529
  55e70e92
- basic 'pasties' support · 4a478a1a
  Pregmodder authored 5 years ago
  
  4a478a1a
- Merge branch 'pregmod-dev' into 'pregmod-master' · 6d86476c
  Pregmodder authored 5 years ago
  
  Disabled 'pasties' for now See merge request pregmodfan/fc-pregmod!4528
  6d86476c
- Disabled 'pasties' for now · c418101c
  Pregmodder authored 5 years ago
  
  c418101c
May 16, 2019
- Merge branch 'fix-737' into 'pregmod-master' · c78aa14c
  Pregmodder authored 5 years ago
  
  Fix 737 See merge request !4526
  c78aa14c
- Fix quick scroll buttons targets · 7d6bee9c
  ezsh authored 5 years ago
  
  The slave containers shall be named "slave-number" and not "slave_number".
  7d6bee9c
- Fix App.UI.htag(): put a space between tag name and attributes · 6344eead
  ezsh authored 5 years ago
  
  6344eead
- Merge branch 'pregmod-dev' into 'pregmod-master' · 9372e97d
  Pregmodder authored 5 years ago
  
  Fixed missing brand location. See merge request !4525
  9372e97d
- Fixed missing brand location. · f4ba1fdc
  Pregmodder authored 5 years ago
  
  f4ba1fdc
- Merge branch 'FixingCOmpilerWarnings' into 'pregmod-master' · 5416064e
  Pregmodder authored 5 years ago
  
  FixingCompilerWarnings See merge request !4523
  5416064e
- FixingCompilerWarnings · 37da7bb4
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  37da7bb4
- Merge branch 'pregmod-dev' into 'pregmod-master' · f2cb86a4
  Pregmodder authored 5 years ago
  
  Fixed corp error, sort of See merge request !4524
  f2cb86a4
- Fixed corp error, sort of · 678c3f5b
  Pregmodder authored 5 years ago
  
  678c3f5b
- Merge branch 'dcoded-dev' into 'pregmod-master' · bd4c1706
  Pregmodder authored 5 years ago
  
  Minor ESlinting See merge request !4506
  bd4c1706
- Master merge · fc76d47e
  DCoded authored 5 years ago
  
  fc76d47e
- Merge branch 'SF_Tweaking_II' into 'pregmod-master' · 0b3edc68
  Pregmodder authored 5 years ago
  
  SF fixing and tweaking II See merge request !4522
  0b3edc68
- SF fixing and tweaking II · 3caac231
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  3caac231
- Merge branch 'small-refactor' into 'pregmod-master' · 2f1586d2
  Pregmodder authored 5 years ago
  
  Minor refactoring See merge request !4520
  2f1586d2
May 15, 2019
- suggested changes · 2d3c7b8d
  Skriv authored 5 years ago
  
  2d3c7b8d
- Merge branch 'master' into small-refactor · 07bf08cd
  Skriv authored 5 years ago
  
  07bf08cd
- Merge branch 'slave-listing-fixes' into 'pregmod-master' · aceeb1d2
  Pregmodder authored 5 years ago
  
  Fix selecting the head girl Closes #736 See merge request !4521
  aceeb1d2
- Fix selecting the head girl · 1c0ac091
  ezsh authored 5 years ago
  
  Closes #736.
  1c0ac091
May 14, 2019
- Update BackwardsCompatibility.tw · 8a81b501
  Pregmodder authored 5 years ago
  
  8a81b501
- function always called with arguments · ae229cb6
  Skriv authored 5 years ago
  
  ae229cb6
- Merge branch 'ITT_Fixes' into 'pregmod-master' · 577555c3
  Pregmodder authored 5 years ago
  
  ITT fixes See merge request !4519
  577555c3
- ITT fixes · a7b1fda6
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  a7b1fda6
- Merge branch 'slave-listing-fixes' into 'pregmod-master' · e2ea57b8
  Pregmodder authored 5 years ago
  
  Slave listing fixes Closes #734 and #735 See merge request !4518
  e2ea57b8
- various · e4523b87
  Skriv authored 5 years ago
  
  e4523b87
- Fix a typo ('experianced' -> 'experienced') · 07641b54
  ezsh authored 5 years ago
  
  07641b54
- Provide variable name for emploee IDs in the master suite · 8bdc5f31
  ezsh authored 5 years ago
  
  Closes #735.
  8bdc5f31
- Fix passage name for BG selectyion. · a8223596
  ezsh authored 5 years ago
  
  Closes #734
  a8223596
- Master merge · 5a6357ee
  DCoded authored 5 years ago
  
  5a6357ee
- Formatting · b7b44220
  DCoded authored 5 years ago
  
  b7b44220
- Merge branch 'deHardCodeProsperity' into 'pregmod-master' · a3b9c0a8
  Pregmodder authored 5 years ago
  
  deHardCodeProsperity See merge request !4517
  a3b9c0a8