Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

7a2abd1e

Commit 7a2abd1e authored 10 years ago by TomeDev

Downloads
- Plain Diff

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

parents 8bd177d6 2d6752b5

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/modules/boot/dialogs/Credits.lua 1 addition, 1 deletion

game/engines/default/modules/boot/dialogs/Credits.lua
game/modules/tome/class/Game.lua 43 additions, 14 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/chats/tannen.lua 8 additions, 1 deletion

game/modules/tome/data/chats/tannen.lua
game/modules/tome/data/zones/slime-tunnels/grids.lua 2 additions, 1 deletion

game/modules/tome/data/zones/slime-tunnels/grids.lua
game/modules/tome/dialogs/GameOptions.lua 30 additions, 0 deletions

game/modules/tome/dialogs/GameOptions.lua

with 85 additions and 18 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