Merge remote-tracking branch 'origin/GenericTrees' into GenericTrees
# Conflicts: # game/modules/tome/data/timed_effects/physical.lua
Showing
- game/engines/default/engine/Entity.lua 2 additions, 3 deletionsgame/engines/default/engine/Entity.lua
- game/engines/default/engine/interface/ActorStats.lua 2 additions, 2 deletionsgame/engines/default/engine/interface/ActorStats.lua
- game/modules/tome/class/Actor.lua 4 additions, 2 deletionsgame/modules/tome/class/Actor.lua
- game/modules/tome/class/Game.lua 16 additions, 0 deletionsgame/modules/tome/class/Game.lua
- game/modules/tome/class/Object.lua 6 additions, 1 deletiongame/modules/tome/class/Object.lua
- game/modules/tome/class/interface/Combat.lua 16 additions, 10 deletionsgame/modules/tome/class/interface/Combat.lua
- game/modules/tome/data/birth/classes/wilder.lua 2 additions, 0 deletionsgame/modules/tome/data/birth/classes/wilder.lua
- game/modules/tome/data/birth/descriptors.lua 8 additions, 0 deletionsgame/modules/tome/data/birth/descriptors.lua
- game/modules/tome/data/birth/races/human.lua 5 additions, 2 deletionsgame/modules/tome/data/birth/races/human.lua
- game/modules/tome/data/damage_types.lua 4 additions, 22 deletionsgame/modules/tome/data/damage_types.lua
- game/modules/tome/data/general/npcs/ooze.lua 1 addition, 1 deletiongame/modules/tome/data/general/npcs/ooze.lua
- game/modules/tome/data/talents/celestial/light.lua 3 additions, 4 deletionsgame/modules/tome/data/talents/celestial/light.lua
- game/modules/tome/data/talents/chronomancy/chronomancer.lua 1 addition, 1 deletiongame/modules/tome/data/talents/chronomancy/chronomancer.lua
- game/modules/tome/data/talents/gifts/mindstar-mastery.lua 1 addition, 1 deletiongame/modules/tome/data/talents/gifts/mindstar-mastery.lua
- game/modules/tome/data/talents/misc/races.lua 34 additions, 28 deletionsgame/modules/tome/data/talents/misc/races.lua
- game/modules/tome/data/talents/psionic/psi-fighting.lua 18 additions, 8 deletionsgame/modules/tome/data/talents/psionic/psi-fighting.lua
- game/modules/tome/data/talents/spells/spells.lua 3 additions, 0 deletionsgame/modules/tome/data/talents/spells/spells.lua
- game/modules/tome/data/talents/uber/mag.lua 1 addition, 1 deletiongame/modules/tome/data/talents/uber/mag.lua
- game/modules/tome/data/talents/undeads/ghoul.lua 28 additions, 7 deletionsgame/modules/tome/data/talents/undeads/ghoul.lua
- game/modules/tome/data/talents/undeads/skeleton.lua 3 additions, 13 deletionsgame/modules/tome/data/talents/undeads/skeleton.lua
Loading
Please register or sign in to comment