Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

12d152f3

Commit 12d152f3 authored 10 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'catch_a_breath' into 'master'

Catch a breath

Two old oddities fixed here.

parents 187ad394 c460e760

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

game/modules/tome/class/Actor.lua 10 additions, 8 deletions

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

game/modules/tome/class/Player.lua
game/modules/tome/data/timed_effects/other.lua 1 addition, 1 deletion

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

with 12 additions and 10 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