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

dd6631f9

Commit dd6631f9 authored 10 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'tablesample' into 'master'

tableSample

(Based on another MR, sorry) added tableSampleIterator and stuff in Actor.lua now actually uses a bit of both.

parents 4bb05d4e 6b0a76da

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

game/loader/pre-init.lua 27 additions, 0 deletions

game/loader/pre-init.lua
game/modules/tome/class/Actor.lua 7 additions, 68 deletions

game/modules/tome/class/Actor.lua
game/modules/tome/data/talents/cursed/force-of-will.lua 91 additions, 125 deletions

game/modules/tome/data/talents/cursed/force-of-will.lua
game/modules/tome/data/timed_effects/mental.lua 45 additions, 0 deletions

game/modules/tome/data/timed_effects/mental.lua

with 170 additions and 193 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