7
6
Fork
You've already forked Unvanquished
1

Animate chaingun and painsaw in code using bone transformations #37

Open
DolceTriade wants to merge 2 commits from DolceTriade/Unvanquished:anims into unvmods-0.56
pull from: DolceTriade/Unvanquished:anims
merge into: unvmods:unvmods-0.56
unvmods:unvmods-0.56
unvmods:map-testing-0.56.0-14
unvmods:spawn-clear-ui-sweet
unvmods:spawn-clear-ui
unvmods:unvmods-biokit
unvmods:map-testing-0.56.0-13
unvmods:deadbeef-mover-fixes
unvmods:map-testing-0.56.0-12
unvmods:map-testing-0.56.0-11
unvmods:map-testing-0.56.0-10
unvmods:map-testing-0.56.0-9
unvmods:unvmods-0.56-mods-space-brawl-ok
unvmods:deadbeef-spinigun
unvmods:map-testing-0.56.0-8
unvmods:unvmods-0.56-fix-ps-stats
unvmods:unvmods-0.56-no-__DATE__
unvmods:unvmods-readme-update
unvmods:unvmods-0.56-bugfixes
unvmods:chaingun-overheat
unvmods:bunker-0.56.0-0
unvmods:entity-cache-robustness
unvmods:unvmods-0.56-deadbeef-pending
unvmods:map-testing-0.56.0-7
unvmods:map-testing-0.56.0-7-lua-bsp-nodes
unvmods:bunker-0.56.0-rtm
unvmods:bunker-0.56.0-rc2
unvmods:bunker-0.55.3-4
unvmods:kench-stacking-0.55.5
unvmods:bunker-0.55.3-3
unvmods:bunker-0.55.3-2-sm2
unvmods:unvmods-0.56-bot-menu
unvmods:unvmods-0.56-stack-buildings-dirty
unvmods:unvmods-0.56-rotator-obstacle
unvmods:deadbeef-0.56-fix-server-version
unvmods:bunker-0.55.3-2
unvmods:g_admin_crash
unvmods:unvmods-gdb-stack-trace
unvmods:unvmods-stack-traces
unvmods:bunker-0.55.3-1
unvmods:zzz_enneract
unvmods:grise-patch-1
unvmods:bunker-0.55.3-0
unvmods:chainturbations-fix
unvmods:bunker-0.55.2-0
unvmods:master
First-time contributor
Copy link
No description provided.

FWIW, the current code that supports MD3 (https://codeberg.org/unvmods/unvanquished/src/branch/unvmods-0.56/src/cgame/cg_weapons.cpp#L1483-L1497) for spinning barrel does not affects when firing animations are played.

Except for that, the other issues I see are general issues that affect unvanquished codebase a lot, and it would be unreasonable to ask a PR introducing a feature to fix those long lasting issues.

I have not tried the code (that will conflict with my own commits, and it is not in sync with the unvmods-0.56 branch neither), but it is simple enough, not much intrusive, and should be trivial to repair if an error occurs, while I see nothing that could lead to a crash.

The only questionnings I have are about the flames that go out of cannon for chaingun, which to me seems related to the animation, and that this gives very 2 different code paths depending on the model file format (previous one, and current one), which ideally I would like to avoid.

Still, cleanup can happen later, it's not as if this part of the codebase was clean and nice.

FWIW, the current code that supports MD3 (https://codeberg.org/unvmods/unvanquished/src/branch/unvmods-0.56/src/cgame/cg_weapons.cpp#L1483-L1497) for spinning barrel does not affects when firing animations are played. Except for that, the other issues I see are general issues that affect unvanquished codebase a lot, and it would be unreasonable to ask a PR introducing a feature to fix those long lasting issues. I have not tried the code (that will conflict with my own commits, and it is not in sync with the unvmods-0.56 branch neither), but it is simple enough, not much intrusive, and should be trivial to repair if an error occurs, while I see nothing that could lead to a crash. The only questionnings I have are about the flames that go out of cannon for chaingun, which to me seems related to the animation, and that this gives very 2 different code paths depending on the model file format (previous one, and current one), which ideally I would like to avoid. Still, cleanup can happen later, it's not as if this part of the codebase was clean and nice.

So, I have cherry-picked those commits on top of my branch, which have a lot of changes and tested it.

  • 0 conflicts;
  • it works;
  • 0 additional warning (modulo those I have to disable because too noisy otherwise);
  • I will need the feature for the spinigun mechanics;

There are minor details that could be said about the feature being now in 2 places because old md3 code is somewhere else, but that would be bike-shedding, and I would prefer to let this stuff to upstream.

I say we merge it.

So, I have cherry-picked those commits on top of my branch, which have a *lot* of changes and tested it. * 0 conflicts; * it works; * 0 additional warning (modulo those I have to disable because too noisy otherwise); * I will need the feature for the spinigun mechanics; There are minor details that could be said about the feature being now in 2 places because old md3 code is somewhere else, but that would be bike-shedding, and I would prefer to let this stuff to upstream. I say we merge it.

Actually, no, my tests show a weird behavior when playing remotely. It may be related to some of my other changes, but that would be weird, as I have a dedicated repo and branch for what i deploy.
See http://deadbeef.fr/random/local-chaingun.mp4 and http://deadbeef.fr/random/remote-chaingun.mp4 (I will keep those files hosted until I get the issue solved)

Actually, no, my tests show a weird behavior when playing remotely. It may be related to some of my other changes, but that would be weird, as I have a dedicated repo and branch for what i deploy. See http://deadbeef.fr/random/local-chaingun.mp4 and http://deadbeef.fr/random/remote-chaingun.mp4 (I will keep those files hosted until I get the issue solved)
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u anims:DolceTriade-anims
git switch DolceTriade-anims

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch unvmods-0.56
git merge --no-ff DolceTriade-anims
git switch DolceTriade-anims
git rebase unvmods-0.56
git switch unvmods-0.56
git merge --ff-only DolceTriade-anims
git switch DolceTriade-anims
git rebase unvmods-0.56
git switch unvmods-0.56
git merge --no-ff DolceTriade-anims
git switch unvmods-0.56
git merge --squash DolceTriade-anims
git switch unvmods-0.56
git merge --ff-only DolceTriade-anims
git switch unvmods-0.56
git merge DolceTriade-anims
git push origin unvmods-0.56
Sign in to join this conversation.
No reviewers
No labels
bug
regression
upstream
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
unvmods/Unvanquished!37
Reference in a new issue
unvmods/Unvanquished
No description provided.
Delete branch "DolceTriade/Unvanquished:anims"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?