Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

a9de20f2

Commit a9de20f2 authored 10 years ago by Hachem_Muche

Downloads
- Plain Diff

Merge branch 'master' into ItemStackingLimits

parents 740867f7 5603cb21

No related branches found

No related tags found

1 merge request!25Item stacking limits

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/Module.lua 21 additions, 6 deletions

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

game/engines/default/engine/utils.lua
game/modules/tome/class/Object.lua 3 additions, 1 deletion

game/modules/tome/class/Object.lua
game/modules/tome/class/interface/Combat.lua 66 additions, 39 deletions

game/modules/tome/class/interface/Combat.lua

with 104 additions and 46 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