Code

Sprites#18

Code

Open

diabrar wants to merge 137 commits intochrehall68:mainchrehall68/SGAI-Outbreak:mainfrom sunsky426:spritessunsky426/SGAI-DRHAT-Outbreak:spritesCopy head branch name to clipboard

+1,397-760

Commits

Commits on Jul 19, 2022

• Update README.md

  sunsky426

  authored
  5d0a7a0

  Copy full SHA for 5d0a7a0

• Seperated Action & Direction

  Show description for 5a6e581
  sunsky426

  committed
  5a6e581

  Copy full SHA for 5a6e581

• Added Enum.py

  sunsky426

  committed
  40dc4ed

  Copy full SHA for 40dc4ed

• Merge branch 'chrehall68:main' into main

  sunsky426

  authored
  20e0b2c

  Copy full SHA for 20e0b2c

• Added comments and simplified a few things

  m325th

  committed
  ffe87a3

  Copy full SHA for ffe87a3

• Merge branch 'main' of https://github.com/sunsky426/SGAI-DRHAT-Outbreak

  m325th

  committed
  f6b6d68

  Copy full SHA for f6b6d68

• Merge branch 'main' into impl_act

  sunsky426

  committed
  683b5ce

  Copy full SHA for 683b5ce

Commits on Jul 20, 2022

• Edited stuff

  sunsky426

  committed
  ccc355b

  Copy full SHA for ccc355b

• finish implementing heal

  sunsky426

  committed
  3c3f27b

  Copy full SHA for 3c3f27b

• Update main.py

  Show description for 1b5bb9f
  sunsky426

  committed
  1b5bb9f

  Copy full SHA for 1b5bb9f

• deleted action_space and direction_space

  Show description for 3a8f8c7
  sunsky426

  committed
  3a8f8c7

  Copy full SHA for 3a8f8c7

• Add Intermission

  sunsky426

  committed
  45c3882

  Copy full SHA for 45c3882

• Implement case when vaccined person heals a zombie

  sunsky426

  committed
  f5c3f72

  Copy full SHA for f5c3f72

• messed with pygame a bit

  Show description for 297bae1
  m325th

  committed
  297bae1

  Copy full SHA for 297bae1

• added basic framework and UI for kill action

  Show description for d415e0f
  rtsej

  committed
  d415e0f

  Copy full SHA for d415e0f

• Update PygameFunctions.py

  m325th

  committed
  2c83e19

  Copy full SHA for 2c83e19

• Added kill function

  sunsky426

  committed
  bc5d8d8

  Copy full SHA for bc5d8d8

• Merge branch 'impl_heal' into impl_kill_ui

  sunsky426

  committed
  cd5677e

  Copy full SHA for cd5677e

• Impl backend for kill

  sunsky426

  committed
  43016a5

  Copy full SHA for 43016a5

• unused import

  sunsky426

  committed
  966f254

  Copy full SHA for 966f254

• Update PygameFunctions.py

  m325th

  committed
  ad419ff

  Copy full SHA for ad419ff

• stuff

  sunsky426

  committed
  797b8da

  Copy full SHA for 797b8da

• stuff

  sunsky426

  committed
  8e7768d

  Copy full SHA for 8e7768d

• Added constants.py

  sunsky426

  committed
  abd33f3

  Copy full SHA for abd33f3

• bruh

  sunsky426

  committed
  0a34f57

  Copy full SHA for 0a34f57

• added bite.png

  sunsky426

  committed
  49fe63c

  Copy full SHA for 49fe63c

• finalized

  sunsky426

  committed
  0abee3a

  Copy full SHA for 0abee3a

• Merge branch 'main' into impl_kill_ui

  sunsky426

  authored
  7b1afc0

  Copy full SHA for 7b1afc0

• Merge pull request #3 from sunsky426/impl_kill_ui

  Show description for 571a331
  sunsky426

  authored
  571a331

  Copy full SHA for 571a331

• added action.kill for computer

  sunsky426

  committed
  a26d55c

  Copy full SHA for a26d55c

• B vs Board bs GameBoard sycronization

  sunsky426

  committed
  caa811b

  Copy full SHA for caa811b

Commits on Jul 21, 2022

• Impl bite for fail heal

  sunsky426

  committed
  44eca1b

  Copy full SHA for 44eca1b

• fixed pop and zombies

  m325th

  committed
  64349d1

  Copy full SHA for 64349d1

