Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c16f541b

Commit c16f541b authored 10 years ago by DarkGod

Downloads
- Plain Diff

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

parents d3561983 269e309d

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/Game.lua 1 addition, 1 deletion

game/engines/default/engine/Game.lua
game/modules/tome/class/Actor.lua 3 additions, 0 deletions

game/modules/tome/class/Actor.lua
game/modules/tome/data/talents/celestial/sun.lua 5 additions, 3 deletions

game/modules/tome/data/talents/celestial/sun.lua
game/modules/tome/data/timed_effects/magical.lua 2 additions, 2 deletions

game/modules/tome/data/timed_effects/magical.lua
game/modules/tome/data/zones/mark-spellblaze/objects.lua 4 additions, 4 deletions

game/modules/tome/data/zones/mark-spellblaze/objects.lua
game/modules/tome/data/zones/sandworm-lair/objects.lua 5 additions, 5 deletions

game/modules/tome/data/zones/sandworm-lair/objects.lua

with 20 additions and 15 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