Commits · dev · Collaborative Coder Coalition / CCC-Public

Browse files

Jul 17, 2018
- Merge branch 'patch-2' into 'dev' · 881444a3
  Alistair Sutter authored Jul 17, 2018
  881444a3
- Merge branch 'patch-1' into 'dev' · 57209ce0
  Alistair Sutter authored Jul 17, 2018
  57209ce0
- Update CONSTITUTION.md · 409078ab
  Marshall Scott authored Jul 17, 2018
  409078ab
- Update .gitattributes · ec2e59c2
  Marshall Scott authored Jul 17, 2018
  ec2e59c2
Jul 03, 2018
- Merge branch 'hotfix/spawning' into 'dev' · 4b243a85
  Alistair Sutter authored Jul 03, 2018
  4b243a85
- Merge remote-tracking branch 'upstream/boostAllocationSquashed' into canary · 76cd441a
  zolcsika71 authored Jul 03, 2018
  76cd441a
Jun 22, 2018
- reintegrate public before branching to canary · 58c41541
  zolcsika71 authored Jun 22, 2018
  
  58c41541
Jan 08, 2018
- Merge branch 'hotfix/fueling' into 'dev' · 5fd9c271
  Alistair Sutter authored Jan 08, 2018
  5fd9c271
- Fixed error with fueling action · 2817fe7f
  TaiTair authored Jan 08, 2018
  
  2817fe7f
Jan 07, 2018
- Merge branch 'hotfix/workercount' into 'dev' · b23c0b8f
  Alistair Sutter authored Jan 07, 2018
  b23c0b8f
- Fixed worker count logic error · f64cd0a7
  TaiTair authored Jan 07, 2018
  
  f64cd0a7
Dec 15, 2017
- Merge branch 'feature/improvedWorkers' into 'dev' · 35ac39a1
  Alistair Sutter authored Dec 15, 2017
  35ac39a1
Nov 25, 2017
- Merge branch 'Update/whitelist' into 'dev' · f71a2927
  Alistair Sutter authored Nov 25, 2017
  f71a2927
- Update/whitelist · 64c67439
  Patr0la authored Nov 25, 2017
  
  64c67439
Nov 23, 2017
- Merge branch 'patch/mitigateEnergyOverdrive' into 'dev' · f869ac1d
  Alistair Sutter authored Nov 23, 2017
  f869ac1d
- Merge branch 'patch/shardSeparation' into 'dev' · 69ce4bc0
  Alistair Sutter authored Nov 23, 2017
  69ce4bc0
- Merge branch 'update/constitution' into 'dev' · d3647950
  Alistair Sutter authored Nov 23, 2017
  d3647950
- Restored source-dependant tweak · 75a18ec6
  TaiTair authored Nov 22, 2017
  
  75a18ec6
- Merge branch 'hotfix/roomtrading' into 'dev' · 0bd34eed
  Alistair Sutter authored Nov 23, 2017
  0bd34eed
- Merge branch 'hotfix/taskexecute' into 'dev' · 69c1a597
  Alistair Sutter authored Nov 23, 2017
  69c1a597
- Fixed error · 9e169e84
  TaiTair authored Nov 22, 2017
  
  9e169e84
- Update CONSTITUTION.md · 8e477aa5
  Alistair Sutter authored Nov 23, 2017
  
  8e477aa5
Nov 22, 2017
- Update CONSTITUTION.md · 652b8211
  Alistair Sutter authored Nov 22, 2017
  
  652b8211
Nov 20, 2017
- Merge branch 'update/constitution' into 'dev' · cd0f8555
  Chobobobo authored Nov 20, 2017
  cd0f8555
- Update CONSTITUTION.md · 987d8aa0
  Alistair Sutter authored Nov 20, 2017
  
  987d8aa0
Nov 07, 2017
- Fixed worker count · 0c62d01d
  TaiTair authored Nov 07, 2017
  
  0c62d01d
Nov 02, 2017
- Fixed module error · 9d7ae251
  TaiTair authored Nov 02, 2017
  
  9d7ae251
- Fixed another error - might need optimizing · 40e75198
  TaiTair authored Nov 01, 2017
  
  40e75198
Nov 01, 2017
- Initial commit · 62a6c88c
  TaiTair authored Nov 01, 2017
  
  62a6c88c
- Fixed another logic error · 14d2030c
  TaiTair authored Nov 01, 2017
  
  14d2030c
- Fixed logic error · 23bc2441
  TaiTair authored Nov 01, 2017
  
  23bc2441
- Improved performance · 5e72caaf
  TaiTair authored Nov 01, 2017
  
  5e72caaf
- Initial commit with patch · c171e2da
  TaiTair authored Nov 01, 2017
  
  c171e2da
- Improved worker body logic · 9854eace
  TaiTair authored Oct 31, 2017
  
  9854eace
Oct 19, 2017
- room offers are counted by type properly (thanks to overlordq for lodash help) · f1830738
  zolcsika71 authored Oct 19, 2017
  
  f1830738
Oct 15, 2017
- Room offers are not repeated if all the resources are offered already · b9fedf1c
  zolcsika71 authored Oct 15, 2017
  
  b9fedf1c
- Revert to 66be64de · 2e7564f5
  zolcsika71 authored Oct 15, 2017
  
  2e7564f5
- Room offers are not repeated if all the resources are offered already · 6de02678
  zolcsika71 authored Oct 15, 2017
  
  6de02678
- Room offers are not repeated if all the resources are offered already · 9c3973e1
  zolcsika71 authored Oct 15, 2017
  
  9c3973e1
Sep 24, 2017
- Fixed typo with error logging · a5d186de
  TaiTair authored Sep 24, 2017
  
  a5d186de