Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

4c11b4c5

Commit 4c11b4c5 authored 6 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'runes_2.0' into 'master'

Runes 2.0

Second try for the new runes and Aeryn

See merge request !514

parents aede5021 2c13e13b

No related branches found

No related tags found

Loading

Checking pipeline status

Changes 7
Pipelines 1

Hide whitespace changes

Inline Side-by-side

Showing

game/modules/tome/data/general/objects/brotherhood-artifacts.lua 1 addition, 1 deletion

...dules/tome/data/general/objects/brotherhood-artifacts.lua
game/modules/tome/data/general/objects/world-artifacts.lua 2 additions, 0 deletions

game/modules/tome/data/general/objects/world-artifacts.lua
game/modules/tome/data/gfx/shockbolt/npc/humanoid_human_fallen_sun_paladin_aeryn.png 0 additions, 0 deletions

...shockbolt/npc/humanoid_human_fallen_sun_paladin_aeryn.png
game/modules/tome/data/gfx/shockbolt/object/artifact/mirror_image_rune.png 0 additions, 0 deletions

.../data/gfx/shockbolt/object/artifact/mirror_image_rune.png
game/modules/tome/data/gfx/shockbolt/object/artifact/prismatic_rune.png 0 additions, 0 deletions

...ome/data/gfx/shockbolt/object/artifact/prismatic_rune.png
game/modules/tome/data/gfx/shockbolt/object/artifact/rune_of_dissipation.png 0 additions, 0 deletions

...ata/gfx/shockbolt/object/artifact/rune_of_dissipation.png
game/modules/tome/data/zones/town-angolwen/objects.lua 1 addition, 0 deletions

game/modules/tome/data/zones/town-angolwen/objects.lua

with 4 additions and 1 deletion

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