• cleaning

  m325th

  committed
  38eeb19

  Copy full SHA for 38eeb19

• Update State.py

  m325th

  committed
  ecb7dc6

  Copy full SHA for ecb7dc6

• Merge branch 'fix_spawning' of https://github.com/sunsky426/SGAI-DRHAT-Outbreak into fix_spawning

  m325th

  committed
  702eb35

  Copy full SHA for 702eb35

• Update constants.py

  m325th

  committed
  407c80c

  Copy full SHA for 407c80c

• fix spawing

  m325th

  committed
  971f2d8

  Copy full SHA for 971f2d8

• Merge pull request #4 from sunsky426/fix_spawning

  Show description for 6aa0982
  sunsky426

  authored
  6aa0982

  Copy full SHA for 6aa0982

• Update README.md

  sunsky426

  authored
  b86ced2

  Copy full SHA for b86ced2

Commits on Jul 22, 2022

• fix constant capitalization

  alisonding357

  committed
  ff14622

  Copy full SHA for ff14622

• Implements basic main menu

  Show description for b61819c
  rtsej

  committed
  b61819c

  Copy full SHA for b61819c

• Merge branch 'main' into impl_main_menu

  sunsky426

  committed
  47d3fc1

  Copy full SHA for 47d3fc1

• change comment

  sunsky426

  committed
  5bbdaa6

  Copy full SHA for 5bbdaa6

• added sound effect for kill

  alisonding357

  committed
  88b42e5

  Copy full SHA for 88b42e5

• Update Constants.py

  alisonding357

  committed
  c3d55ac

  Copy full SHA for c3d55ac

• add visual for safespace (bad)

  sunsky426

  committed
  cd23aa3

  Copy full SHA for cd23aa3

• safespace backend

  sunsky426

  committed
  1e17b04

  Copy full SHA for 1e17b04

• Update PygameFunctions.py

  rtsej

  committed
  7c79f75

  Copy full SHA for 7c79f75

• Merge branch 'impl_safe_space' of https://github.com/sunsky426/SGAI-DRHAT-Outbreak into impl_safe_space

  rtsej

  committed
  a1168ba

  Copy full SHA for a1168ba

Commits on Jul 25, 2022

• bruh

  sunsky426

  committed
  43409c1

  Copy full SHA for 43409c1

• Merge branch 'main' into impl_safe_space

  sunsky426

  authored
  893f5b6

  Copy full SHA for 893f5b6

• Merge pull request #5 from sunsky426/impl_safe_space

  Show description for da394e8
  sunsky426

  authored
  da394e8

  Copy full SHA for da394e8

• Merge branch 'main' into impl_main_menu

  sunsky426

  authored
  4646d14

  Copy full SHA for 4646d14

• Merge pull request #6 from sunsky426/impl_main_menu

  Show description for 14a5388
  sunsky426

  authored
  14a5388

  Copy full SHA for 14a5388

• Update main.py

  Show description for 391f022
  sunsky426

  committed
  391f022

  Copy full SHA for 391f022

• moved files out of SGAI_MK3

  m325th

  committed
  50e8f2b

  Copy full SHA for 50e8f2b

• nerfed safeSpaces

  m325th

  committed
  2c52a53

  Copy full SHA for 2c52a53

• add Dir.self

  sunsky426

  committed
  e56c4f3

  Copy full SHA for e56c4f3

• add facing

  sunsky426

  committed
  62027f4

  Copy full SHA for 62027f4

• Update Constants.py

  sunsky426

  committed
  9baedc4

  Copy full SHA for 9baedc4

• fixed zombies moving into safe spaces and added computer_role to board

  m325th

  committed
  8f0d0c3

  Copy full SHA for 8f0d0c3

• add role param to all actions and fix move action using role param

  m325th

  committed
  6fb3390

  Copy full SHA for 6fb3390

• Update main.py

  Show description for ca0ffe7
  sunsky426

  authored
  ca0ffe7

  Copy full SHA for ca0ffe7

• Merge pull request #7 from sunsky426/nerf_safeSpaces

  Show description for 380ffb9
  sunsky426

  authored
  380ffb9

  Copy full SHA for 380ffb9

• bugfix

  sunsky426

  committed
  4ee1bf0

  Copy full SHA for 4ee1bf0

• stuff

  sunsky426

  committed
  e0bb0fe

  Copy full SHA for e0bb0fe

