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

fd28d7d5

Commit fd28d7d5 authored 11 years ago by DarkGod

Downloads
- Plain Diff

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

parents f8d1b377 8e3fba36

No related branches found

No related tags found

No related merge requests found

Changes 7

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/interface/ActorAI.lua 26 additions, 22 deletions

game/engines/default/engine/interface/ActorAI.lua
game/modules/tome/class/GameState.lua 30 additions, 1 deletion

game/modules/tome/class/GameState.lua
game/modules/tome/class/NPC.lua 18 additions, 4 deletions

game/modules/tome/class/NPC.lua
game/modules/tome/class/Player.lua 8 additions, 0 deletions

game/modules/tome/class/Player.lua
game/modules/tome/data/talents/cunning/traps.lua 1 addition, 0 deletions

game/modules/tome/data/talents/cunning/traps.lua
game/modules/tome/data/talents/misc/races.lua 1 addition, 1 deletion

game/modules/tome/data/talents/misc/races.lua
game/modules/tome/data/talents/spells/aether.lua 1 addition, 0 deletions

game/modules/tome/data/talents/spells/aether.lua

with 85 additions and 28 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