Code

Endrbranch2#1210

Code

Closed

EndrAnimet wants to merge 79 commits intoDeltaV-Station:masterDeltaV-Station/Delta-v:masterfrom EndrAnimet:endrbranch2EndrAnimet/DeltaV-Stray:endrbranch2Copy head branch name to clipboard

+4,505,131-10,510

Commits

Commits on Apr 26, 2024

• Add support for both Delta-V and Wizden patrons in terms of name colors in OOC chat

  redmushie

  committed
  baa0ae9

  Copy full SHA for baa0ae9

• Use file-scoped namespaces, fix error in LoadPatronUsernames

  redmushie

  committed
  2b1da6b

  Copy full SHA for 2b1da6b

• Add comment indicating significance of if-statement ordering

  redmushie

  committed
  380e40f

  Copy full SHA for 380e40f

• Change Wizden patron to SS14 patron

  redmushie

  committed
  76297b6

  Copy full SHA for 76297b6

• Merge branch 'master' into feature/patron-colors

  redmushie

  authored
  41ffc5e

  Copy full SHA for 41ffc5e

• Fix contents of PatronUsernames.yml

  redmushie

  committed
  e3d0e04

  Copy full SHA for e3d0e04

• Add more Delta-V markers, minor docs fixes

  redmushie

  committed
  a55c397

  Copy full SHA for a55c397

• Add a few more docs

  redmushie

  committed
  9a2a153

  Copy full SHA for 9a2a153

• Comment out example in PatronUsernames.yml and make it more example-y

  redmushie

  committed
  2f8b235

  Copy full SHA for 2f8b235

• Add extra Delta-V marker and remove unused method in CreditsWindow

  redmushie

  committed
  b0c2f2c

  Copy full SHA for b0c2f2c

• Re-add uncommented example YAML entry, as otherwise YAML parsing fails

  redmushie

  committed
  de46e31

  Copy full SHA for de46e31

Commits on Apr 28, 2024

• Merge branch 'master' into feature/patron-colors

  redmushie

  authored
  2d19e78

  Copy full SHA for 2d19e78

Commits on Apr 29, 2024

• Merge branch 'master' into feature/patron-colors

  redmushie

  authored
  65adf0e

  Copy full SHA for 65adf0e

Commits on Apr 30, 2024

• Merge branch 'master' into feature/patron-colors

  redmushie

  authored
  5bdc72d

  Copy full SHA for 5bdc72d

Commits on May 1, 2024

• Merge branch 'master' into feature/patron-colors

  redmushie

  authored
  a76a7f4

  Copy full SHA for a76a7f4

Commits on May 2, 2024

• Update PULL_REQUEST_TEMPLATE.md

  Show description for f779fb1
  GeneralGaws

  authored
  f779fb1

  Copy full SHA for f779fb1

• миссклик

  Show description for 24b2ddb
  GeneralGaws

  authored
  24b2ddb

  Copy full SHA for 24b2ddb

• Merge branch 'master' into feature/patron-colors

  redmushie

  authored
  6769503

  Copy full SHA for 6769503

Commits on May 3, 2024

• качая сборку эндера....

  Show description for fd3e763
  GeneralGaws

  authored
  fd3e763

  Copy full SHA for fd3e763

Commits on May 4, 2024

• Merge branch 'master' into feature/patron-colors

  redmushie

  authored
  39cc4fe

  Copy full SHA for 39cc4fe

Commits on May 5, 2024

• Merge branch 'master' into feature/patron-colors

  redmushie

  authored
  486d452

  Copy full SHA for 486d452

Commits on May 8, 2024

• Merge branch 'master' into feature/patron-colors

  redmushie

  authored
  034fbf1

  Copy full SHA for 034fbf1

• Merge branch 'DeltaV-Station:master' into master

  GeneralGaws

  authored
  373826f

  Copy full SHA for 373826f

