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

ba138e59

Commit ba138e59 authored 10 years ago by Eric Wykoff

Downloads
- Plain Diff

Merge branch 'master' into chrono_talent_balance

parents 5877b716 b6db4b41

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/Actor.lua 1 addition, 1 deletion

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

game/modules/tome/class/interface/Combat.lua
game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_guard.png 0 additions, 0 deletions

...les/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_guard.png
game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_mauler.png 0 additions, 0 deletions

...es/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_mauler.png
game/modules/tome/data/gfx/shockbolt/npc/giant_ogre_ogre_warmaster.png 0 additions, 0 deletions

...tome/data/gfx/shockbolt/npc/giant_ogre_ogre_warmaster.png
game/modules/tome/data/zones/conclave-vault/npcs.lua 3 additions, 0 deletions

game/modules/tome/data/zones/conclave-vault/npcs.lua
game/modules/tome/settings.lua 65 additions, 0 deletions

game/modules/tome/settings.lua

with 70 additions and 2 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