Code

Merge to main#225

Code

Merged

wsrvn merged 17 commits intomainlythx/trakman:mainfrom devlythx/trakman:devCopy head branch name to clipboardDec 29, 2023

+372-2,390

Commits

Commits on Dec 21, 2023

• allow changing text position for ui buttons

  wsrvn

  committed
  6e63d52

  Copy full SHA for 6e63d52

• fixed buttons not rendering on playerjoin

  felacek

  committed
  81aa778

  Copy full SHA for 81aa778

Commits on Dec 28, 2023

• functional dockerfile and semi-functional compose yml

  felacek

  committed
  03a8f1c

  Copy full SHA for 03a8f1c

• both functional, require manual setup for server

  felacek

  committed
  2dbe7a7

  Copy full SHA for 2dbe7a7

• fully functional when run first time

  felacek

  committed
  d1daedf

  Copy full SHA for d1daedf

• typo

  felacek

  committed
  7d3af6c

  Copy full SHA for 7d3af6c

• its a workius

  felacek

  committed
  2842c35

  Copy full SHA for 2842c35

• changed postgres container name

  felacek

  committed
  9601393

  Copy full SHA for 9601393

Commits on Dec 29, 2023

• optimised dockerfile

  felacek

  committed
  4a03481

  Copy full SHA for 4a03481

• remove the discord.js dependency

  wsrvn

  committed
  c6c9736

  Copy full SHA for c6c9736

• remove unused import

  wsrvn

  committed
  e087261

  Copy full SHA for e087261

• Merge pull request #223 from lythx/remove-djs

  Show description for eb7417d
  wsrvn

  authored
  eb7417d

  Copy full SHA for eb7417d

• Merge branch 'dev' into docker

  felacek

  committed
  36d9e8d

  Copy full SHA for 36d9e8d

• added new discord env vars and prevented race condition in trakman/server from occuring

  felacek

  committed
  42e03fa

  Copy full SHA for 42e03fa

• specified postgres version to prevent hilarious moments of incompatibility

  felacek

  committed
  615d84f

  Copy full SHA for 615d84f

• Merge pull request #222 from lythx/docker

  Show description for a7c6304
  felacek

  authored
  a7c6304

  Copy full SHA for a7c6304

• bump version to 1.4.2

  felacek

  committed
  89eede1

  Copy full SHA for 89eede1