Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] fix: Cleans up spell system & fixes bugs #831

Draft
wants to merge 33 commits into
base: main
Choose a base branch
from
Draft

[WIP] fix: Cleans up spell system & fixes bugs #831

wants to merge 33 commits into from

Commits on Oct 16, 2021

  1. WIP

    @kamronbatman
    kamronbatman committed Oct 16, 2021
    Configuration menu
    Copy the full SHA
    15ee854 View commit details
    Browse the repository at this point in the history

Commits on Oct 17, 2021

  1. WIP

    @kamronbatman
    kamronbatman committed Oct 17, 2021
    Configuration menu
    Copy the full SHA
    a9dae7e View commit details
    Browse the repository at this point in the history

Commits on Oct 18, 2021

  1. More spell cleanup

    @kamronbatman
    kamronbatman committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    5f16fb2 View commit details
    Browse the repository at this point in the history

  2. Cleans up comments

    @kamronbatman
    kamronbatman committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    846fa14 View commit details
    Browse the repository at this point in the history

  3. Changes to UOML

    @kamronbatman
    kamronbatman committed Oct 18, 2021
    Configuration menu
    Copy the full SHA
    c644244 View commit details
    Browse the repository at this point in the history

Commits on Oct 24, 2021

  1. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed Oct 24, 2021
    Configuration menu
    Copy the full SHA
    4235645 View commit details
    Browse the repository at this point in the history

  2. Fixes spell plague. Cleans up other code

    @kamronbatman
    kamronbatman committed Oct 24, 2021
    Configuration menu
    Copy the full SHA
    a905063 View commit details
    Browse the repository at this point in the history

  3. Converts to using pooled ref queue

    @kamronbatman
    kamronbatman committed Oct 24, 2021
    Configuration menu
    Copy the full SHA
    d72732c View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2021

  1. Adds cleansing winds. Fixes mindrot

    @kamronbatman
    kamronbatman committed Oct 28, 2021
    Configuration menu
    Copy the full SHA
    95254a3 View commit details
    Browse the repository at this point in the history

Commits on Oct 29, 2021

  1. Adds sleep spell

    @kamronbatman
    kamronbatman committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    f20323d View commit details
    Browse the repository at this point in the history

  2. Cleanup

    @kamronbatman
    kamronbatman committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    4ed6973 View commit details
    Browse the repository at this point in the history

  3. Adds mass sleep spell

    @kamronbatman
    kamronbatman committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    3d78442 View commit details
    Browse the repository at this point in the history

  4. Cleanup

    @kamronbatman
    kamronbatman committed Oct 29, 2021
    Configuration menu
    Copy the full SHA
    bef8ae3 View commit details
    Browse the repository at this point in the history

Commits on Nov 1, 2021

  1. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed Nov 1, 2021
    Configuration menu
    Copy the full SHA
    0b71e6e View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2021

  1. WIP

    @kamronbatman
    kamronbatman committed Nov 7, 2021
    Configuration menu
    Copy the full SHA
    53d3c33 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2021

  1. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed Nov 12, 2021
    Configuration menu
    Copy the full SHA
    223af1b View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2021

  1. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed Nov 14, 2021
    Configuration menu
    Copy the full SHA
    f39dcbc View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2021

  1. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    74243f6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    bf64b9e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed Nov 15, 2021
    Configuration menu
    Copy the full SHA
    e07f8d0 View commit details
    Browse the repository at this point in the history

Commits on Dec 1, 2021

  1. Merge branch 'main' into kbatman/cleanup_ninjas 

    # Conflicts:
#	Projects/UOContent/Items/Weapons/BaseWeapon.cs
#	Projects/UOContent/Spells/Base/Spell.cs
#	Projects/UOContent/Spells/Second/RemoveTrap.cs
#	Projects/UOContent/Spells/Seventh/ChainLightning.cs
#	Projects/UOContent/Spells/Seventh/MeteorSwarm.cs
#	Projects/UOContent/Spells/Targeting/SpellTargetMobile.cs
    @kamronbatman
    kamronbatman committed Dec 1, 2021
    Configuration menu
    Copy the full SHA
    9352ae7 View commit details
    Browse the repository at this point in the history

Commits on Dec 3, 2021

  1. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed Dec 3, 2021
    Configuration menu
    Copy the full SHA
    25cc77b View commit details
    Browse the repository at this point in the history

