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

Revolver reload upgrade #348

Merged
merged 7 commits into from
Nov 28, 2023
Merged

Revolver reload upgrade #348

merged 7 commits into from
Nov 28, 2023

Conversation

Fueredoriku
Copy link
Contributor

@Fueredoriku Fueredoriku commented Nov 27, 2023 •
edited
Loading

Add player hand that crams bullets into revolver at reload!

newRevolverReload

  • Revolver reload now sped up by a fairly good amount

misc:

  • Fix seeker naming for gatling body
  • Add culling for cameras so they can't see meshes marked with a playerID+"gun" layer

@Fueredoriku Fueredoriku self-assigned this Nov 27, 2023
@Fueredoriku Fueredoriku linked an issue Nov 27, 2023 that may be closed by this pull request
Improve revolver reload animation #233
Closed
@Fueredoriku
Add playerHand with basic animation on revolver reload.
fcf77ee 
- Added extra culling for players to only view their own gun (just arm for now)
- Add bullet model and material for later animation
- Add rudimentary placeholder arm animation for revolver
@Fueredoriku
Add start of bullet pile animation to revolver.
92771a3
@Fueredoriku
Add remaining animation
49d5fae
@Fueredoriku Fueredoriku assigned karofmah and unassigned karofmah Nov 28, 2023
@Fueredoriku Fueredoriku requested a review from karofmah November 28, 2023 02:10
@Fueredoriku Fueredoriku marked this pull request as ready for review November 28, 2023 02:11
@Fueredoriku Fueredoriku requested a review from toberge November 28, 2023 15:32
toberge
toberge approved these changes Nov 28, 2023
View reviewed changes
Copy link
Contributor

@toberge toberge left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

omg so cute
image

ok so the reload animation is REALLY GOOD & I love the way the bullets are carelessly dropped and then hammered in
however
tt does look a little weird with the cannon barrel:
image
but we can ignore that :)))))

Assets/Scripts/Gamestate/PlayerManager.cs Show resolved Hide resolved
Assets/Scripts/Gamestate/PlayerManager.cs Outdated Show resolved Hide resolved
@Fueredoriku Fueredoriku merged commit 987a03c into dev Nov 28, 2023
@Fueredoriku Fueredoriku deleted the feature/revolver-reload-upgrade branch November 28, 2023 23:03
@Fueredoriku Fueredoriku mentioned this pull request Nov 29, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@toberge toberge toberge approved these changes

@CraZyB1336 CraZyB1336 Awaiting requested review from CraZyB1336

@karofmah karofmah Awaiting requested review from karofmah

Assignees

@Fueredoriku Fueredoriku

Labels
None yet
Projects
Prosjekt-Spill-H22 board
Status: Done 🎉
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Improve revolver reload animation
3 participants
@Fueredoriku @toberge @karofmah