Code

Audio feature 2#109

Code

Open

Suraj-1729 wants to merge 146 commits intokcherr1:mainkcherr1/Fall2020_CSC403_Project:mainfrom 2-mod3-Musketeers:Audio_feature_22-mod3-Musketeers/RadPG:Audio_feature_2Copy head branch name to clipboard

+4,802-8,985

Commits

Commits on Oct 19, 2023

• Create Archetype class + PlayerArchetype interface

  SethajWarren

  committed
  43ce6d3

• Expanded the classes

  SethajWarren

  committed
  a2cbc97

• Refactor: Character -> Entity, BattleCharacter -> Character. NPC now inherits from Character.

  carterray310

  committed
  cb3cf12

Commits on Oct 21, 2023

• classes made

  carterray310

  committed
  1c909de

• fixed all the bad tabbing

  carterray310

  committed
  059ea11

• merge of playerclass refactor

  carterray310

  committed
  2892d20

• inventory system with weapons, armor, utility, and backpack. equip functions, add/remove from backpack functions. Entities no longer need a position to be created in the hopes to create position an…

  Show description for b8a054e
  carterray310

  committed
  b8a054e

Commits on Oct 22, 2023

• drop todo

  carterray310

  committed
  d80c10e

Commits on Oct 23, 2023

• Added functions to clear entities from the window.

  Joseph990

  committed
  9f654aa

• Removed names from the entities. They were not supposed to be in the last push.

  Joseph990

  committed
  1ac856a

• added some items

  carterray310

  committed
  49d5f2a

• Merge pull request #1 from 2-mod3-Musketeers/PlayerClassRefactor

  Show description for 461e895
  SethajWarren

  authored
  461e895

Commits on Oct 24, 2023

• merge of joes show/hide character branch and the item/inventory branch

  carterray310

  committed
  5c02c2e

• Merge branch 'main' of https://github.com/2-mod3-Musketeers/RadPG into player-archetypes

  SethajWarren

  committed
  0be7787

• Added archetype to player, added speed into battle

  SethajWarren

  committed
  97b8684

• Made default archetypes and paved the way for enemy archetypes.

  Show description for de488a4
  SethajWarren

  committed
  de488a4

• added dropping item functionality

  carterray310

  committed
  8b4d77e

• formatting

  carterray310

  committed
  4d4fb4b

• merge of archetypes and items/inventory

  carterray310

  committed
  b9cd9de

• unequip items, drop all functions

  carterray310

  committed
  896597c

Commits on Oct 25, 2023

• merge of archetypes and items/inventory, added new items to fit archetype weapons

  carterray310

  committed
  a13cf50

• Merge pull request #2 from 2-mod3-Musketeers/ItemsandInventory

  Show description for 3b639cb
  carterray310

  authored
  3b639cb

Commits on Oct 26, 2023

• Adding InvScreen

  nmorgan5055

  committed
  300ac67

• Design start on Inv

  nmorgan5055

  committed
  db4c46b

• Created game over screen with restart and exit buttons

  Joseph990

  committed
  012e28b

• Changing damage system for different archetype

  SethajWarren

  committed
  e52549c

• changed panels to pics

  nmorgan5055

  committed
  d15a30a

• Fixed bugs with restart function and merged with code from main branch.

  Joseph990

  committed
  5e65daa

• Changed the damage system for the battle

  Show description for 6e08d71
  SethajWarren

  committed
  6e08d71

• working inventory screen

  nmorgan5055

  committed
  8ea7f2f

• Working on drop item function

  nmorgan5055

  committed
  c691fa1

• Added archetype images

  SethajWarren

  committed
  abf4c42

• tiling system setup, dynamically create enemies, tiles, walls, items, and player

  carterray310

  committed
  9ba7aad

Commits on Oct 27, 2023

• Add drop funct

  nmorgan5055

  committed
  35a1bb8

• fixed drop item bug

  carterray310

  committed
  b29af7c

• Refresh img

  nmorgan5055

  committed
  eae790f

• saving before fixing a bug

  carterray310

  committed
  a620ded

• Remove image if item slot is empty

  nmorgan5055

  committed
  09220d1

• fix error on order of operations

  carterray310

  committed
  96aa4b0

• Firxed Wrong image on armor/util

  nmorgan5055

  committed
  a389f46

• Fixed image bug again

  nmorgan5055

  committed
  828cafa

• fix bug with equpping empty slot

  carterray310

  committed
  9bede6c

• Added selected item highlighting

  nmorgan5055

  committed
  fed1e2c

• Merge branch 'InvScreen' of github.com:2-mod3-Musketeers/RadPG into InvScreen

  nmorgan5055

  committed
  345b0ae

• fixed dropping empty item

  carterray310

  committed
  9f889c8

