Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

e600360d

Commit e600360d authored 8 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'master' of git.net-core.org:tome/t-engine4

parents ced9fe7e fbb29f54

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

game/modules/tome/class/Object.lua 2 additions, 1 deletion

game/modules/tome/class/Object.lua
game/modules/tome/class/interface/Archery.lua 1 addition, 1 deletion

game/modules/tome/class/interface/Archery.lua
game/modules/tome/class/interface/Combat.lua 1 addition, 0 deletions

game/modules/tome/class/interface/Combat.lua
game/modules/tome/class/uiset/Minimalist.lua 1 addition, 1 deletion

game/modules/tome/class/uiset/Minimalist.lua
game/modules/tome/data/talents/cunning/traps.lua 1 addition, 1 deletion

game/modules/tome/data/talents/cunning/traps.lua
game/modules/tome/data/talents/techniques/throwing-knives.lua 6 additions, 7 deletions

.../modules/tome/data/talents/techniques/throwing-knives.lua
game/modules/tome/dialogs/CharacterSheet.lua 9 additions, 1 deletion

game/modules/tome/dialogs/CharacterSheet.lua

with 21 additions and 12 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