Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Tales of MajEyal
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Releases
- Model registry
- Environments
- Incidents

Snippets Groups Projects

ed1fd9b4

Commit ed1fd9b4 authored 10 years ago by DarkGod

Downloads
- Plain Diff

Merge branch 'classic_ui_merge' into 'master'

Classic UI merge

Catch!

parents fd4fca5c c4b8f54e

No related branches found

No related tags found

Loading

Changes 5

Hide whitespace changes

Inline Side-by-side

Showing

game/engines/default/engine/HotkeysIconsDisplay.lua 27 additions, 20 deletions

game/engines/default/engine/HotkeysIconsDisplay.lua
game/modules/tome/class/Game.lua 2 additions, 1 deletion

game/modules/tome/class/Game.lua
game/modules/tome/class/uiset/Classic.lua 24 additions, 13 deletions

game/modules/tome/class/uiset/Classic.lua
game/modules/tome/class/uiset/ClassicPlayerDisplay.lua 0 additions, 0 deletions

game/modules/tome/class/uiset/ClassicPlayerDisplay.lua
game/modules/tome/class/uiset/Minimalist.lua 8 additions, 5 deletions

game/modules/tome/class/uiset/Minimalist.lua

with 61 additions and 39 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