• made sure multi tiles cannot be highlighted in inv

  nmorgan5055

  committed
  5e49b3a

• added some comments, and dynamic player picture modification

  nmorgan5055

  committed
  4ac2920

• fix movement

  carterray310

  committed
  ba4c96c

• reset selected value after action is taken

  nmorgan5055

  committed
  26ce143

• level1 beta

  carterray310

  committed
  73ccebc

• Merge pull request #3 from 2-mod3-Musketeers/RestartFeature

  Show description for 7dea13a
  SethajWarren

  authored
  7dea13a

• Working build, just in case

  nmorgan5055

  committed
  3d9decd

• Added images to the resources

  SethajWarren

  committed
  cdd881b

• made full screen

  carterray310

  committed
  9a520a2

• merge of main into inventory display

  carterray310

  committed
  a475675

• Merge branch 'InvScreen' of https://github.com/2-mod3-Musketeers/RadPG into InvScreen

  carterray310

  committed
  4671a1c

• fixed attack speed

  carterray310

  committed
  75b0bd2

• fix?

  carterray310

  committed
  eebdb7e

• fix

  carterray310

  committed
  9df0fc2

• Fixed damage bug and item pickup bug

  Joseph990

  committed
  2352153

• moved items around

  carterray310

  committed
  62a404b

• Merge pull request #4 from 2-mod3-Musketeers/RestartFeature

  Show description for 6e8043d
  carterray310

  authored
  6e8043d

• merge of main and InvScreen

  carterray310

  committed
  b17e903

• Changes for inv button

  nmorgan5055

  committed
  712ade9

• Revert "Changes for inv button"

  Show description for f669dea
  nmorgan5055

  committed
  f669dea

• Merge branch 'InvScreen' of github.com:2-mod3-Musketeers/RadPG into InvScreen

  nmorgan5055

  committed
  5aab604

• Changed Menu button to inv pic, added use button that don't work yet

  nmorgan5055

  committed
  09fbd15

• terrain generation and effects

  carterray310

  committed
  321d15a

• implemented main into tiling project

  carterray310

  committed
  c1648e7

• terrain generation and restart

  carterray310

  committed
  faf10c7

• setup for joe

  carterray310

  committed
  bf1ceb2

• tiling system. fixed movement bug

  carterray310

  committed
  1ba4db3

Commits on Oct 28, 2023

• merge of InvScreen and Tiling

  carterray310

  committed
  ddccbb6

• cleaning up

  carterray310

  committed
  3ffd3cc

Commits on Oct 29, 2023

• fix battle pictures

  carterray310

  committed
  20ae00d

• fixed image bug and inventory button bug

  carterray310

  committed
  3b90e0d

• Merge pull request #5 from 2-mod3-Musketeers/Tiling

  Show description for 5722add
  carterray310

  authored
  5722add

• Refactoring damage

  SethajWarren

  committed
  60e507b

• Merge branch 'main' of https://github.com/2-mod3-Musketeers/RadPG into player-archetypes

  SethajWarren

  committed
  f0ffb70

Commits on Oct 30, 2023

• more fixes

  SethajWarren

  committed
  30f5fc0

• item functionality, tiling scaling fix

  carterray310

  committed
  0190271

• working on adding menu screen

  nmorgan5055

  committed
  903920e

• Began creating the "to hit" system

  SethajWarren

  committed
  716b128

• attempt to reduce memory

  carterray310

  committed
  704a119

• Added settings form with access from inventory and main menu, as well as completed main menu screen.

  nmorgan5055

  committed
  640bf5e

• menu and settings improvement

  nmorgan5055

  committed
  15e017a

• fixed health bar update in inv

  nmorgan5055

  committed
  d00b39f

• added stat labels, only updates when inventory is reopened right now.

  nmorgan5055

  committed
  380e8bb

• testing

  carterray310

  committed
  a20b9ba

• merge of stats and settings

  carterray310

  committed
  68ff37f

• Fixed Title SizeMode

  nmorgan5055

  committed
  a7592e6

• Added main menu button to game over screen that returns you to the main menu.

  Joseph990

  committed
  577fb35

• Merge branch 'StatAndSettings' of https://github.com/2-mod3-Musketeers/RadPG into StatAndSettings

  Joseph990

  committed
  5cd2efb

• Adding Player Select

  nmorgan5055

  committed
  658db35

• Settings Fix

  nmorgan5055

  committed
  895324e

• Merge pull request #6 from 2-mod3-Musketeers/player-archetypes

  Show description for 7420499
  carterray310

  authored
  7420499

• before merge with stat and settings

  carterray310

  committed
  b1b9411

• Merge branch 'StatAndSettings' of https://github.com/2-mod3-Musketeers/RadPG into ItemFunctionality

  carterray310

  committed
  c481fe9

