Merge branch 'master' into warden_balance
Showing
- game/engines/default/engine/UserChat.lua 1 addition, 1 deletiongame/engines/default/engine/UserChat.lua
- game/engines/default/engine/class.lua 6 additions, 0 deletionsgame/engines/default/engine/class.lua
- game/engines/default/engine/generator/map/Static.lua 220 additions, 17 deletionsgame/engines/default/engine/generator/map/Static.lua
- game/engines/default/engine/ui/Gestures.lua 28 additions, 1 deletiongame/engines/default/engine/ui/Gestures.lua
- game/modules/tome/class/Actor.lua 6 additions, 2 deletionsgame/modules/tome/class/Actor.lua
- game/modules/tome/class/Game.lua 3 additions, 1 deletiongame/modules/tome/class/Game.lua
- game/modules/tome/data/maps/towns/angolwen.lua 0 additions, 93 deletionsgame/modules/tome/data/maps/towns/angolwen.lua
- game/modules/tome/data/maps/towns/angolwen.tmx 109 additions, 0 deletionsgame/modules/tome/data/maps/towns/angolwen.tmx
- game/modules/tome/data/talents/spells/golemancy.lua 1 addition, 0 deletionsgame/modules/tome/data/talents/spells/golemancy.lua
- game/modules/tome/data/zones/conclave-vault/npcs.lua 3 additions, 3 deletionsgame/modules/tome/data/zones/conclave-vault/npcs.lua
- game/modules/tome/data/zones/town-elvala/npcs.lua 1 addition, 1 deletiongame/modules/tome/data/zones/town-elvala/npcs.lua
- game/modules/tome/dialogs/CharacterSheet.lua 9 additions, 8 deletionsgame/modules/tome/dialogs/CharacterSheet.lua
- game/modules/tome/dialogs/GameOptions.lua 9 additions, 0 deletionsgame/modules/tome/dialogs/GameOptions.lua
- game/modules/tome/dialogs/ShowChatLog.lua 7 additions, 7 deletionsgame/modules/tome/dialogs/ShowChatLog.lua
- game/thirdparty/jit/bcname.lua 23 additions, 0 deletionsgame/thirdparty/jit/bcname.lua
- game/thirdparty/jit/vmdef.lua 331 additions, 0 deletionsgame/thirdparty/jit/vmdef.lua
- game/thirdparty/lxp/lom.lua 83 additions, 37 deletionsgame/thirdparty/lxp/lom.lua
Loading
Please register or sign in to comment