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

ce666d40

Commit ce666d40 authored 10 years ago by Hachem_Muche

Downloads
- Plain Diff

Merge branch 'master' into ItemStackingLimits

parents 8b591957 46dd1e86

No related branches found

No related tags found

Loading

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

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

game/modules/tome/class/Actor.lua
game/modules/tome/class/interface/Combat.lua 4 additions, 0 deletions

game/modules/tome/class/interface/Combat.lua
game/modules/tome/data/birth/races/dwarf.lua 2 additions, 2 deletions

game/modules/tome/data/birth/races/dwarf.lua
game/modules/tome/data/gfx/particles_images/bone_shield.png 0 additions, 0 deletions

game/modules/tome/data/gfx/particles_images/bone_shield.png
game/modules/tome/dialogs/Birther.lua 8 additions, 1 deletion

game/modules/tome/dialogs/Birther.lua
game/modules/tome/dialogs/CharacterSheet.lua 153 additions, 57 deletions

game/modules/tome/dialogs/CharacterSheet.lua

with 171 additions and 62 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