Code

Sync#773

Code

Open

GoogleFrog wants to merge 44 commits intoZeroK-RTS:masterZeroK-RTS/Chobby:masterfrom Spring-Chobby:syncMergeSpring-Chobby/Chobby:syncMergeCopy head branch name to clipboard

+975-159

Commits

Commits on May 10, 2020

• Uparrow/downarrow in console autofills sent messages.

  Show description for 9c59f24
  MasterBel2

  committed
  9c59f24

  Copy full SHA for 9c59f24

Commits on May 20, 2020

• Changes requested by PR:

  Show description for 5b6147b
  MasterBel2

  committed
  5b6147b

  Copy full SHA for 5b6147b

• Fix whitespace

  MasterBel2

  committed
  ead0c9c

  Copy full SHA for ead0c9c

• Fix whitespace

  MasterBel2

  committed
  a1adaab

  Copy full SHA for a1adaab

• Removed extraneous changes that should have already been reverted

  MasterBel2

  committed
  1c55e29

  Copy full SHA for 1c55e29

Commits on May 24, 2020

• Merge pull request #511 from ZeroK-RTS/master

  Show description for 116a403
  gajop

  authored
  116a403

  Copy full SHA for 116a403

• Merge pull request #513 from MasterBel2/master

  Show description for fabcd6d
  gajop

  authored
  fabcd6d

  Copy full SHA for fabcd6d

Commits on Jul 10, 2020

• Remove extraneous whitespace to fix build.

  Show description for 0aab90d
  MasterBel2

  committed
  0aab90d

  Copy full SHA for 0aab90d

• Merge pull request #515 from MasterBel2/whitespace-cull

  Show description for 12ba5be
  gajop

  authored
  12ba5be

  Copy full SHA for 12ba5be

Commits on Jul 11, 2020

• Store friends on FRIENDLIST

  Show description for 026442c
  MasterBel2

  committed
  026442c

  Copy full SHA for 026442c

• Merge pull request #514 from MasterBel2/master

  Show description for 924a084
  gajop

  authored
  924a084

  Copy full SHA for 924a084

Commits on Sep 13, 2020

• enforce unique teamID, close beyond-all-reason/BYAR-Chobby#39

  gajop

  committed
  6d300bf

  Copy full SHA for 6d300bf

Commits on Oct 2, 2020

• misc:

  Show description for c3d6f2e
  gajop

  committed
  c3d6f2e

  Copy full SHA for c3d6f2e

Commits on Oct 5, 2020

• StartScript with Side and AIOptions

  rlcevg

  committed
  3c947b3

  Copy full SHA for 3c947b3

Commits on Oct 6, 2020

• AIOptions window

  rlcevg

  committed
  d388d74

  Copy full SHA for d388d74

• AI side selection and gameConfig.skirmishDefault.AIOptionsEnabled option

  rlcevg

  committed
  9ca626c

  Copy full SHA for 9ca626c

Commits on Oct 9, 2020

• Remove Side from AIOptions

  rlcevg

  committed
  1d8bbd2

  Copy full SHA for 1d8bbd2

Commits on Oct 10, 2020

• Merge pull request #516 from rlcevg/chobby_side

  Show description for 3005b90
  gajop

  authored
  3005b90

  Copy full SHA for 3005b90

Commits on Oct 25, 2020

• close #517 : give AIs a unique teamID

  gajop

  committed
  39b03e7

  Copy full SHA for 39b03e7

• - try to prevent the client from forcing the playerID too many times close beyond-all-reason/BYAR-Chobby#54

  Show description for 405f186
  gajop

  committed
  405f186

  Copy full SHA for 405f186

Commits on Nov 4, 2020

• Merge branch 'master' into syncMerge

  GoogleFrog

  authored
  80e67d2

  Copy full SHA for 80e67d2

Commits on Nov 6, 2020

• SAIDPRIVATE can activate chat panel and tab on gameConfig.sayPrivateSelectAndActivateChatTab

  Beherith

  committed
  01f81b0

  Copy full SHA for 01f81b0

• Merge pull request #518 from Beherith/master

  Show description for 8d46851
  gajop

  authored
  8d46851

  Copy full SHA for 8d46851

Commits on Nov 25, 2020

• Add option to shorten download names

  Beherith

  committed
  6610447

  Copy full SHA for 6610447

Commits on Nov 29, 2020

• Add faction selector

  rlcevg

  committed
  bfe6993

  Copy full SHA for bfe6993

Commits on Nov 30, 2020

• Merge pull request #520 from rlcevg/chobby_faction

  Show description for 019c45e
  gajop

  authored
  019c45e

  Copy full SHA for 019c45e

• typo

  gajop

  committed
  91a0b4b

  Copy full SHA for 91a0b4b

• don't show side if none is assigned

  gajop

  committed
  558a0fc

  Copy full SHA for 558a0fc

• fix codex.lua

  gajop

  committed
  3ea03a2

  Copy full SHA for 3ea03a2

Commits on Dec 7, 2020

• Add 'Show AIOptions' toggle. Separate button for AIOptions in ai_list_window

  rlcevg

  committed
  cccc769

  Copy full SHA for cccc769

Commits on Dec 9, 2020

• Automatically retry downloads up to WG.Chobby.Configuration.downloadRetryCount times

  Show description for cf7036c
  Beherith

  committed
  cf7036c

  Copy full SHA for cf7036c

• Create an Integer popup window type

  Beherith

  committed
  55ed83d

  Copy full SHA for 55ed83d

• Enable filtering of redundant empty hosts

  Beherith

  committed
  7df1ef4

  Copy full SHA for 7df1ef4

Commits on Dec 10, 2020

• Make travis not cry

  Beherith

  committed
  6840470

  Copy full SHA for 6840470

• white space

  Beherith

  committed
  4f13c8f

  Copy full SHA for 4f13c8f

• Tooltips to battle filters

  Beherith

  committed
  be5c79c

  Copy full SHA for be5c79c

Commits on Dec 12, 2020

• Hide AIOptions button in multiplayer

  rlcevg

  committed
  2e7c238

  Copy full SHA for 2e7c238

Commits on Dec 13, 2020

• Merge pull request #521 from rlcevg/aioptions2

  Show description for f213881
  gajop

  authored
  f213881

  Copy full SHA for f213881

• - remove modifications in list_window.lua

  Show description for d58721f
  gajop

  committed
  d58721f

  Copy full SHA for d58721f

• Merge branch 'master' into behe-merge

  gajop

  committed
  2335a18

  Copy full SHA for 2335a18

Commits on Dec 17, 2020

• Merge pull request #522 from Beherith/master

  Show description for 9ef545c
  gajop

  authored
  9ef545c

  Copy full SHA for 9ef545c

Commits on Dec 19, 2020

• fix uber's friend list and make it not conflict with ZK's implementation

  gajop

  committed
  3bfc410

  Copy full SHA for 3bfc410

• Merge branch 'master' into syncMerge

  gajop

  committed
  cc4d64a

  Copy full SHA for cc4d64a

• Merge remote-tracking branch 'zkfork/master' into syncMerge

  gajop

  committed
  2f8b65f

  Copy full SHA for 2f8b65f