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

7e6e6b9a

Commit 7e6e6b9a authored 8 years ago by DarkGod

Downloads
- Plain Diff

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

parents d4df3dc6 9f9d3aa6

No related branches found

No related tags found

No related merge requests found

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

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

game/modules/tome/class/Actor.lua
game/modules/tome/data/talents/techniques/combat-training.lua 1 addition, 1 deletion

.../modules/tome/data/talents/techniques/combat-training.lua
game/modules/tome/data/talents/techniques/mobility.lua 5 additions, 4 deletions

game/modules/tome/data/talents/techniques/mobility.lua
game/modules/tome/data/talents/techniques/techniques.lua 1 addition, 1 deletion

game/modules/tome/data/talents/techniques/techniques.lua
game/modules/tome/data/talents/techniques/throwing-knives.lua 15 additions, 16 deletions

.../modules/tome/data/talents/techniques/throwing-knives.lua

with 24 additions and 25 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