Develop #358
Merged
Develop #358
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
This fixes an issue where, when moving the camera about, the name/class shown above the NPC can be seen to move around independently. Also tidy up some code in the same function.
Added more details for Phase 2 design, updated links and contributors.
Looks like the last damage time wasn't set if the victim had shields.
Don't distinguish between damaging players and non-players since this just creates more code paths. The only extra that players need are the debuffs. Fixes #317.
16x16 works fine if players are standing still, but once they do anything (attacking, walking, running), then if is too small. So revert back to the 30x3x0.
A common case of the copy pasta gone wrong.
Seems to be because various B_Alloc calls were changed to use malloc instead.
…right yet, so adding this back in to fix weapons like rocket launcher's for now until I can switch it over to use something better
…w server xcvar 'jkg_payTime' (default 5), controls how much time a client must wait after joining a team before they can use /pay. Server admins can set jkg_payTime to 0 to disable use of /pay completely.
…ile heat value of current weapon is 50%+, needs efx/sounds still
… swap at 50%+ heat as long as you haven't overheated yet, but the swap takes longer the more heat you have. Swapping when heat is beyond the weapon's recommended threshold incurs an extra long wait time.
…at to 'flush' when you reload. Default is 50 (%), 0 disables it, 100 clears out all heat
Added heat to a couple of weapons that did not previously have it including the EE-3, Q2 Pistol, and Advanced Suppressor pistol. In the case of pistols this should help balance them out as extremely good early game rapid fire weapons. There are also increased splash ranges to some alternate firemodes such as T-21, DC-15A, and Pulse repeaters, as well as the Bryar series (except array gun). Nearly every weapon has had its first person position changed to take up less screen space, this was especially egregious at default FOV. A few weapons also have had their iron sights positions adjusted to be more accurate. This includes some much needed accuracy changes, but there will need to be a pass on all weapons, especially scoped weapons.
…rns jkg's exact game version and is now used by getinfo and getstatus. Also includes ui changes for joinserver.menu
Clarifying version information.
Change displayed effect for empstaggered jetpack
…t not first person
…s for each group/type
…of the jetpack instead of player
…ck up sources of damage from the same source within the same frame
Main .ammo file were using the wrong effect for "miss" aka wall hit efx. Incendiary Slugs unintentionally doing almost double damage Added credits for Jonthe and Pande for the EE-3 to the weapons shader file Updated the first person position for the sniper bowcaster as it looks like it got missed.
* adjusted inheritance trees of some of the blasterpack ammos * change the name of elg type ammos to be labeled 'powerpak' (to reflect pistols taking powerpak ammunition) * changed rifle_e-11 as an experiment to base other e-11 blasters on, it only takes medium and large ammunition as a result of the changes * changed incinderary rounds for slughtrowers to not be splash damage `
… current system, also a small fix for saber crystals maintaining their color instead of resetting to blue
…ges made to ammo for this patch, also adding icon for klesh armor
…g larger than the default ammo
… replies to the user that sent it if they were logged into the admin system, also fixed admsay not displaying for users not logged in
… specifying ammo types for ammunition weapons.
not listed. Also fixed a bug with admdeleteaccount (has been renamed to admremoveaccount), and now works and will properly remove accounts instead of crashing."
… commands (can now cycle backwards through), and some minor adjustments to code formating in g_active
…ds for stamina damage added, improved consumable consumptions a cooldown of 3000ms is now required between each consumable, also added missing glua functionality for stamina, replaced maxforcepower with MAX_STAMINA
…eeds more adjustments
…d ir-5 and westar to shop, sabers now show tier levels, fix for not showing headblows on corpses
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.
Merging develop into master for v1.3.23!