Skip to content
Snippets Groups Projects

1.6.6 misc2.21.14

Merged Chris Davidson requested to merge Shibari/t-engine4:1.6.6Misc into master

Merge request reports

Approval is optional

Merged by avatar (Mar 21, 2025 2:38pm UTC)

Merge details

  • Changes merged into master with 89ff407c.
  • Did not delete the source branch.

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • Chris Davidson Added 1 commit:

    Added 1 commit:

    • 0c032c12 - Add an ActorTalent.deactivate_on property for things that disable at various events
  • Chris Davidson Added 1 commit:

    Added 1 commit:

    • 0e323c2a - Fix
  • Chris Davidson Title changed from 1.6.6 misc3.21.14 to 1.6.6 misc2.21.14

    Title changed from 1.6.6 misc3.21.14 to 1.6.6 misc2.21.14

  • Chris Davidson Added 27 commits:

    Added 27 commits:

    • 0e323c2a...c1b55ef0 - 9 commits from branch tome:master
    • 8b8bea61 - Add a combat_precomputed_x property for all of the powers, Accuracy, and Defense…
    • 1f68f328 - Add Steampower to Actor tooltips
    • 2e82e437 - Add Actor:getCombatStats to get weapon properties for a given object
    • 4e15c4b4 - Fix weapon damage display on Actor tooltips
    • 7048830d - Clarify Gloom tooltip
    • 503bdf09 - Reveal Map in dev mode now grants omnivision for 100 turns revealing everything
    • 42399c35 - Reduce duration of Primal Infusion by 1
    • e10a3552 - Fix disturbing but meaningless comma
    • a82dc5c0 - Fix Tentacle Totem always adding to player party
    • 65b8a7eb - Feed no longer prevents entering the world map
    • 7e8626d6 - Reduce scaling on Total Thuggery
    • e4628e44 - Increase base damage on Shadow Combat
    • e97efb98 - Ranged Arcane Vortex proc scales with material level
    • 1ba02993 - Add instakill immunity to ambushes and Celia coffins
    • f6d3d1a1 - Unflinching Resolve now cleanses in a set priority order and works on disarms instead of wounds
    • 80677699 - Reduce Blink Rune cooldown
    • d865d967 - Add an ActorTalent.deactivate_on property for things that disable at various events
    • 1ce4db61 - Fix
  • Chris Davidson Added 1 commit:

    Added 1 commit:

    • f2aa69ea - Merge branch '1.6.6AI' into Misc
  • Chris Davidson Added 1 commit:

    Added 1 commit:

    • 906bff5f - Improve deactivate_on implementation
  • DarkGod mentioned in commit 89ff407c

    mentioned in commit 89ff407c

  • DarkGod Status changed to merged

    Status changed to merged

Please register or sign in to reply
Loading