Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tales of MajEyal
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

d1d76258

Commit d1d76258 authored 5 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'mark-prey-fix' into 'master'

fix mark prey bloat

fix not extensively tested

See merge request !578

parents 3dc5f7b0 b0f5aaea

No related branches found

No related tags found

Loading

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

game/modules/tome/class/Player.lua 3 additions, 2 deletions

game/modules/tome/class/Player.lua
game/modules/tome/data/damage_types.lua 4 additions, 5 deletions

game/modules/tome/data/damage_types.lua
game/modules/tome/data/talents/cursed/predator.lua 29 additions, 18 deletions

game/modules/tome/data/talents/cursed/predator.lua
game/modules/tome/data/timed_effects/other.lua 11 additions, 11 deletions

game/modules/tome/data/timed_effects/other.lua

with 47 additions and 36 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment