Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

T

t-engine4
- Activity
- Members
- Labels
- Releases
- Model registry
- Environments

Snippets Groups Projects

bb7c4223

Commit bb7c4223 authored 7 years ago by Hachem_Muche

Downloads
- Plain Diff

Merge branch 'master' into MoreMummies

parents 1bd08b5b 210c47eb

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/engine/Zone.lua 8 additions, 4 deletions

game/engines/default/engine/Zone.lua
game/modules/tome/class/Actor.lua 1 addition, 0 deletions

game/modules/tome/class/Actor.lua
game/modules/tome/class/GameState.lua 1 addition, 1 deletion

game/modules/tome/class/GameState.lua
game/modules/tome/data/zones/infinite-dungeon/zone.lua 2 additions, 1 deletion

game/modules/tome/data/zones/infinite-dungeon/zone.lua
game/modules/tome/dialogs/debug/DebugMain.lua 1 addition, 1 deletion

game/modules/tome/dialogs/debug/DebugMain.lua
game/modules/tome/resolvers.lua 3 additions, 0 deletions

game/modules/tome/resolvers.lua

with 16 additions and 7 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