Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

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

Snippets Groups Projects

5d84cd59

Commit 5d84cd59 authored 10 years ago by Eric Wykoff

Downloads
- Plain Diff

Merge branch 'master' into chrono_talent_balance

parents 7797f87f 8fc3bdab

No related branches found

No related tags found

1 merge request!107Chrono talent balance

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/Module.lua 2 additions, 0 deletions

game/engines/default/engine/Module.lua
game/engines/default/modules/boot/dialogs/MainMenu.lua 17 additions, 0 deletions

game/engines/default/modules/boot/dialogs/MainMenu.lua
game/modules/tome/dialogs/GameOptions.lua 78 additions, 66 deletions

game/modules/tome/dialogs/GameOptions.lua
game/modules/tome/dialogs/GraphicMode.lua 12 additions, 1 deletion

game/modules/tome/dialogs/GraphicMode.lua
game/modules/tome/load.lua 3 additions, 40 deletions

game/modules/tome/load.lua

with 112 additions and 107 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