• updated win/lose screens

  Show description for 8e3b1a8
  rtsej

  committed
  8e3b1a8

  Copy full SHA for 8e3b1a8

• bugfix

  sunsky426

  committed
  6daf67d

  Copy full SHA for 6daf67d

• index renamed

  sunsky426

  committed
  68a9104

  Copy full SHA for 68a9104

• Merge branch 'main' into impl_end_screen

  sunsky426

  authored
  20dca89

  Copy full SHA for 20dca89

• Merge pull request #8 from sunsky426/impl_end_screen

  Show description for e52f754
  sunsky426

  authored
  e52f754

  Copy full SHA for e52f754

• Merge branch 'main' into impl_dir

  sunsky426

  committed
  1ae3623

  Copy full SHA for 1ae3623

• Merge pull request #9 from sunsky426/impl_dir

  Show description for c22cb62
  sunsky426

  authored
  c22cb62

  Copy full SHA for c22cb62

• bugfix

  sunsky426

  committed
  ff9208d

  Copy full SHA for ff9208d

• impl_hasMed

  sunsky426

  committed
  192b27a

  Copy full SHA for 192b27a

• fix a ton of stuff

  Show description for 3885d36
  m325th

  committed
  3885d36

  Copy full SHA for 3885d36

• add point system

  alisonding357

  committed
  58a0789

  Copy full SHA for 58a0789

• display score on win scrreen

  alisonding357

  committed
  552ec73

  Copy full SHA for 552ec73

• bruh

  sunsky426

  committed
  00ceb95

  Copy full SHA for 00ceb95

• Merge branch 'main' into point_display

  sunsky426

  committed
  0458356

  Copy full SHA for 0458356

Commits on Jul 26, 2022

• get rid of SGAI_MK3 Folder

  alisonding357

  committed
  d5fd8fd

  Copy full SHA for d5fd8fd

• impl_Result

  sunsky426

  committed
  9f8aae0

  Copy full SHA for 9f8aae0

• bruh

  sunsky426

  committed
  57c9a28

  Copy full SHA for 57c9a28

• Merge branch 'point_display' of https://github.com/sunsky426/SGAI-DRHAT-Outbreak into point_display

  sunsky426

  committed
  e601da9

  Copy full SHA for e601da9

• brooo

  sunsky426

  committed
  83ea6b8

  Copy full SHA for 83ea6b8

• Update Board.py

  m325th

  committed
  965166f

  Copy full SHA for 965166f

• Update Board.py

  m325th

  committed
  88ecb29

  Copy full SHA for 88ecb29

• Update Constants.py

  m325th

  committed
  dc18e4e

  Copy full SHA for dc18e4e

• Merge pull request #10 from sunsky426/fix_vax

  Show description for 231d2d2
  m325th

  authored
  231d2d2

  Copy full SHA for 231d2d2

• Update Board.py

  m325th

  committed
  e4fdc26

  Copy full SHA for e4fdc26

• Merge pull request #12 from sunsky426/fix_vax

  Show description for 152ed4f
  alisonding357

  authored
  152ed4f

  Copy full SHA for 152ed4f

• Revert "Update Constants.py"

  Show description for a498fc2
  m325th

  committed
  a498fc2

  Copy full SHA for a498fc2

• Update Board.py

  m325th

  committed
  427bafb

  Copy full SHA for 427bafb

• Merge branch 'main' of https://github.com/sunsky426/SGAI-DRHAT-Outbreak

  m325th

  committed
  48421c8

  Copy full SHA for 48421c8

• Update constants.py

  Show description for f9296ea
  sunsky426

  committed
  f9296ea

  Copy full SHA for f9296ea

• Merge branch 'main' into sound_effects

  sunsky426

  committed
  4aaba58

  Copy full SHA for 4aaba58

• Merge branch 'main' of https://github.com/sunsky426/SGAI-DRHAT-Outbreak

  m325th

  committed
  3c46980

  Copy full SHA for 3c46980

• Amongus

  sunsky426

  committed
  84978d7

  Copy full SHA for 84978d7

• Amongus

  sunsky426

  committed
  55c481f

  Copy full SHA for 55c481f

• Amongus

  sunsky426

  committed
  3bf5cd6

  Copy full SHA for 3bf5cd6

• Merge pull request #15

  Show description for 9000e0e
  diabrar

  authored
  9000e0e

  Copy full SHA for 9000e0e

