Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Audio feature 2 #109

Open
wants to merge 146 commits into
base: main
Choose a base branch
from
Open

Audio feature 2 #109

wants to merge 146 commits into from

Conversation

Suraj-1729
Copy link

Added main menu and in game background music. Added a attack audio on click of attack button.

SethajWarren and others added 30 commits October 19, 2023 15:03
@SethajWarren
Create Archetype class + PlayerArchetype interface
43ce6d3
@SethajWarren
Expanded the classes
a2cbc97
@carterray310
Refactor: Character -> Entity, BattleCharacter -> Character. NPC now …
cb3cf12 
…inherits from Character.
@carterray310
classes made
1c909de
@carterray310
fixed all the bad tabbing
059ea11
@carterray310
merge of playerclass refactor
2892d20
@carterray310
inventory system with weapons, armor, utility, and backpack. equip fu…
b8a054e 
…nctions, add/remove from backpack functions. Entities no longer need a position to be created in the hopes to create position and collider when the object is needed
@carterray310
drop todo
d80c10e
@Joseph990
Added functions to clear entities from the window.
9f654aa
@Joseph990
Removed names from the entities. They were not supposed to be in the …
1ac856a 
…last push.
@carterray310
added some items
49d5f2a
@SethajWarren
Merge pull request #1 from 2-mod3-Musketeers/PlayerClassRefactor
461e895 
Refactor
@carterray310
merge of joes show/hide character branch and the item/inventory branch
5c02c2e
@SethajWarren
Merge branch 'main' of https://github.com/2-mod3-Musketeers/RadPG int…
0be7787 
…o player-archetypes
@SethajWarren
Added archetype to player, added speed into battle
97b8684
@SethajWarren
Made default archetypes and paved the way for enemy archetypes.
de488a4 
- Base player archetype is set to Rogue for now but can be changed in FrmLevel.cs
- Base enemy archetype is set to Swordsman for now but can be changed in FrmLevel.cs
- Implemented speed mechanic to allow the character with the highest speed to attack first
@carterray310
added dropping item functionality
8b4d77e
@carterray310
formatting
4d4fb4b
@carterray310
merge of archetypes and items/inventory
b9cd9de
@carterray310
unequip items, drop all functions
896597c
@carterray310
merge of archetypes and items/inventory, added new items to fit arche…
a13cf50 
…type weapons
@carterray310
Merge pull request #2 from 2-mod3-Musketeers/ItemsandInventory
3b639cb 
Items and inventory + Player Archetypes
@nmorgan5055
Adding InvScreen
300ac67
@nmorgan5055
Design start on Inv
db4c46b
@Joseph990
Created game over screen with restart and exit buttons
012e28b
@SethajWarren
Changing damage system for different archetype
e52549c
@nmorgan5055
changed panels to pics
d15a30a
@Joseph990
Fixed bugs with restart function and merged with code from main branch.
5e65daa
@SethajWarren
Changed the damage system for the battle
6e08d71 
- AlterHealth function is now seperated into `TakeDamage` and `GiveHealth`
- There is now a base damage that the player/enemy gives with a randomly assigned bonus
- Enemies now have archetypes
@nmorgan5055
working inventory screen
8ea7f2f
nmorgan5055 and others added 29 commits October 30, 2023 13:46
@nmorgan5055
Added autoscaling inventory. Need to remove old.
8d5f429
@carterray310
fixed item disapearing bug
13822f1
@SethajWarren
Created boss archetype and balanced player tank
2967f62
@SethajWarren
Merge branch 'StatAndSettings' of https://github.com/1-mod3-Musketeer…
616fc88 
…s/RadPG into images-and-combat
@nmorgan5055
Added health bar
ea923b2
@SethajWarren
Removed image field and changed enemies
e5ae34c
@SethajWarren
syntax fix
40d5efa
@SethajWarren
Merge pull request #7 from 2-mod3-Musketeers/images-and-combat
c0e50d9 
Images and combat into StatAndSettings
@nmorgan5055
Added button use in screens, working on labels for stats
dd6bc19
@carterray310
Revert "fixed item disapearing bug"
f3aaca9 
This reverts commit 13822f1.

revert
@carterray310
Merge branch 'StatAndSettings' of https://github.com/2-mod3-Musketeer…
a4f071d 
…s/RadPG into ItemFunctionality
@carterray310
Merge branch 'ResizingInv' of https://github.com/2-mod3-Musketeers/RadPG
68f4cd4 
 into ItemFunctionality
@nmorgan5055
Added auto refreshing labels for stats
8c88e73
@SethajWarren
fixed combat bug
ad26bb1
@nmorgan5055
Resized instruction bar
10324ed
@carterray310
before merge
3a8da48
@carterray310
Merge pull request #8 from 2-mod3-Musketeers/ResizingInv
530655f 
Resizing inv
@Joseph990
Fixed issue where main menu button went to player selection screen.
97b4b60
@carterray310
potion effects
43e83e2
@carterray310
Merge pull request #9 from 2-mod3-Musketeers/MainMenuButtonFix
70fef91 
Fixed issue where main menu button went to player selection screen.
@carterray310
Merge branch 'main' of https://github.com/2-mod3-Musketeers/RadPG int…
6cf7362 
…o ItemFunctionality
@carterray310
fixed potion of speed
9b333bf
@carterray310
fix tiles
c9e2fac
@carterray310
Merge pull request #10 from 2-mod3-Musketeers/ItemFunctionality
097e241 
Item functionality
@Suraj-1729
added main and ingame audio
aafe727
@Suraj-1729
Added attack sound in sync with game_audio
2af97c5
@carterray310
removed enemies after their death
df84c70
@carterray310
pulled in seth's combat changes
c9e293b
@carterray310
remove potion effect after battle
1d219f3
@Joseph990 Joseph990 deleted the Audio_feature_2 branch November 2, 2023 18:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@Suraj-1729 @SethajWarren @carterray310 @Joseph990 @nmorgan5055