• reopen level on start game, not player select yet

  nmorgan5055

  committed
  b78e0fb

• Merge branch 'main' of https://github.com/2-mod3-Musketeers/RadPG into ItemFunctionality

  carterray310

  committed
  5c95a11

• Merge branch 'StatAndSettings' of https://github.com/2-mod3-Musketeers/RadPG into ItemFunctionality

  carterray310

  committed
  76fc1b2

• Added images to the archetypes

  SethajWarren

  committed
  53bafa4

• remove character on going to main menu

  carterray310

  committed
  2eb8b32

• updating the hitting system

  SethajWarren

  committed
  54c7f33

• small fix

  SethajWarren

  committed
  f5c86ae

• Added player select screen. Still needs "instructions"

  nmorgan5055

  committed
  34e5e87

• pulled ItemFunctionality and merged

  nmorgan5055

  committed
  505b57b

• Added conditions to make use pick a class and name

  nmorgan5055

  committed
  b8813c4

• Fixed Error that showed the player selection form when clicking main menu button.

  Joseph990

  committed
  d57cf53

• Working Build with player select

  nmorgan5055

  committed
  7a5d021

• Fixed bug where main menu brought you to character selection.

  Joseph990

  committed
  99d103a

• Main Menu button bug.

  Joseph990

  committed
  8adeae1

• Merge branch 'StatAndSettings' of https://github.com/2-mod3-Musketeers/RadPG into StatAndSettings

  Joseph990

  committed
  d405ad4

• fixed issue where items persisted through death

  carterray310

  committed
  ffb23a8

• Merge branch 'StatAndSettings' of https://github.com/2-mod3-Musketeers/RadPG into ItemFunctionality

  carterray310

  committed
  5061c4b

• fixed persistence items on restart

  carterray310

  committed
  ace24e6

• reduced image sizes

  carterray310

  committed
  7f53b62

• Added autoscaling inventory. Need to remove old.

  nmorgan5055

  committed
  8d5f429

• fixed item disapearing bug

  carterray310

  committed
  13822f1

• Created boss archetype and balanced player tank

  SethajWarren

  committed
  2967f62

• Merge branch 'StatAndSettings' of https://github.com/1-mod3-Musketeers/RadPG into images-and-combat

  SethajWarren

  committed
  616fc88

• Added health bar

  nmorgan5055

  committed
  ea923b2

• Removed image field and changed enemies

  SethajWarren

  committed
  e5ae34c

• syntax fix

  SethajWarren

  committed
  40d5efa

• Merge pull request #7 from 2-mod3-Musketeers/images-and-combat

  Show description for c0e50d9
  SethajWarren

  authored
  c0e50d9

• Added button use in screens, working on labels for stats

  nmorgan5055

  committed
  dd6bc19

• Revert "fixed item disapearing bug"

  Show description for f3aaca9
  carterray310

  committed
  f3aaca9

• Merge branch 'StatAndSettings' of https://github.com/2-mod3-Musketeers/RadPG into ItemFunctionality

  carterray310

  committed
  a4f071d

• Merge branch 'ResizingInv' of https://github.com/2-mod3-Musketeers/RadPG into ItemFunctionality

  carterray310

  committed
  68f4cd4

• Added auto refreshing labels for stats

  nmorgan5055

  committed
  8c88e73

• fixed combat bug

  SethajWarren

  committed
  ad26bb1

• Resized instruction bar

  nmorgan5055

  committed
  10324ed

• before merge

  carterray310

  committed
  3a8da48

• Merge pull request #8 from 2-mod3-Musketeers/ResizingInv

  Show description for 530655f
  carterray310

  authored
  530655f

• Fixed issue where main menu button went to player selection screen.

  Joseph990

  committed
  97b4b60

• potion effects

  carterray310

  committed
  43e83e2

• Merge pull request #9 from 2-mod3-Musketeers/MainMenuButtonFix

  Show description for 70fef91
  carterray310

  authored
  70fef91

• Merge branch 'main' of https://github.com/2-mod3-Musketeers/RadPG into ItemFunctionality

  carterray310

  committed
  6cf7362

• fixed potion of speed

  carterray310

  committed
  9b333bf

• fix tiles

  carterray310

  committed
  c9e2fac

• Merge pull request #10 from 2-mod3-Musketeers/ItemFunctionality

  Show description for 097e241
  carterray310

  authored
  097e241

Commits on Oct 31, 2023

• added main and ingame audio

  Suraj-1729

  committed
  aafe727

• Added attack sound in sync with game_audio

  Suraj-1729

  committed
  2af97c5

• removed enemies after their death

  carterray310

  committed
  df84c70

• pulled in seth's combat changes

  carterray310

  committed
  c9e293b

• remove potion effect after battle

  carterray310

  committed
  1d219f3