• Merge branch 'main' of https://github.com/sunsky426/SGAI-DRHAT-Outbreak

  m325th

  committed
  0875a58

  Copy full SHA for 0875a58

• Update Constants.py

  m325th

  committed
  ffdab29

  Copy full SHA for ffdab29

• lowercased from commit import

  m325th

  committed
  5fbfa4c

  Copy full SHA for 5fbfa4c

• Merge pull request #16 from sunsky426/fix_constants_import

  Show description for aa5c50c
  diabrar

  authored
  aa5c50c

  Copy full SHA for aa5c50c

• added public opinions

  sunsky426

  committed
  d13fd3d

  Copy full SHA for d13fd3d

• add_tanh

  sunsky426

  committed
  6fd8a6b

  Copy full SHA for 6fd8a6b

• Merge remote-tracking branch 'origin/impl_hasMed'

  Show description for 0a61429
  diabrar

  committed
  0a61429

  Copy full SHA for 0a61429

Commits on Jul 27, 2022

• added kill button and zombie (uncropped)

  diabrar

  committed
  bc87d44

  Copy full SHA for bc87d44

• change Sigmoid function from tanh to smoothstep

  sunsky426

  committed
  5433c41

  Copy full SHA for 5433c41

• decrease amount of zombies

  sunsky426

  committed
  a8a0d12

  Copy full SHA for a8a0d12

• impl smoothstep

  sunsky426

  committed
  32580eb

  Copy full SHA for 32580eb

• reset public opinion

  sunsky426

  committed
  fb17aa1

  Copy full SHA for fb17aa1

• Merge branch 'main' into public_opinion

  sunsky426

  committed
  9508a38

  Copy full SHA for 9508a38

• point change amount adjustment

  sunsky426

  committed
  80fae58

  Copy full SHA for 80fae58

• Merge branch 'main' into impl_hasMed

  sunsky426

  authored
  3b94ca8

  Copy full SHA for 3b94ca8

• Merge pull request #17 from sunsky426/impl_hasMed

  Show description for d666fa4
  sunsky426

  authored
  d666fa4

  Copy full SHA for d666fa4

• Merge pull request #19 from diabrar/main

  Show description for 43f0676
  sunsky426

  authored
  43f0676

  Copy full SHA for 43f0676

• decrease amount of zombies

  sunsky426

  committed
  1d2cb77

  Copy full SHA for 1d2cb77

• delete useless import statement

  alisonding357

  committed
  d2f2cec

  Copy full SHA for d2f2cec

• bugfix

  sunsky426

  committed
  530883d

  Copy full SHA for 530883d

• Merge branch 'public_opinion' of https://github.com/sunsky426/SGAI-DRHAT-Outbreak into public_opinion

  sunsky426

  committed
  88aac16

  Copy full SHA for 88aac16

• Update Constants.py

  Show description for bbe5759
  sunsky426

  committed
  bbe5759

  Copy full SHA for bbe5759

• change casing

  sunsky426

  committed
  6cf6415

  Copy full SHA for 6cf6415

• Merge branch 'main' into point_display

  sunsky426

  committed
  8b9ca1e

  Copy full SHA for 8b9ca1e

• added Result class

  sunsky426

  committed
  e0e89c1

  Copy full SHA for e0e89c1

• Added Result class

  sunsky426

  committed
  ae318c0

  Copy full SHA for ae318c0

• change import

  sunsky426

  committed
  ecec0cd

  Copy full SHA for ecec0cd

• change elseif bug

  sunsky426

  committed
  ed5b716

  Copy full SHA for ed5b716

• Merge pull request #21 from sunsky426/public_opinion

  Show description for 0fb5c83
  sunsky426

  authored
  0fb5c83

  Copy full SHA for 0fb5c83

• added Result class

  sunsky426

  committed
  1b8fd97

  Copy full SHA for 1b8fd97

• Merge pull request #22 from sunsky426/point_display

  Show description for 2826d74
  sunsky426

  authored
  2826d74

  Copy full SHA for 2826d74

• bugfix

  sunsky426

  committed
  1daa0e2

  Copy full SHA for 1daa0e2

• Merge branch 'main' into sprites

  sunsky426

  committed
  69c41e4

  Copy full SHA for 69c41e4

Commits on Aug 1, 2022

• sprites added

  diabrar

  committed
  acbe7bc

  Copy full SHA for acbe7bc

• Fully updated readme with instructions

  diabrar

  authored
  fc13949

  Copy full SHA for fc13949