Merge branch 'master' into MajorEventsUpdate
Showing
- game/engines/default/engine/Actor.lua 26 additions, 0 deletionsgame/engines/default/engine/Actor.lua
- game/engines/default/engine/Birther.lua 4 additions, 3 deletionsgame/engines/default/engine/Birther.lua
- game/engines/default/engine/DebugConsole.lua 12 additions, 4 deletionsgame/engines/default/engine/DebugConsole.lua
- game/engines/default/engine/Entity.lua 24 additions, 10 deletionsgame/engines/default/engine/Entity.lua
- game/engines/default/engine/Module.lua 22 additions, 19 deletionsgame/engines/default/engine/Module.lua
- game/engines/default/engine/PlayerProfile.lua 86 additions, 5 deletionsgame/engines/default/engine/PlayerProfile.lua
- game/engines/default/engine/Savefile.lua 10 additions, 5 deletionsgame/engines/default/engine/Savefile.lua
- game/engines/default/engine/Zone.lua 81 additions, 33 deletionsgame/engines/default/engine/Zone.lua
- game/engines/default/engine/class.lua 4 additions, 4 deletionsgame/engines/default/engine/class.lua
- game/engines/default/engine/dialogs/ChatFilter.lua 1 addition, 0 deletionsgame/engines/default/engine/dialogs/ChatFilter.lua
- game/engines/default/engine/generator/map/Roomer.lua 0 additions, 1 deletiongame/engines/default/engine/generator/map/Roomer.lua
- game/engines/default/engine/interface/ActorInventory.lua 10 additions, 8 deletionsgame/engines/default/engine/interface/ActorInventory.lua
- game/engines/default/engine/interface/ActorResource.lua 2 additions, 1 deletiongame/engines/default/engine/interface/ActorResource.lua
- game/engines/default/engine/interface/ActorTalents.lua 3 additions, 0 deletionsgame/engines/default/engine/interface/ActorTalents.lua
- game/engines/default/engine/resolvers.lua 8 additions, 0 deletionsgame/engines/default/engine/resolvers.lua
- game/engines/default/engine/ui/Dialog.lua 12 additions, 4 deletionsgame/engines/default/engine/ui/Dialog.lua
- game/engines/default/engine/ui/Textbox.lua 18 additions, 8 deletionsgame/engines/default/engine/ui/Textbox.lua
- game/engines/default/engine/utils.lua 92 additions, 6 deletionsgame/engines/default/engine/utils.lua
- game/engines/default/modules/boot/dialogs/ProfileLogin.lua 1 addition, 1 deletiongame/engines/default/modules/boot/dialogs/ProfileLogin.lua
- game/modules/tome/class/Actor.lua 181 additions, 50 deletionsgame/modules/tome/class/Actor.lua
Loading
Please register or sign in to comment