Repository navigation
Merge conflicts - #1
Open
greatguys1 wants to merge 436 commits into
Open
greatguys1 wants to merge 436 commits into
greatguys1 wants to merge 436 commits into
Conversation
- Fixes a few issues - Makes dialogue easier to access for foutpost knight
This reverts commit 7c06f93.
- New players now receive an assortment of packs to put away their starter loot.
Not that itll spawn because the flesheater is still broken
- Fix votemap to those places via nps not properly showing up.
- Organized world script into a folder - Many obsolete or non-useful devcmds removed - Removed lesser dev mode - renamed and revised some dev commands
- Force cages and whatnot no longer stop the player from being flung around. - Should also help fix #209
Different then first commit. Added steam hiss sound to each reload.
Steam Crossbow ammo selector fixed Forsuth chests trigger moved to his goodbye sequence
…into MSR-Scripts
Chest was only awarding fireball, no other spells
Made the sxbow look smoother on final reload. Had a partial reload near full reload.
…into MSR-Scripts
-Script part of the submodel commit -Bandit Mage fix, would get into a buff ice shield loop sometimes and just stand there.. MENACINGLY!
SUSPEND AI MADE FALCO A DEV(temporarily)
Fixed Envenom Plate so it gives XP to Affliction Sylphiel Soup can now be acquired through turning in ingredients(1 Strong HP Pot, 1 Mana Pot, 1 Mead, 3 Apples +200g)! Sylphiel still sells soup to players who have completed the m2_quest chain however many times they have done it through her inventory.
…into MSR-Scripts
- Armor invisible bug re-visit. Hopefully fixed - Testing needed. Report to Dravus - Hoarfrost Ice Lance dot should now reward only swordsmanship experience. - Idle animation stutter on most weapons fixed, no more shaky hands! - Steam Crossbow ammo selection SHOULD keep whatever weapon ammo you've chosen on map changes/death/server changes. - Cast animations for Healing Wave and Lightning Disc have been synced up with their effects. - Ice Staff Frostbolt(Charge 1) should no longer have a weird obsession with other players. - Ice Staff Frostbolt(Charge 1) homing should no longer be able to turn on a dime like it's drifting in the Fast and Furious. - Fixed a few spell effects not rendering correctly or being "see through" when casting towards a model or sprite.(litdisc, frostbolt, icelance) Report more to Dravus - Dark Staff laser fixes. You shouldn't be able to visually control other player's lasers. That's not nice. Also report to Dravus if this looks off(again).
- Made the worm's HP update. Finally. - Removed worm hit chance mechanic. - Increased worms HP to 18,000. - Any issues, report to Dravus
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
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.
No description provided.