Merge branch 'master' into chrono_talent_balance
No related branches found
No related tags found
Showing
- game/engines/default/data/gfx/background/cards/aeryn.png 0 additions, 0 deletionsgame/engines/default/data/gfx/background/cards/aeryn.png
- game/engines/default/data/gfx/background/cards/derth.png 0 additions, 0 deletionsgame/engines/default/data/gfx/background/cards/derth.png
- game/engines/default/data/gfx/background/cards/fortress.png 0 additions, 0 deletionsgame/engines/default/data/gfx/background/cards/fortress.png
- game/engines/default/data/gfx/background/cards/garkul.png 0 additions, 0 deletionsgame/engines/default/data/gfx/background/cards/garkul.png
- game/engines/default/data/gfx/background/cards/linaniil.png 0 additions, 0 deletionsgame/engines/default/data/gfx/background/cards/linaniil.png
- game/engines/default/data/gfx/background/cards/master.png 0 additions, 0 deletionsgame/engines/default/data/gfx/background/cards/master.png
- game/engines/default/data/gfx/background/cards/myssil.png 0 additions, 0 deletionsgame/engines/default/data/gfx/background/cards/myssil.png
- game/engines/default/data/gfx/background/cards/urkis.png 0 additions, 0 deletionsgame/engines/default/data/gfx/background/cards/urkis.png
- game/engines/default/engine/LogDisplay.lua 1 addition, 1 deletiongame/engines/default/engine/LogDisplay.lua
- game/engines/default/engine/Module.lua 7 additions, 2 deletionsgame/engines/default/engine/Module.lua
- game/engines/default/engine/UserChat.lua 1 addition, 1 deletiongame/engines/default/engine/UserChat.lua
- game/engines/default/engine/dialogs/UserInfo.lua 2 additions, 2 deletionsgame/engines/default/engine/dialogs/UserInfo.lua
- game/engines/default/engine/ui/Slider.lua 2 additions, 2 deletionsgame/engines/default/engine/ui/Slider.lua
- game/engines/default/engine/utils.lua 80 additions, 182 deletionsgame/engines/default/engine/utils.lua
- game/engines/default/modules/boot/class/Game.lua 13 additions, 10 deletionsgame/engines/default/modules/boot/class/Game.lua
- game/engines/default/modules/boot/dialogs/MainMenu.lua 5 additions, 5 deletionsgame/engines/default/modules/boot/dialogs/MainMenu.lua
- game/engines/default/modules/boot/init.lua 9 additions, 0 deletionsgame/engines/default/modules/boot/init.lua
- game/modules/tome/class/Game.lua 12 additions, 0 deletionsgame/modules/tome/class/Game.lua
- game/modules/tome/class/Player.lua 1 addition, 1 deletiongame/modules/tome/class/Player.lua
- game/modules/tome/data/achievements/lore.lua 4 additions, 1 deletiongame/modules/tome/data/achievements/lore.lua
Loading
Please register or sign in to comment