Code

Olga2#123

Code

Open

olgabien wants to merge 156 commits intokcherr1:mainkcherr1/Fall2020_CSC403_Project:mainfrom Basicpython:olga2Basicpython/Fall2020_CSC403_Project_SpamRisk:olga2Copy head branch name to clipboard

+8,593-602

Commits

Commits on Oct 18, 2023

• Functioning Flee Button

  Show description for 5f32669
  reberaidan

  committed
  5f32669

Commits on Oct 19, 2023

• Main Menu Basic

  Show description for 993080b
  reberaidan

  committed
  993080b

• Main Menu Background Running

  Show description for 07d1024
  reberaidan

  committed
  07d1024

Commits on Oct 20, 2023

• Readded enemy health bar

  reberaidan

  committed
  d2338be

• Added battle theme which palys during fight and stops when fight ends

  glee01

  committed
  120541c

• Healing Method and proper debugging of method added

  JackSulzer

  committed
  e0192be

• Made battle music loop until battle is over

  glee01

  committed
  0b3d357

• Main Menu Refresh

  reberaidan

  committed
  08f584a

• Battle Exit Fix

  Show description for 71decc8
  reberaidan

  committed
  71decc8

• Merge pull request #2 from Basicpython/BattleNotCrashFix

  Show description for cd188cf
  reberaidan

  authored
  cd188cf

Commits on Oct 23, 2023

• Battle Music and Level Music working. Will probably need a slight tweak once game over is added

  glee01

  committed
  1fb8965

• Merge pull request #3 from Basicpython/Aidan_Working_Branch

  Show description for 992647d
  reberaidan

  authored
  992647d

• Health Bar Added to map and tracked consistentally after each battle

  JackSulzer

  committed
  0d086f0

• Level disposal now stops music

  glee01

  committed
  6e60479

• Player Heal Fixed to not overheal in new battle instance

  JackSulzer

  committed
  aa4fc17

• Merge branch 'main' into Garrett

  glee01

  authored
  4d12573

• Merge pull request #5 from Basicpython/Garrett

  Show description for 76583b9
  glee01

  authored
  76583b9

• Merge branch 'main' into Jack_Experimental

  JackSulzer

  authored
  edca828

• Merge pull request #6 from Basicpython/Jack_Experimental

  Show description for 0060ca6
  JackSulzer

  authored
  0060ca6

• FIXED

  JackSulzer

  committed
  266cbdb

• Merge pull request #7 from Basicpython/Jack_Experimental

  Show description for 1b71c1a
  JackSulzer

  authored
  1b71c1a

Commits on Oct 25, 2023

• Update README.md

  Show description for cafe6ca
  glee01

  authored
  cafe6ca

• Update README.md

  Show description for d292a76
  glee01

  authored
  d292a76

• Update README.md

  glee01

  authored
  6e488ee

• Merge branch 'main' into Garrett

  glee01

  authored
  ffbd7b0

• Added Removal of heal in flee button

  reberaidan

  committed
  1e57c90

• Merge pull request #9 from Basicpython/Aidan_Working_Branch

  Show description for 0c17ad3
  reberaidan

  authored
  0c17ad3

• Score Counter Working

  

  Olga

  committed
  e29e22f

• Score Working

  

  Olga

  committed
  e4b0384

Commits on Oct 27, 2023

• Merge pull request #10 from Basicpython/olga3.0

  Show description for 0aac08d
  olgabien

  authored
  0aac08d

• Added Main Menu Music

  reberaidan

  committed
  0675f60

• Merge branch 'main' into Aidan_Working_Branch

  reberaidan

  committed
  8f35599

• Merge pull request #11 from Basicpython/Aidan_Working_Branch

  Show description for c01bd56
  reberaidan

  authored
  c01bd56

• Added win and lose screens for game over

  glee01

  committed
  bc18350

• Merge branch 'main' into Garrett

  glee01

  authored
  153b013

• Merge pull request #12 from Basicpython/Garrett

  Show description for 242e521
  glee01

  authored
  242e521

• Working on Background Process

  reberaidan

  committed
  ac6a8b9

• Merge branch 'main' into Aidan_Working_Branch

  reberaidan

  committed
  1e46077

Commits on Oct 29, 2023

• Add files via upload

  Basicpython

  authored
  1046ee2

• Update FrmLevel.Designer.cs

  Show description for b635cc2
  Basicpython

  authored
  b635cc2

• Update FrmLevel.cs

  Show description for 197a089
  Basicpython

  authored
  197a089

• Update Character.cs

  Show description for 27c1fe1
  Basicpython

  authored
  27c1fe1

• Merge pull request #13 from Basicpython/David_Olivier_Branch

  Show description for 257fcc0
  Basicpython

  authored
  257fcc0

Commits on Oct 30, 2023

• display endings

  reberaidan

  committed
  768b9ff

• Add files via upload

  olgabien

  authored
  2b1a7d1

• Added deadenemy Resources.resx

  olgabien

  authored
  a65e8af

• Fixed bug which would crash on startup

  glee01

  committed
  76322c6

Commits on Nov 1, 2023

