Commits · 0260afd6ad9d3a17dbf7be46964f163512ceb210 · macaronideath / fc-pregmod

Jul 22, 2019
- Merge branch 'pregmod-dev' into 'pregmod-master' · 0260afd6
  Pregmodder authored 5 years ago
  
  FS work See merge request pregmodfan/fc-pregmod!5041
  0260afd6
- FS work · 7f38e238
  Pregmodder authored 5 years ago
  
  7f38e238
- Merge branch 'ITTFixes' into 'pregmod-master' · 2b4561cd
  Pregmodder authored 5 years ago
  
  ITTFixes See merge request pregmodfan/fc-pregmod!5035
  2b4561cd
- ITTFixes · 88878176
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  88878176
- Merge branch 'revert-82038598 ' into 'pregmod-master' · 9629ac59
  Pregmodder authored 5 years ago
  
  Revert "Merge branch 'revert-4b855177' into 'pregmod-master'" See merge request pregmodfan/fc-pregmod!5040
  9629ac59
- Revert "Merge branch 'revert-4b855177 ' into 'pregmod-master'" · 0d901772
  Pregmodder authored 5 years ago
  
  This reverts merge request !5039
  0d901772
- Merge branch 'revert-4b855177 ' into 'pregmod-master' · 82038598
  Pregmodder authored 5 years ago
  
  Revert "Merge branch 'pregmod-dev' into 'pregmod-master'" See merge request pregmodfan/fc-pregmod!5039
  82038598
- Revert "Merge branch 'pregmod-dev' into 'pregmod-master'" · 48757306
  Pregmodder authored 5 years ago
  
  This reverts merge request !5038
  48757306
- Merge branch 'pregmod-dev' into 'pregmod-master' · 4b855177
  Pregmodder authored 5 years ago
  
  fix to editGenetics Closes #785 See merge request pregmodfan/fc-pregmod!5038
  4b855177
- fix to editGenetics · 34bf94fa
  Pregmodder authored 5 years ago
  
  34bf94fa
- Merge branch 'issue-905' into 'pregmod-master' · de3345e5
  Pregmodder authored 5 years ago
  
  Permit all available slaves to be appointed as lurcher See merge request pregmodfan/fc-pregmod!5037
  de3345e5
- Permit all available slaves to be appointed as lurcher · 9046c71d
  ezsh authored 5 years ago
  
  9046c71d
- Merge branch 'optionsSubMenuTweaking' into 'pregmod-master' · 8d159bf1
  Pregmodder authored 5 years ago
  
  Options sub menu tweaking See merge request !5033
  8d159bf1
- Options sub menu tweaking · 4d5300a8
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  4d5300a8
- Merge branch 'issue-905' into 'pregmod-master' · 363e1626
  Pregmodder authored 5 years ago
  
  Fix displaying and firing the current lurcher See merge request pregmodfan/fc-pregmod!5036
  363e1626
- Fix displaying and firing the current lurcher · 96923ed7
  ezsh authored 5 years ago
  
  96923ed7
- Merge branch 'pregmod-dev' into 'pregmod-master' · 5db16f1b
  Pregmodder authored 5 years ago
  
  fix See merge request pregmodfan/fc-pregmod!5034
  5db16f1b
- fix · 11751ed7
  Pregmodder authored 5 years ago
  
  11751ed7
Jul 21, 2019
- Merge branch 'storyCaptionFixesII' into 'pregmod-master' · 8621a780
  Pregmodder authored 5 years ago
  
  Story caption fixes ii See merge request pregmodfan/fc-pregmod!5030
  8621a780
- Story caption fixes ii · 796a9762
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  796a9762
- Merge branch 'pregmod-dev' into 'pregmod-master' · 0ab14ee6
  Pregmodder authored 5 years ago
  
  What I really hope is a fix See merge request pregmodfan/fc-pregmod!5031
  0ab14ee6
- What I really hope is a fix · 4839e710
  Pregmodder authored 5 years ago
  
  4839e710
- Merge branch 'pregmod-dev' into 'pregmod-master' · 0029ab65
  Pregmodder authored 5 years ago
  
  fix See merge request pregmodfan/fc-pregmod!5029
  0029ab65
- fix · bd5f0aff
  Pregmodder authored 5 years ago
  
  bd5f0aff
- Merge branch 'pregmod-dev' into 'pregmod-master' · 731a5ec3
  Pregmodder authored 5 years ago
  
  fix See merge request pregmodfan/fc-pregmod!5028
  731a5ec3
- fix · b12e7f10
  Pregmodder authored 5 years ago
  
  b12e7f10
- Merge branch 'descriptionOptionsFixes' into 'pregmod-master' · 3f38909d
  Pregmodder authored 5 years ago
  
  descriptionOptionsFixes See merge request pregmodfan/fc-pregmod!5027
  3f38909d
- descriptionOptionsFixes · 5d069f16
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  5d069f16
Jul 20, 2019
- Merge branch 'storyCaptionFixes' into 'pregmod-master' · df1e280b
  Pregmodder authored 5 years ago
  
  storyCaptionFixes See merge request pregmodfan/fc-pregmod!5026
  df1e280b
- storyCaptionFixes · 54dba25a
  Blank authored 5 years ago and Pregmodder committed 5 years ago
  
  54dba25a
- Merge branch 'pregmod-dev' into 'pregmod-master' · 6e6ecf9a
  Pregmodder authored 5 years ago
  
  possible fix See merge request pregmodfan/fc-pregmod!5025
  6e6ecf9a
- possible fix · 3c105563
  Pregmodder authored 5 years ago
  
  3c105563
- Merge branch 'pregmod-dev' into 'pregmod-master' · 9f9416a8
  Pregmodder authored 5 years ago
  
  FS work See merge request pregmodfan/fc-pregmod!5024
  9f9416a8
- FS work · 885a582a
  Pregmodder authored 5 years ago
  
  885a582a
- Merge branch 'issue-900' into 'pregmod-master' · 68c3ae9b
  Pregmodder authored 5 years ago
  
  Direct the slave transfers links throught the "Assign" passage Closes #900 See merge request pregmodfan/fc-pregmod!5023
  68c3ae9b
- Direct the slave transfers links throught the "Assign" passage · f236bce6
  ezsh authored 5 years ago
  
  With direct calll to the assignJob() we were skipping the assignment scenes. Fixes #900.
  f236bce6
- Merge branch 'pregmod-master' into 'pregmod-master' · 49595022
  Pregmodder authored 5 years ago
  
  Fix bad accents suppressing the speech rule listing in the summary, again See merge request pregmodfan/fc-pregmod!5022
  49595022
- Fix bad accents suppressing the speech rule listing in the summary, again · 4c93213d
  svornost authored 5 years ago and Pregmodder committed 5 years ago
  
  4c93213d
- Merge branch 'pregmod-dev' into 'pregmod-master' · 22272219
  Pregmodder authored 5 years ago
  
  fix See merge request pregmodfan/fc-pregmod!5021
  22272219
- fix · 70c4ffe9
  Pregmodder authored 5 years ago
  
  70c4ffe9