Merging... #1
Open
Merging... #1
Conversation
This file contains hidden or 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
Add methods from interface into implementation's namespace
"ignitionFlare" and "ignitionFlare2" in .sab file. For black saber blade, "ignitionFlareBlack" and "ignitionFlareBlack2"
like in MP. only controls force regen for player
Galak Mech tweaks
Set fs_game back to "" and fs_basegame to "jaenhanced"
unless using katarn saberstyle. new saberthrow bind always works.
multiplier for saber ignition speed
turn on with cg_gunMomentumEnable 1. from Razish/japp@7d384bb dec1f7
from dusty’s patch
Now allows 0...80 instead of 4...80. Also made gfxinfo not display lightmap texture bits unless explicitly set to a non-zero value since when 0, the regular texture bits are used.
I’d missed a few of these when adding stuff onto latest OpenJK (and added a .write where a .read should have been causing issues…). Affects force powers, entity tints, SFX sabers, custom sabers, holsters, ignition flares, weapons and saber crystals
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
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.
So. I have this here. But I'm not sure the best way to go about doing this. At first I was thinking I should port some of the lighter features to OpenJK first and then start manually adding in the rest.
Or should we just kind of shove it all together at once pull request style on another fork or branch?