Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tales of MajEyal
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments

Snippets Groups Projects

8d43bc66

Commit 8d43bc66 authored 8 years ago by Chris Davidson

Downloads
- Plain Diff

Merge remote-tracking branch 'origin/ItemsMisc' into BulwarkAgain

parents 4f28b81a 88717d71

No related branches found

No related tags found

1 merge request!400Items misc

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

game/modules/tome/class/GameState.lua 3 additions, 3 deletions

game/modules/tome/class/GameState.lua
game/modules/tome/class/interface/Combat.lua 0 additions, 9 deletions

game/modules/tome/class/interface/Combat.lua
game/modules/tome/data/general/objects/egos/rings.lua 3 additions, 0 deletions

game/modules/tome/data/general/objects/egos/rings.lua
game/modules/tome/data/general/objects/egos/weapon.lua 19 additions, 25 deletions

game/modules/tome/data/general/objects/egos/weapon.lua
game/modules/tome/data/general/objects/random-artifacts/generic.lua 48 additions, 92 deletions

...es/tome/data/general/objects/random-artifacts/generic.lua
game/modules/tome/data/talents/techniques/battle-tactics.lua 26 additions, 17 deletions

game/modules/tome/data/talents/techniques/battle-tactics.lua
game/modules/tome/data/talents/techniques/weaponshield.lua 11 additions, 9 deletions

game/modules/tome/data/talents/techniques/weaponshield.lua
game/modules/tome/data/timed_effects/physical.lua 10 additions, 2 deletions

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

with 120 additions and 157 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