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

8ec9311f

Commit 8ec9311f authored 8 years ago by Hachem_Muche

Downloads
- Plain Diff

Merge branch 'master' into MiscScalingUpdates

parents 63ee586c 911bc18d

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

game/modules/tome/class/Actor.lua 23 additions, 20 deletions

game/modules/tome/class/Actor.lua
game/modules/tome/class/Game.lua 4 additions, 4 deletions

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

game/modules/tome/class/Player.lua
game/modules/tome/data/birth/descriptors.lua 4 additions, 4 deletions

game/modules/tome/data/birth/descriptors.lua
game/modules/tome/data/general/npcs/horror.lua 18 additions, 16 deletions

game/modules/tome/data/general/npcs/horror.lua
game/modules/tome/data/general/npcs/xorn.lua 18 additions, 16 deletions

game/modules/tome/data/general/npcs/xorn.lua

with 68 additions and 61 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