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

756ceb0f

Commit 756ceb0f authored 4 years ago by Otowa Kotori

Downloads
- Plain Diff

Merge remote-tracking branch 'upstream/master' into i18n

parents c856e86c fa93a4cc

No related branches found

No related tags found

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/utils.lua 42 additions, 0 deletions

game/engines/default/engine/utils.lua
game/modules/tome/data/birth/classes/mage.lua 12 additions, 10 deletions

game/modules/tome/data/birth/classes/mage.lua
game/modules/tome/data/birth/worlds.lua 1 addition, 1 deletion

game/modules/tome/data/birth/worlds.lua
game/modules/tome/data/damage_types.lua 12 additions, 0 deletions

game/modules/tome/data/damage_types.lua
game/modules/tome/data/talents.lua 21 additions, 2 deletions

game/modules/tome/data/talents.lua
game/modules/tome/data/talents/uber/mag.lua 103 additions, 0 deletions

game/modules/tome/data/talents/uber/mag.lua
game/modules/tome/data/talents/undeads/lich.lua 514 additions, 0 deletions

game/modules/tome/data/talents/undeads/lich.lua
game/modules/tome/data/talents/undeads/undeads.lua 12 additions, 15 deletions

game/modules/tome/data/talents/undeads/undeads.lua
game/modules/tome/data/timed_effects/magical.lua 52 additions, 0 deletions

game/modules/tome/data/timed_effects/magical.lua
game/modules/tome/data/timed_effects/other.lua 22 additions, 0 deletions

game/modules/tome/data/timed_effects/other.lua
game/modules/tome/dialogs/DeathDialog.lua 3 additions, 19 deletions

game/modules/tome/dialogs/DeathDialog.lua

with 794 additions and 47 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