Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

0b53fb3d

Commit 0b53fb3d authored 10 years ago by DarkGod

Downloads
- Plain Diff

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

parents 1ac1222c a28ed5da

No related branches found

No related tags found

No related merge requests found

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/Zone.lua 15 additions, 5 deletions

game/engines/default/engine/Zone.lua
game/modules/tome/class/Actor.lua 10 additions, 4 deletions

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

game/modules/tome/class/GameState.lua
game/modules/tome/class/Player.lua 2 additions, 2 deletions

game/modules/tome/class/Player.lua
game/modules/tome/data/general/objects/boss-artifacts-maj-eyal.lua 85 additions, 72 deletions

...les/tome/data/general/objects/boss-artifacts-maj-eyal.lua
game/modules/tome/data/talents/cursed/cursed-aura.lua 12 additions, 5 deletions

game/modules/tome/data/talents/cursed/cursed-aura.lua
game/modules/tome/data/talents/psionic/finer-energy-manipulations.lua 9 additions, 7 deletions

.../tome/data/talents/psionic/finer-energy-manipulations.lua
game/modules/tome/data/talents/spells/stone-alchemy.lua 4 additions, 3 deletions

game/modules/tome/data/talents/spells/stone-alchemy.lua

with 139 additions and 100 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