Code

Skills menu + merged settings#596

Code

Merged

WALLOFJUSTICE merged 41 commits intoTurningWheel:developTurningWheel/Barony:developfrom WALLOFJUSTICE:dev-20-merge-main-menuWALLOFJUSTICE/Barony:dev-20-merge-main-menuCopy head branch name to clipboardNov 5, 2021

+6,509-661

Commits

Commits on Sep 18, 2021

• * fix scaling for non-720p in Field() - lost in merge

  

  WALL OF JUSTICE

  committed
  c9345d9

  Copy full SHA for c9345d9

Commits on Sep 23, 2021

• * move books to after loading screen because issues in release build trying to render text.

  Show description for 545b19f
  

  WALL OF JUSTICE

  committed
  545b19f

  Copy full SHA for 545b19f

Commits on Sep 29, 2021

• * status effect enemy bar stuff - WIP

  

  WALL OF JUSTICE

  committed
  ed0837e

  Copy full SHA for ed0837e

• * missed status effect enemy bar WIP

  

  WALL OF JUSTICE

  committed
  5ddb71d

  Copy full SHA for 5ddb71d

Commits on Oct 1, 2021

• * Statue + Statue Animator sprites for editor

  Show description for 9ec57d7
  

  WALL OF JUSTICE

  committed
  9ec57d7

  Copy full SHA for 9ec57d7

• * set statue animator sprite instead of temp boulder

  

  WALL OF JUSTICE

  committed
  aa9b982

  Copy full SHA for aa9b982

Commits on Oct 14, 2021

• changing video mode is easier

  Show description for e5a9c64
  SheridanR

  committed
  e5a9c64

  Copy full SHA for e5a9c64

• Frame entries can be justified horizontally

  Show description for 04f9cda
  SheridanR

  committed
  04f9cda

  Copy full SHA for 04f9cda

• perfected dropdowns in settings window

  Show description for 05e69e9
  SheridanR

  committed
  05e69e9

  Copy full SHA for 05e69e9

• fix some crashes, add sfx

  Show description for e670447
  SheridanR

  committed
  e670447

  Copy full SHA for e670447

• fix broken stuff post-merge

  Show description for 7d916f6
  SheridanR

  committed
  7d916f6

  Copy full SHA for 7d916f6

• fix mousewheel scrolling

  Show description for 3532256
  SheridanR

  committed
  3532256

  Copy full SHA for 3532256

• constify UI draw functions

  Show description for 790f008
  SheridanR

  committed
  790f008

  Copy full SHA for 790f008

• fix range on sliders

  Show description for ac47910
  SheridanR

  committed
  ac47910

  Copy full SHA for ac47910

Commits on Oct 16, 2021

• quit game confirmation

  Show description for 4b4e42b
  SheridanR

  committed
  4b4e42b

  Copy full SHA for 4b4e42b

• fix visual bugs with sliders

  Show description for f728dc0
  SheridanR

  committed
  f728dc0

  Copy full SHA for f728dc0

• WIP generic settings window

  SheridanR

  committed
  f964836

  Copy full SHA for f964836

Commits on Oct 20, 2021

• lots of binding menu stuff

  Show description for d2d8a81
  SheridanR

  committed
  d2d8a81

  Copy full SHA for d2d8a81

Commits on Oct 26, 2021

• Can now assign separate colors for outlines on Text + Fields

  Show description for 73bc7d7
  SheridanR

  committed
  73bc7d7

  Copy full SHA for 73bc7d7

• rebind stuff

  Show description for 7df6c02
  SheridanR

  committed
  7df6c02

  Copy full SHA for 7df6c02

• * skillsheet save work, mostly functional

  

  WALL OF JUSTICE

  committed
  5c79226

  Copy full SHA for 5c79226

• * remove mono font hinting - doesn't look great?

  

  WALL OF JUSTICE

  committed
  cf8bd97

  Copy full SHA for cf8bd97

• * slider hidden if disabled

  Show description for 8b9b01e
  

  WALL OF JUSTICE

  committed
  8b9b01e

  Copy full SHA for 8b9b01e

• * add some commented out test for player velocity

  

  WALL OF JUSTICE

  committed
  c94f6cd

  Copy full SHA for c94f6cd

Commits on Oct 27, 2021

• Binding works

  Show description for 4ed4076
  SheridanR

  committed
  4ed4076

  Copy full SHA for 4ed4076

Commits on Oct 29, 2021

• * move skillsheet in front of inventory

  Show description for 58ace3e
  

  WALL OF JUSTICE

  committed
  58ace3e

  Copy full SHA for 58ace3e

Commits on Nov 2, 2021

• Pause menu, other stuff

  Show description for 69e61f9
  SheridanR

  committed
  69e61f9

  Copy full SHA for 69e61f9

• * fix secret weapon achievement unlocking for non-brewers

  

  WALL OF JUSTICE

  committed
  9408931

  Copy full SHA for 9408931

• * controller bug? SDL2 2.0.12, initGameControllers() called after GAMECONTROLLER_ADDED and bindings never refreshed.

  

  WALL OF JUSTICE

  committed
  34defbf

  Copy full SHA for 34defbf

Commits on Nov 3, 2021

• fix "quit to main menu" option

  Show description for 635ee68
  SheridanR

  committed
  635ee68

  Copy full SHA for 635ee68

• fix top line disappearing in credits

  Show description for dcef60d
  SheridanR

  committed
  dcef60d

  Copy full SHA for dcef60d

• * skills list controller prompts, polish

  Show description for dc15698
  

  WALL OF JUSTICE

  committed
  dc15698

  Copy full SHA for dc15698

• * apply patch from TurningWheel#582

  Show description for cabf118
  

  WALL OF JUSTICE

  committed
  cabf118

  Copy full SHA for cabf118

• * merge main menu work

  

  WALL OF JUSTICE

  committed
  c7bed2e

  Copy full SHA for c7bed2e

• * fix up merge conflicts

  

  WALL OF JUSTICE

  committed
  1d7c3ce

  Copy full SHA for 1d7c3ce

• Add the missing "Game" tab to settings (only ingame)

  Show description for b8a9c00
  SheridanR

  committed
  b8a9c00

  Copy full SHA for b8a9c00

• fix mouse cursor drawing behind in-game ui

  Show description for 8a4be63
  SheridanR

  committed
  8a4be63

  Copy full SHA for 8a4be63

• fix in-game quit buttons highlighting the wrong option after cancel

  Show description for 86a3317
  SheridanR

  committed
  86a3317

  Copy full SHA for 86a3317

• * update pixel_maz font sizes to larger one

  

  WALL OF JUSTICE

  committed
  1390c33

  Copy full SHA for 1390c33

• * merge again

  

  WALL OF JUSTICE

  committed
  4bc8795

  Copy full SHA for 4bc8795

• * update lang

  

  WALL OF JUSTICE

  committed
  cabce4e

  Copy full SHA for cabce4e