• Merge branch 'main' into Aidan_Working_Branch

  reberaidan

  committed
  75af5b5

• Merge pull request #14 from Basicpython/Aidan_Working_Branch

  Show description for 26952a2
  reberaidan

  authored
  26952a2

Commits on Nov 6, 2023

• Addition of final boss, and two additional enemies for the second level

  JackSulzer

  committed
  7fd2983

• End game screen pops up

  Show description for b226699
  reberaidan

  committed
  b226699

• added sound file resources

  glee01

  committed
  dc82215

• Changed images

  JackSulzer

  committed
  7877517

• Merge branch 'main' into Jack_Experimental

  glee01

  authored
  741b399

• Merge pull request #16 from Basicpython/Jack_Experimental

  Show description for 7e4e02f
  glee01

  authored
  7e4e02f

• Fixed

  JackSulzer

  committed
  26f5c93

• Merge pull request #18 from Basicpython/Jack_Experimental

  Show description for d2810a2
  JackSulzer

  authored
  d2810a2

Commits on Nov 8, 2023

• Merge branch 'Garrett' into main

  glee01

  authored
  e329a44

• Merge pull request #19 from Basicpython/main

  Show description for bfff915
  glee01

  authored
  bfff915

• Added soundplayer to play each sound when button is pressed

  glee01

  committed
  9ad23cd

• Merge pull request #20 from Basicpython/Garrett

  Show description for fc6ed80
  glee01

  authored
  fc6ed80

• Delete Fall2020_CSC403_Project.sln

  Show description for b51085f
  glee01

  authored
  b51085f

• Added volume controll to main menu

  reberaidan

  committed
  0c1db7a

• Merge branch 'main' into Aidan_Working_Branch

  reberaidan

  committed
  0a74dd4

• Merge pull request #21 from Basicpython/main

  Show description for 631ab92
  JackSulzer

  authored
  631ab92

• fix for sound files not appearing

  glee01

  committed
  b39ef21

• Merge pull request #22 from Basicpython/Garrett

  Show description for f7eb037
  glee01

  authored
  f7eb037

• Merge branch 'main' into Aidan_Working_Branch

  reberaidan

  committed
  9a19563

• Default Volume Change

  reberaidan

  committed
  5fe7244

• Add files via upload

  Show description for a46f81d
  Basicpython

  authored
  a46f81d

• Added Settings View WIP

  reberaidan

  committed
  3f6ef2a

• david branch fix

  glee01

  committed
  3be336a

• Battle AttackBtn detects health lower than zero

  reberaidan

  committed
  2ae42f8

• fix

  glee01

  committed
  6f9ba29

• Delete extra portal.png

  Basicpython

  authored
  faf9154

• Delete extra App.config

  Basicpython

  authored
  b71ea4a

• Delete extra BattleCharacter.cs

  Basicpython

  authored
  4190797

• Delete extra menu_theme.wav

  Basicpython

  authored
  0ac4166

• Delete extra level_theme.wav

  Basicpython

  authored
  120e727

• Delete extra fire.png

  Basicpython

  authored
  a854f23

• Delete extra battle_theme.wav

  Basicpython

  authored
  c94ce78

• Delete extra Vector2.cs

  Basicpython

  authored
  0a4ce18

• Delete extra Character.cs

  Basicpython

  authored
  e14889b

• Got XP to display message temporarily and set XP counter.

  

  Olga

  committed
  74e6494

• Delete extra ClassDiagram1.cd

  Basicpython

  authored
  fd1903b

• Delete extra Collider.cs

  Basicpython

  authored
  5399f99

• Delete extra Enemy.cs

  Basicpython

  authored
  884017b

• Delete extra Fall2020_CSC403_Project.csproj

  Basicpython

  authored
  2d87996

• Delete extra FrmBattle.Designer.cs

  Basicpython

  authored
  4442bc3

• Delete extra FrmBattle.cs

  Basicpython

  authored
  aaf6330

• Delete extra FrmBattle.resx

  Basicpython

  authored
  6b7a9ae

• Delete extra FrmEndScreen.Designer.cs

  Basicpython

  authored
  f3bfe07

• Delete extra FrmEndScreen.cs

  Basicpython

  authored
  0024023

• Delete extra FrmEndScreen.resx

  Basicpython

  authored
  0e737ac

• Delete extra FrmLevel.Designer.cs

  Basicpython

  authored
  e6b4405

• Delete extra FrmLevel.cs

  Basicpython

  authored
  539fc4c

• Delete extra FrmLevel.resx

  Basicpython

  authored
  80b66ba

• Delete extra FrmMainMenu.Designer.cs

  Basicpython

  authored
  19c2975

• Delete extra FrmMainMenu.cs

  Basicpython

  authored
  dbe00ae

• Delete extra FrmMainMenu.resx

  Basicpython

  authored
  7c97ec2

• Delete extra FrmWinScreen.Designer.cs

  Basicpython

  authored
  588f776

• Delete extra FrmWinScreen.cs

  Basicpython

  authored
  9d201f1

• Delete extra FrmWinScreen.resx

  Basicpython

  authored
  43376c6

