Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c0d63462

There was a problem fetching the pipeline summary.

Commit c0d63462 authored 5 years ago by DarkGod

Downloads
- Plain Diff

Merge branch '1.6.1Misc' into 'master'

1.6.1 misc



See merge request !579

parents 0c30a6c4 c4317f51

No related branches found

No related tags found

Loading

Pipeline #

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

game/modules/tome/class/generator/actor/OnSpots.lua 5 additions, 1 deletion

game/modules/tome/class/generator/actor/OnSpots.lua
game/modules/tome/data/general/objects/egos/ammo.lua 2 additions, 2 deletions

game/modules/tome/data/general/objects/egos/ammo.lua
game/modules/tome/data/general/objects/egos/mindstars.lua 2 additions, 2 deletions

game/modules/tome/data/general/objects/egos/mindstars.lua
game/modules/tome/data/general/objects/egos/robe.lua 1 addition, 1 deletion

game/modules/tome/data/general/objects/egos/robe.lua
game/modules/tome/data/general/objects/egos/weapon.lua 1 addition, 1 deletion

game/modules/tome/data/general/objects/egos/weapon.lua
game/modules/tome/data/zones/gorbat-pride/npcs.lua 0 additions, 1 deletion

game/modules/tome/data/zones/gorbat-pride/npcs.lua
game/modules/tome/data/zones/vor-pride/npcs.lua 0 additions, 1 deletion

game/modules/tome/data/zones/vor-pride/npcs.lua

with 11 additions and 9 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