Commits on Dec 24, 2021

  1. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed Dec 24, 2021
    Configuration menu
    Copy the full SHA
    389cdd7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed Dec 24, 2021
    Configuration menu
    Copy the full SHA
    6e5b656 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed Dec 24, 2021
    Configuration menu
    Copy the full SHA
    b64d9ee View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2022

  1. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed Jan 11, 2022
    Configuration menu
    Copy the full SHA
    10a0025 View commit details
    Browse the repository at this point in the history

Commits on May 10, 2022

  1. Merge branch 'main' into kbatman/cleanup_ninjas

    @kamronbatman
    kamronbatman committed May 10, 2022
    Configuration menu
    Copy the full SHA
    c311540 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2022

  1. Merge branch 'main' into kbatman/cleanup_ninjas 

    # Conflicts:
#	Projects/Server/Mobiles/Mobile.cs
#	Projects/UOContent/Engines/Treasures of Tokuno/TreasuresOfTokuno.cs
#	Projects/UOContent/Items/Talismans/BaseTalisman.cs
#	Projects/UOContent/Items/Weapons/Abilities/MortalStrike.cs
#	Projects/UOContent/Mobiles/PlayerMobile.cs
#	Projects/UOContent/Spells/Base/MagerySpell.cs
#	Projects/UOContent/Spells/Bushido/SamuraiSpell.cs
#	Projects/UOContent/Spells/Chivalry/NobleSacrifice.cs
#	Projects/UOContent/Spells/Mysticism/SpellPlagueSpell.cs
#	Projects/UOContent/Spells/Necromancy/BloodOathSpell.cs
#	Projects/UOContent/Spells/Necromancy/CorpseSkin.cs
#	Projects/UOContent/Spells/Necromancy/CurseWeapon.cs
#	Projects/UOContent/Spells/Necromancy/MindRot.cs
#	Projects/UOContent/Spells/Necromancy/NecromancerSpell.cs
#	Projects/UOContent/Spells/Necromancy/Wither.cs
#	Projects/UOContent/Spells/Ninjitsu/AnimalForm.cs
#	Projects/UOContent/Spells/Ninjitsu/DeathStrike.cs
#	Projects/UOContent/Spells/Ninjitsu/KiAttack.cs
#	Projects/UOContent/Spells/Ninjitsu/MirrorImage.cs
#	Projects/UOContent/Spells/Ninjitsu/NinjaSpell.cs
#	Projects/UOContent/Spells/Ninjitsu/SurpriseAttack.cs
#	Projects/UOContent/Spells/Spellweaving/ArcaneCircle.cs
#	Projects/UOContent/Spells/Spellweaving/GiftOfRenewal.cs
    @kamronbatman
    kamronbatman committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    724c8f8 View commit details
    Browse the repository at this point in the history

  2. Cleanup

    @kamronbatman
    kamronbatman committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    44272da View commit details
    Browse the repository at this point in the history

  3. Merge branch 'main' into kbatman/cleanup_ninjas 

    # Conflicts:
#	Projects/UOContent/Spells/Necromancy/EvilOmen.cs
    @kamronbatman
    kamronbatman committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    4d95f56 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'main' into kbatman/cleanup_ninjas 

    # Conflicts:
#	Projects/UOContent/Spells/Mysticism/HailStormSpell.cs
#	Projects/UOContent/Spells/Mysticism/MysticSpell.cs
#	Projects/UOContent/Spells/Mysticism/NetherCycloneSpell.cs
#	Projects/UOContent/Spells/Mysticism/SpellPlagueSpell.cs
    @kamronbatman
    kamronbatman committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    d68451d View commit details
    Browse the repository at this point in the history

  5. Merge branch 'main' into kbatman/cleanup_ninjas 

    # Conflicts:
#	Projects/UOContent/Spells/Initializer.cs
#	Projects/UOContent/Spells/Mysticism/BombardSpell.cs
#	Projects/UOContent/Spells/Mysticism/EagleStrikeSpell.cs
#	Projects/UOContent/Spells/Mysticism/HailStormSpell.cs
#	Projects/UOContent/Spells/Mysticism/NetherCycloneSpell.cs
    @kamronbatman
    kamronbatman committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    c7b6a43 View commit details
    Browse the repository at this point in the history

  6. Merge branch 'main' into kbatman/cleanup_ninjas 

    # Conflicts:
#	Projects/UOContent/Spells/Initializer.cs
#	Projects/UOContent/Spells/Mysticism/CleansingWindsSpell.cs
    @kamronbatman
    kamronbatman committed Jul 17, 2022
    Configuration menu
    Copy the full SHA
    28f0b21 View commit details
    Browse the repository at this point in the history