Commits · 2378582bde215cdf013603794d97c52ea2b1fddf · macaronideath / fc-pregmod

Nov 15, 2018
- documentation · 2378582b
  pregmodfan authored 6 years ago
  
  2378582b
- BC for fetus reserve, now actually set · 48094502
  pregmodfan authored 6 years ago
  
  48094502
- BC for fetus fatherID · e2768351
  pregmodfan authored 6 years ago
  
  e2768351
- sanity checks · 5fc0f183
  pregmodfan authored 6 years ago
  
  5fc0f183
- Merge branch 'pregmod-newcontent1_0' into pregmod-newcontent1_0-fixes · 1a0af27e
  pregmodfan authored 6 years ago
  
  1a0af27e
- fetus now will store biologial mother ID too · fc12ae95
  pregmodfan authored 6 years ago
  
  fc12ae95
- Merge branch 'preg-overhaul' into 'pregmod-newcontent1_0' · eec536bd
  Pregmodder authored 6 years ago
  
  Helper display See merge request pregmodfan/fc-pregmod!2946
  eec536bd
- Not a genetic property · c5f32c40
  kopareigns authored 6 years ago
  
  c5f32c40
- Helper display · 33d98ae5
  kopareigns authored 6 years ago
  
  33d98ae5
- Merge branch 'pregmod-master' into 'pregmod-newcontent1_0' · 35dd8280
  Pregmodder authored 6 years ago
  
  fixed JS flaws See merge request pregmodfan/fc-pregmod!2945
  35dd8280
- fixed JS flaws · 11c2278b
  Pregmodder authored 6 years ago
  
  11c2278b
- Merge branch 'pregmod-master' into 'pregmod-newcontent1_0' · c9f72500
  Pregmodder authored 6 years ago
  
  main branch stuff and progress See merge request pregmodfan/fc-pregmod!2944
  c9f72500
- correction · 794025b0
  Pregmodder authored 6 years ago
  
  794025b0
- resync · b687cd97
  Pregmodder authored 6 years ago
  
  b687cd97
- Merge remote-tracking branch 'upstream/pregmod-newcontent1_0' into pregmod-master · 27232d03
  Pregmodder authored 6 years ago
  
  27232d03
- conversion of generateChild to JS function · 9a11dca9
  Pregmodder authored 6 years ago
  
  9a11dca9
- Merge remote-tracking branch 'upstream/pregmod-master' into pregmod-master · 7d86946f
  Pregmodder authored 6 years ago
  
  7d86946f
- Merge branch 'fixes' into 'pregmod-newcontent1_0' · eaea5d9f
  Pregmodder authored 6 years ago
  
  Fixes See merge request pregmodfan/fc-pregmod!2942
  eaea5d9f
- Merge branch 'pregmod-newcontent1_0-fixes' into 'pregmod-newcontent1_0' · 85fc53ff
  Pregmodder authored 6 years ago
  
  Pregmod newcontent1 0 fixes See merge request pregmodfan/fc-pregmod!2941
  85fc53ff
- Fixes · 285f5d12
  kopareigns authored 6 years ago
  
  285f5d12
- missed return · 6625cda4
  pregmodfan authored 6 years ago
  
  6625cda4
- Merge branch 'pregmod-newcontent1_0-fixes' into 'pregmod-newcontent1_0' · 7e17e317
  Pregmodder authored 6 years ago
  
  Pregmod newcontent1 0 fixes See merge request pregmodfan/fc-pregmod!2939
  7e17e317
Nov 14, 2018
- Merge branch 'pregmod-newcontent1_0' of ssh.gitgud.io:pregmodfan/fc-pregmod... · 5844de42
  pregmodfan authored 6 years ago
  
  Merge branch 'pregmod-newcontent1_0' of ssh.gitgud.io:pregmodfan/fc-pregmod into pregmod-newcontent1_0-fixes
  5844de42
- Merge branch 'pregmod-master' into 'pregmod-newcontent1_0' · b5d4b13a
  Pregmodder authored 6 years ago
  
  the fix See merge request pregmodfan/fc-pregmod!2940
  b5d4b13a
- the fix · c8a6ac2d
  Pregmodder authored 6 years ago
  
  c8a6ac2d
- missed declaration · 0a9d4154
  pregmodfan authored 6 years ago
  
  0a9d4154
- Merge branch 'pregmod-newcontent1_0' of ssh.gitgud.io:pregmodfan/fc-pregmod... · e17a4c06
  pregmodfan authored 6 years ago
  
  Merge branch 'pregmod-newcontent1_0' of ssh.gitgud.io:pregmodfan/fc-pregmod into pregmod-newcontent1_0-fixes
  e17a4c06
- Merge branch 'ITT-Fixes' into 'pregmod-master' · 39c9b0da
  Pregmodder authored 6 years ago
  
  ITT-Fixes See merge request pregmodfan/fc-pregmod!2930
  39c9b0da
- ITT-Fixes · 9f1c50b1
  Blank authored 6 years ago and Pregmodder committed 6 years ago
  
  9f1c50b1
- Merge branch 'pregmod-master' into 'pregmod-newcontent1_0' · d9ed34bd
  Pregmodder authored 6 years ago
  
  name corrections See merge request pregmodfan/fc-pregmod!2938
  d9ed34bd
- small revert · d56d2a36
  Pregmodder authored 6 years ago
  
  d56d2a36
- name corrections · 6a8e0228
  Pregmodder authored 6 years ago
  
  6a8e0228
- Merge branch 'pregmod-newcontent1_0' of ssh.gitgud.io:pregmodfan/fc-pregmod... · bec14f34
  pregmodfan authored 6 years ago
  
  Merge branch 'pregmod-newcontent1_0' of ssh.gitgud.io:pregmodfan/fc-pregmod into pregmod-newcontent1_0-fixes
  bec14f34
- more syntax sugar - service functions for fetus reservation · 4729ad8b
  pregmodfan authored 6 years ago
  
  4729ad8b
- Merge branch 'pregmod-master' into 'pregmod-newcontent1_0' · 62d75dde
  Pregmodder authored 6 years ago
  
  fix to generateGenetics.tw See merge request pregmodfan/fc-pregmod!2937
  62d75dde
- fix to generateGenetics.tw · 8f918327
  Pregmodder authored 6 years ago
  
  8f918327
- Merge branch 'pregmod-newcontent1_0-fixes' into 'pregmod-newcontent1_0' · 0f577c59
  Pregmodder authored 6 years ago
  
  Pregmod newcontent1 0 fixes See merge request pregmodfan/fc-pregmod!2936
  0f577c59
- fixed backward compatibility call for genetic (wombJS side only) · fb2c7eda
  pregmodfan authored 6 years ago
  
  fb2c7eda
- new functions for counting reserved fetuses · 9b06860a
  pregmodfan authored 6 years ago
  
  9b06860a
- Merge branch 'pregmod-master' into 'pregmod-newcontent1_0' · 7ed1187e
  Pregmodder authored 6 years ago
  
  final .pregSource cleanup See merge request pregmodfan/fc-pregmod!2935
  7ed1187e