• Delete extra Game.cs

  Basicpython

  authored
  2c94f74

• Delete extra MyGameLibrary.csproj

  Basicpython

  authored
  3c29308

• Delete extra NPC.cs

  Basicpython

  authored
  b80cba6

• Delete extra Player.cs

  Basicpython

  authored
  879e666

• Delete extra Program.cs

  Basicpython

  authored
  11c9aee

Commits on Nov 9, 2023

• Merge branch 'David_Olivier_Branch' into InCaseItDontWorkBranch

  Basicpython

  authored
  c3f3491

• Update FrmLevel.cs

  Show description for f2f8cc3
  Basicpython

  authored
  f2f8cc3

• Update Resources.resx

  Show description for 2b61c99
  Basicpython

  authored
  2b61c99

• Merge pull request #24 from Basicpython/Aidan_Working_Branch

  Show description for 3b95045
  reberaidan

  authored
  3b95045

• Update Resources.Designer.cs

  Show description for 40774c2
  Basicpython

  authored
  40774c2

• Merge pull request #26 from Basicpython/InCaseItDontWorkBranch

  Show description for 59b21eb
  Basicpython

  authored
  59b21eb

• Update Resources.Designer.cs

  Show description for 5f8fded
  Basicpython

  authored
  5f8fded

• Added Back Button to Settings

  reberaidan

  committed
  aa17a00

• Merge pull request #27 from Basicpython/Aidan_Working_Branch

  Show description for 7f1d60b
  reberaidan

  authored
  7f1d60b

• Merge branch 'main' into olga

  olgabien

  authored
  4a62b10

• Merge pull request #23 from Basicpython/olga

  Show description for 72795fd
  olgabien

  authored
  72795fd

• Fixed bugs

  

  Olga

  committed
  236de68

• Merge pull request #28 from Basicpython/olga

  Show description for 4bd9fe9
  olgabien

  authored
  4bd9fe9

Commits on Nov 10, 2023

• Added battle background image to resources

  glee01

  committed
  05d8254

• Merge branch 'Garrett' into main

  glee01

  authored
  eb778d2

• Merge pull request #29 from Basicpython/main

  Show description for e1c357d
  glee01

  authored
  e1c357d

• Fix bugs

  

  Olga

  committed
  0988454

• Merge pull request #30 from Basicpython/olga

  Show description for 3bdf6b3
  glee01

  authored
  3bdf6b3

• Add files via upload

  Show description for 51066b4
  Basicpython

  authored
  51066b4

• Removed enemy attack sound so help delay

  glee01

  committed
  15676a9

• Merge pull request #31 from Basicpython/LevelFinisherBranch

  Show description for 10b6145
  glee01

  authored
  10b6145

Commits on Nov 13, 2023

• Finished all of the text for the text box, including the unique names for each individual enemy so that it isn't generic.

  JackSulzer

  committed
  f5992d7

Commits on Nov 14, 2023

• removed sound

  glee01

  committed
  c4bc3fe

• Merge branch 'Garrett' into main

  glee01

  authored
  5535482

• Merge pull request #33 from Basicpython/main

  Show description for 5e5ef97
  glee01

  authored
  5e5ef97

• Fixed, hopefully

  JackSulzer

  committed
  ccbe34b

• New Menu and Added Win Condition

  reberaidan

  committed
  5ccf941

• Merge branch 'main' into Jack_Experimental

  JackSulzer

  authored
  574046d

• Merge pull request #34 from Basicpython/Jack_Experimental

  Show description for 6c4e08e
  JackSulzer

  authored
  6c4e08e

Commits on Nov 15, 2023

• Stable Build

  reberaidan

  committed
  9ce0286

• added pause menu and adjusted win screen

  glee01

  committed
  55a443e

• Merge pull request #36 from Basicpython/Garrett

  Show description for 90b3fe4
  glee01

  authored
  90b3fe4

• Hide settings on Main Menu

  reberaidan

  committed
  647017f

• Merge branch 'main' into Aidan_Working_Branch

  reberaidan

  authored
  da3f1df

• Merge pull request #35 from Basicpython/Aidan_Working_Branch

  Show description for 9b14a12
  reberaidan

  authored
  9b14a12

• fixed resx file

  glee01

  committed
  60b5364

• fixed sounds

  glee01

  committed
  cbe25a0

• fixed xp message

  glee01

  committed
  bca7153

• Checking for Player Death on attack

  reberaidan

  committed
  f82a639

• Checks all battle buttons for player health

  reberaidan

  committed
  225486c

• Level increase working

  

  Olga

  committed
  1317bed

• Merge branch 'main' into olga

  olgabien

  authored
  4078b16

• Merge pull request #37 from Basicpython/olga

  Show description for e0fb36e
  olgabien

  authored
  e0fb36e

• changed damage and heal values

  JackSulzer

  committed
  303c585

• Win Screen Properly Displays

  reberaidan

  committed
  4a174df

• removed boss cutscene

  glee01

  committed
  5476729

• Xp carries leftover Xp to player's new level

  

  Olga

  committed
  98d23df

• Merge branch 'main' into olga2

  olgabien

  authored
  de9eed8