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

Merge conflict fix #1859

Merged
merged 8 commits into from
Nov 14, 2023
Merged

Merge conflict fix #1859

merged 8 commits into from
Nov 14, 2023

Commits on Oct 27, 2023

  1. Fixed hyphenation & backstabs 

    * Fixed hyphenation of database items linked by %{...|...} inclusions.
* Fixed Rogue backstab to-hit adjustment.
    @DameryDad
    DameryDad committed Oct 27, 2023
    Configuration menu
    Copy the full SHA
    8745343 View commit details
    Browse the repository at this point in the history

Commits on Nov 5, 2023

  1. DB fixes & case mismatch fix 

    * Fixed Staff of Frost.
* A number of database fixes.
* Fixed case match error on SpellsPerLevel table.
    @DameryDad
    DameryDad committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    09da923 View commit details
    Browse the repository at this point in the history

  2. Fix doParse() case error

    @DameryDad
    DameryDad committed Nov 5, 2023
    Configuration menu
    Copy the full SHA
    9ef2041 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2023

  1. Corrected overwrite of v1.5.03

    @DameryDad
    DameryDad committed Nov 7, 2023
    Configuration menu
    Copy the full SHA
    0a55391 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2023

  1. Merge branch 'RPGMlibrary' of https://github.com/DameryDad/roll20-api… 

    …-scripts into RPGMlibrary
    @DameryDad
    DameryDad committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    66c95d0 View commit details
    Browse the repository at this point in the history

  2. Refresh earlier fix of SpellsPerLevel case mismatch

    @DameryDad
    DameryDad committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    e8fe2e6 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2023

  1. Total_level removed

    @DameryDad
    DameryDad committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    232853d View commit details
    Browse the repository at this point in the history

  2. Corrected declaration error in characterLevel()

    @DameryDad
    DameryDad committed Nov 12, 2023
    Configuration menu
    Copy the full SHA
    69f8120 View commit details
    Browse the repository at this point in the history