Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

c2e48973

Commit c2e48973 authored 9 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'master' of git.net-core.org:tome/t-engine4

parents 16eba17c 8d54661b

No related branches found

No related tags found

No related merge requests found

Changes 3

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/generator/map/Forest.lua 51 additions, 35 deletions

game/engines/default/engine/generator/map/Forest.lua
game/engines/default/engine/generator/map/RoomsLoader.lua 18 additions, 4 deletions

game/engines/default/engine/generator/map/RoomsLoader.lua
game/modules/tome/data/talents/chronomancy/chronomancer.lua 1 addition, 2 deletions

game/modules/tome/data/talents/chronomancy/chronomancer.lua

with 70 additions and 41 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