Upstream update #157
Merged
Upstream update #157
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
(cherry picked from commit ca17eb4)
(cherry picked from commit 4547d40)
* trim EOL whitespace * draw the rest of the owl * fix encoding issue with JK2 cg_effects.cpp (cherry picked from commit 4547d40)
* misc loop overrun fixes * revert RT_BEAM changes the extra iteration is intentional to seal the tri strip * revert inadvertent whitespace changes (cherry picked from commit 6a8a880)
…by diffing codemp/game (JACoders#1178) * reconcile game module changes with the SDK release by diffing codemp/game * revert saberMoveData changes to match basejka, provide a new cvar (g_fixSaberMoveData) to patch it if desired * introduce a new configstring (26: CS_LEGACY_FIXES) to inform the client of which fixes it should also apply, e.g. saberMoveData * client module obtains gamestate (including configstrings) earlier to prevent use before initialisation, which is now checked for in debug builds * revert a change to saber disarm bonus calculation if g_fixSaberDisarmBonus is not enabled * G_CanBeEnemy considers private duels once again (removed from modbase before its git history) * add disclaimer to legacyFixes_e * revert: client module obtains gamestate (including configstrings) earlier to prevent use before initialisation this was causing issues loading incorrect clientinfo (cherry picked from commit 142e0b7)
* move BASE_COMPAT flag behind cmake option BuildMPWithCompatMode, add g_fixWeaponAttackAnim making use of CS_LEGACY_FIXES * remove BASE_COMPAT and BuildMPWithCompatMode, add g_fixRunWalkAnims * actually remove BuildMPWithCompatMode (cherry picked from commit 1e8a799)
It works as expected now. The model handle was simply incorrect.
Thanks @kuvirah for this fix.
(cherry picked from commit 057e259)
taysta
force-pushed
the
upstream-update
branch
from
b751732
to
a1fd714
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Updates upstream against OpenJK, JAPro and Rend2