• Fff (#10)

  Show description for fa147c2
  

  4 peopleauthored
  fa147c2

  Copy full SHA for fa147c2

Commits on May 9, 2024

• фикс ПРа thievery

  GeneralGaws

  committed
  63628e0

  Copy full SHA for 63628e0

• Merge branch 'DeltaV-Station:master' into master

  GeneralGaws

  authored
  bb600ea

  Copy full SHA for bb600ea

• timers for roles

  EndrAnimet

  committed
  19bc144

  Copy full SHA for 19bc144

• Fills

  EndrAnimet

  committed
  71465ba

  Copy full SHA for 71465ba

• Merge branch 'DeltaV-Station:master' into master

  GeneralGaws

  authored
  88e6a8c

  Copy full SHA for 88e6a8c

• реверт theivery

  GeneralGaws

  committed
  ea84acd

  Copy full SHA for ea84acd

• Merge branch 'master' into feature/patron-colors

  redmushie

  authored
  64c156a

  Copy full SHA for 64c156a

• Corvax sprites

  EndrAnimet

  committed
  8953484

  Copy full SHA for 8953484

• Corvax translate

  EndrAnimet

  committed
  b071a4d

  Copy full SHA for b071a4d

• fix

  EndrAnimet

  committed
  046ff52

  Copy full SHA for 046ff52

• Merge pull request #11 from EndrAnimet/endrbranch2

  Show description for 8ec947e
  EndrAnimet

  authored
  8ec947e

  Copy full SHA for 8ec947e

• fixPrinter

  EndrAnimet

  committed
  20f613d

  Copy full SHA for 20f613d

• Merge pull request #13 from EndrAnimet/endrbranch2

  Show description for 6ef5796
  EndrAnimet

  authored
  6ef5796

  Copy full SHA for 6ef5796

Commits on May 10, 2024

• Merge branch 'DeltaV-Station:master' into master

  GeneralGaws

  authored
  34f085b

  Copy full SHA for 34f085b

• Merge branch 'DeltaV-Station:master' into aaa

  GeneralGaws

  authored
  8e1ee24

  Copy full SHA for 8e1ee24

• socks

  EndrAnimet

  committed
  98c7518

  Copy full SHA for 98c7518

• fix

  EndrAnimet

  committed
  4577436

  Copy full SHA for 4577436

• fix1

  EndrAnimet

  committed
  21526ae

  Copy full SHA for 21526ae

• fix3

  EndrAnimet

  committed
  d68fbce

  Copy full SHA for d68fbce

• fix4

  EndrAnimet

  committed
  8e81a98

  Copy full SHA for 8e81a98

• fix5

  EndrAnimet

  committed
  2d7d8c0

  Copy full SHA for 2d7d8c0

• Merge pull request #14 from EndrAnimet/endrbranch2

  Show description for 9e27612
  EndrAnimet

  authored
  9e27612

  Copy full SHA for 9e27612

• Bestenlung

  EndrAnimet

  committed
  1a04f36

  Copy full SHA for 1a04f36

• GameCards

  EndrAnimet

  committed
  345b8fe

  Copy full SHA for 345b8fe

• FixSocks

  EndrAnimet

  committed
  b0e2473

  Copy full SHA for b0e2473

• FixSocks0

  EndrAnimet

  committed
  50fa432

  Copy full SHA for 50fa432

• Merge PR #15 (BL, GameCards, fix)

  Show description for 07d0d21
  EndrAnimet

  authored
  07d0d21

  Copy full SHA for 07d0d21

• Shadowkin

  EndrAnimet

  committed
  52f6129

  Copy full SHA for 52f6129

• Merge PR #16 (baff shadowkins)

  Show description for 832618d
  EndrAnimet

  authored
  832618d

  Copy full SHA for 832618d

• ShadowkinHead

  EndrAnimet

  committed
  bd96be9

  Copy full SHA for bd96be9

• Merge PR #17 (sprites for shadowkin ears in hats)

  Show description for 8c933e9
  EndrAnimet

  authored
  8c933e9

  Copy full SHA for 8c933e9

Commits on May 11, 2024

• FixShadowkin

  EndrAnimet

  committed
  d284359

  Copy full SHA for d284359

• Merge PR #18 (delete Respirator for Shadowkins)

  Show description for 8328b09
  EndrAnimet

  authored
  8328b09

  Copy full SHA for 8328b09

Commits on May 14, 2024

• boosty

  Show description for d8297ed
  EndrAnimet

  authored
  d8297ed

  Copy full SHA for d8297ed

• Add files via upload

  Show description for a5c9cea
  EndrAnimet

  authored
  a5c9cea

  Copy full SHA for a5c9cea

• Update manifest.yml

  Show description for 0f2f7fd
  EndrAnimet

  authored
  0f2f7fd

  Copy full SHA for 0f2f7fd

Commits on May 15, 2024

• Merge PR #20 (Boosty, Logo)

  Show description for 96b39cc
  EndrAnimet

  authored
  96b39cc

  Copy full SHA for 96b39cc

• patrons-system

  EndrAnimet

  committed
  46c20a8

  Copy full SHA for 46c20a8

• Merge branch 'pr/1138'

  EndrAnimet

  committed
  aada60f

  Copy full SHA for aada60f

• Merge branch 'pr/1138' into endrbranch2

  EndrAnimet

  committed
  7f63827

  Copy full SHA for 7f63827

• Merge branch 'pr/21' into endrbranch2

  EndrAnimet

  committed
  75fc19e

  Copy full SHA for 75fc19e

• Merge pull request #22 from EndrAnimet/endrbranch2

  Show description for e714407
  EndrAnimet

  authored
  e714407

  Copy full SHA for e714407

• Merge branch 'DeltaV-Station:master' into master

  EndrAnimet

  authored
  c1137f8

  Copy full SHA for c1137f8

• Merge remote-tracking branch 'upstream/master' into endrbranch2

  EndrAnimet

  committed
  e19171a

  Copy full SHA for e19171a

• fix

  EndrAnimet

  committed
  bcf9e6c

  Copy full SHA for bcf9e6c

• fix-hands

  EndrAnimet

  committed
  3aa4b7f

  Copy full SHA for 3aa4b7f

• CorvaxReSprite

  EndrAnimet

  committed
  5e8ca25

  Copy full SHA for 5e8ca25

• CorvaxReSprite

  EndrAnimet

  committed
  785d695

  Copy full SHA for 785d695

• remove plasmaman & loadout for brigmed

  EndrAnimet

  committed
  010f55c

  Copy full SHA for 010f55c

• Merge branch 'endrbranch2' into aaa

  EndrAnimet

  committed
  640c932

  Copy full SHA for 640c932

• Merge branch 'DeltaV-Station:master' into backup

  GeneralGaws

  authored
  152a148

  Copy full SHA for 152a148

• CorvaxLoadouts

  EndrAnimet

  committed
  d51896e

  Copy full SHA for d51896e

Commits on May 16, 2024

• Merge branch 'backup' into endrbranch2

  EndrAnimet

  committed
  cdaa186

  Copy full SHA for cdaa186

• loadouts

  EndrAnimet

  committed
  ae2e2ba

  Copy full SHA for ae2e2ba

• ghost's skins

  EndrAnimet

  committed
  a582ee7

  Copy full SHA for a582ee7