Code

almost complete sprint 4#40

Code

Merged

LewisRye merged 36 commits intomainSWE2024/world-conquest:mainfrom devSWE2024/world-conquest:devCopy head branch name to clipboardMay 1, 2024

+26,599-1,034

Commits

Commits on Apr 29, 2024

• docstrings for Player and AIPlayer

  LewisRye

  committed
  fbf925d

  Copy full SHA for fbf925d

• map name fix and lobby fix

  LewisRye

  committed
  1c6348c

  Copy full SHA for 1c6348c

• added card sprites

  LewisRye

  committed
  c149f99

  Copy full SHA for c149f99

• getting started on card implementation

  LewisRye

  committed
  c2575f2

  Copy full SHA for c2575f2

• starting on CardCanvas

  LewisRye

  committed
  ef233b6

  Copy full SHA for ef233b6

• small button changes

  LewisRye

  committed
  3a0ee83

  Copy full SHA for 3a0ee83

• new buttons

  LewisRye

  committed
  338660c

  Copy full SHA for 338660c

• added map2 cards

  LewisRye

  committed
  c7e0672

  Copy full SHA for c7e0672

• ui for card inventory, moving from slot to trade and vice versa implemented

  TaiseiYokoshima

  committed
  104e8cb

  Copy full SHA for 104e8cb

Commits on Apr 30, 2024

• trade card and inventory completed

  TaiseiYokoshima

  committed
  9fdc848

  Copy full SHA for 9fdc848

• renaming countries!!

  LewisRye

  committed
  42918f3

  Copy full SHA for 42918f3

• small renaming refinements

  LewisRye

  committed
  6b63aae

  Copy full SHA for 6b63aae

• starting animation

  LewisRye

  committed
  db8ef7b

  Copy full SHA for db8ef7b

• fortification bug fixed

  TaiseiYokoshima

  committed
  234d56d

  Copy full SHA for 234d56d

• finish button animation

  LewisRye

  committed
  727a401

  Copy full SHA for 727a401

• Merge pull request #36 from SWE2024/animation

  Show description for 5147c96
  LewisRye

  authored
  5147c96

  Copy full SHA for 5147c96

• undo previous testing commit

  LewisRye

  committed
  270511f

  Copy full SHA for 270511f

• adding eliminated canvas

  LewisRye

  committed
  3901a85

  Copy full SHA for 3901a85

• win screen update / card notification

  LewisRye

  committed
  8b51f33

  Copy full SHA for 8b51f33

• nearly complete on docstrings

  LewisRye

  committed
  5018018

  Copy full SHA for 5018018

• added testing map

  LewisRye

  committed
  8205418

  Copy full SHA for 8205418

• Merge pull request #37 from SWE2024/docstrings

  Show description for b63a72b
  LewisRye

  authored
  b63a72b

  Copy full SHA for b63a72b

• asset cleanup and improvements

  LewisRye

  committed
  cd64e1b

  Copy full SHA for cd64e1b

• finished test map

  LewisRye

  committed
  be39973

  Copy full SHA for be39973

• win condition implemented

  TaiseiYokoshima

  committed
  97504b5

  Copy full SHA for 97504b5

Commits on May 1, 2024

• win state progress

  LewisRye

  committed
  a1d8eb6

  Copy full SHA for a1d8eb6

• game win audio change

  LewisRye

  committed
  39b86b6

  Copy full SHA for 39b86b6

• fixed win condition

  TaiseiYokoshima

  committed
  74b63b2

  Copy full SHA for 74b63b2

• win condition and eliminated player implemented

  TaiseiYokoshima

  committed
  ad5ca39

  Copy full SHA for ad5ca39

• random fix, lobby fix

  LewisRye

  committed
  109608a

  Copy full SHA for 109608a

• fortify only once

  LewisRye

  committed
  e4cb06c

  Copy full SHA for e4cb06c

• more docstrings

  LewisRye

  committed
  ad38db2

  Copy full SHA for ad38db2

• ai player fix

  LewisRye

  committed
  a611643

  Copy full SHA for a611643

• added more cards to map3 and fixed card trde with notification

  TaiseiYokoshima

  committed
  c3f494e

  Copy full SHA for c3f494e

• Merge pull request #38 from SWE2024/ai

  Show description for 0cb6862
  LewisRye

  authored
  0cb6862

  Copy full SHA for 0cb6862

• Merge pull request #39 from SWE2024/card_trade

  Show description for d9674e2
  LewisRye

  authored
  d9674e2

  Copy full SHA for d9674e2