Code

Changes for project#66

Code

Open

WeaverD9028 wants to merge 43 commits intokcherr1:mainkcherr1/Fall2020_CSC403_Project:mainfrom wiz-ard:Dylan_branchwiz-ard/Fall2022_CSC403_Team_TwoSoft:Dylan_branchCopy head branch name to clipboard

+2,458-555

Commits

Commits on Oct 23, 2022

• Removed collision boxes and images of enemies after battle.

  wiz-ard

  committed
  fec5dfe

• Update README.md

  wiz-ard

  authored
  0a24f45

Commits on Oct 26, 2022

• Merge pull request #1 from wiz-ard/Zachary's_enemy_cleanup

  Show description for 1d8fba1
  WeaverD9028

  authored
  1d8fba1

Commits on Oct 30, 2022

• Update README.md

  Jtj031

  authored
  9e31f90

• Update Enemy.cs

  Jtj031

  authored
  675e7ea

• Update Character.cs

  Jtj031

  authored
  34c73a7

• Update FrmLevel.Designer.cs

  Jtj031

  authored
  4396eb8

• Update FrmLevel.cs

  Jtj031

  authored
  ba01062

• Update README.md

  Jtj031

  authored
  2ebaca3

Commits on Oct 31, 2022

• Added pause menu with working resume button and quit button. Also changed the timer update tick event for paused and not paused event along with button lockout when paused.

  wiz-ard

  committed
  2bc017c

• Update FrmLevel.Designer.cs

  Jtj031

  authored
  d2f6696

• Fixed enemy movement

  wiz-ard

  committed
  da21022

• Merge pull request #4 from wiz-ard/Juwans-Changes

  Show description for 2bef158
  wiz-ard

  authored
  2bef158

• Fixed merge errors

  wiz-ard

  committed
  699a752

• Fixed merge of movement and pause menu

  wiz-ard

  committed
  b2d34bc

• Merge pull request #6 from wiz-ard/pause_fix

  Show description for 93b0d2d
  wiz-ard

  authored
  93b0d2d

Commits on Nov 7, 2022

• player pictrue and movement now disappears when health reached 0.

  wiz-ard

  committed
  0adf2ba

Commits on Nov 15, 2022

• Chance Said hi

  

  Chance Jackson

  committed
  a302be9

• Add files via upload

  Family-123

  authored
  87e9572

Commits on Nov 16, 2022

• Update README.md

  Family-123

  authored
  c2d0d75

• Revert "Chance Said hi"

  Show description for ea18838
  wiz-ard

  committed
  ea18838

• Enemy additions

  Jtj031

  authored
  6a1de1e

• Enemy additions

  Jtj031

  authored
  78269ae

• Enemy additions

  Jtj031

  authored
  c4bbae3

• Enemy additions

  Jtj031

  authored
  b1d7071

• Enemy additions

  Jtj031

  authored
  69d171c

• Add files via upload

  Jtj031

  authored
  e987729

• Delete susnugget.png

  Jtj031

  authored
  0d54f24

• enemy additions

  Jtj031

  authored
  5e87c5a

• Delete Fall2020_CSC403_Project.sln

  Jtj031

  authored
  02fa61e

• enemy additions

  Jtj031

  authored
  ac623aa

• Delete Fall2020_CSC403_Project.sln

  Jtj031

  authored
  0785118

• Add files via upload

  Jtj031

  authored
  0210489

• partial death sceen

  wiz-ard

  committed
  bb02554

• Delete Resources.resx

  Jtj031

  authored
  9a6bf99

• Add files via upload

  Jtj031

  authored
  d104be3

• Merge pull request #8 from wiz-ard/enemy-additions

  Show description for 874d7b5
  wiz-ard

  authored
  874d7b5

• Changes for project

  WeaverD9028

  committed
  30a5335

• main added to branch

  wiz-ard

  committed
  45f11ce

• death sceen change to on frmlevel

  wiz-ard

  committed
  78528f2

• Finished death scene and player cleanup

  wiz-ard

  committed
  35f2a22

• Merge pull request #9 from wiz-ard/Player_cleanup_and_death_sceen

  Show description for ad8d218
  Jtj031

  authored
  ad8d218

• Fixed some errors, but needs to be looked at for imageList1 imageList2 and imageList3 in FrmLevel designerMain merge change

  wiz-ard

  committed
  aa6fb3f