Compare commits
merge into: MagicBane/Server:lakebane-mobai2
MagicBane/Server:master
MagicBane/Server:guild-update
MagicBane/Server:magicbox-1.5.2.1
MagicBane/Server:mixbane
MagicBane/Server:Dev_Cmd_Fixes
MagicBane/Server:debug-guards
MagicBane/Server:lakebane-recovery
MagicBane/Server:lakebane
MagicBane/Server:lakebane-jobs
MagicBane/Server:lakebane-dungeon
MagicBane/Server:feature-config-usage
MagicBane/Server:lakebane-ai2
MagicBane/Server:lakebane-mobAI
MagicBane/Server:lakebane-new-effects
MagicBane/Server:lakebane-reset
MagicBane/Server:lakebane-ai
MagicBane/Server:lakebane-dex-penalty
MagicBane/Server:lakebane-questing
MagicBane/Server:lakebane-easy
MagicBane/Server:lakebane-mobai2
MagicBane/Server:lakebane-optimize
MagicBane/Server:lakebane2
MagicBane/Server:NovaTest
MagicBane/Server:feature-config-parsing2
MagicBane/Server:weekend-fixings
MagicBane/Server:bane-update2
MagicBane/Server:bane-updates
MagicBane/Server:bugfix-destbane
MagicBane/Server:feature-config-parsing
MagicBane/Server:bugfix-patches
MagicBane/Server:bugfix-sources
MagicBane/Server:birdbane
MagicBane/Server:postwipe-hostile
MagicBane/Server:postwipe-1.5.2
MagicBane/Server:postwipe-teleporting
MagicBane/Server:postwipe-guilds
MagicBane/Server:combat-4
MagicBane/Server:postwipe-mines
MagicBane/Server:lakebane-master
MagicBane/Server:combat-3
MagicBane/Server:combat-2
FatBoy/lakebane:bugfix-slot-update-2
FatBoy/lakebane:magicbox-1.5.2
FatBoy/lakebane:mesh-colliders
FatBoy/lakebane:server-collision
FatBoy/lakebane:hull7
FatBoy/lakebane:convex-data
FatBoy/lakebane:terrain-tweak2
FatBoy/lakebane:hull4
FatBoy/lakebane:feature-workorder
FatBoy/lakebane:feature-region-set
FatBoy/lakebane:master
FatBoy/lakebane:mobile-class-refactor
...
pull from: FatBoy/lakebane:master
FatBoy/lakebane:bugfix-slot-update-2
FatBoy/lakebane:magicbox-1.5.2
FatBoy/lakebane:mesh-colliders
FatBoy/lakebane:server-collision
FatBoy/lakebane:hull7
FatBoy/lakebane:convex-data
FatBoy/lakebane:terrain-tweak2
FatBoy/lakebane:hull4
FatBoy/lakebane:feature-workorder
FatBoy/lakebane:feature-region-set
FatBoy/lakebane:master
FatBoy/lakebane:mobile-class-refactor
MagicBane/Server:master
MagicBane/Server:guild-update
MagicBane/Server:magicbox-1.5.2.1
MagicBane/Server:mixbane
MagicBane/Server:Dev_Cmd_Fixes
MagicBane/Server:debug-guards
MagicBane/Server:lakebane-recovery
MagicBane/Server:lakebane
MagicBane/Server:lakebane-jobs
MagicBane/Server:lakebane-dungeon
MagicBane/Server:feature-config-usage
MagicBane/Server:lakebane-ai2
MagicBane/Server:lakebane-mobAI
MagicBane/Server:lakebane-new-effects
MagicBane/Server:lakebane-reset
MagicBane/Server:lakebane-ai
MagicBane/Server:lakebane-dex-penalty
MagicBane/Server:lakebane-questing
MagicBane/Server:lakebane-easy
MagicBane/Server:lakebane-mobai2
MagicBane/Server:lakebane-optimize
MagicBane/Server:lakebane2
MagicBane/Server:NovaTest
MagicBane/Server:feature-config-parsing2
MagicBane/Server:weekend-fixings
MagicBane/Server:bane-update2
MagicBane/Server:bane-updates
MagicBane/Server:bugfix-destbane
MagicBane/Server:feature-config-parsing
MagicBane/Server:bugfix-patches
MagicBane/Server:bugfix-sources
MagicBane/Server:birdbane
MagicBane/Server:postwipe-hostile
MagicBane/Server:postwipe-1.5.2
MagicBane/Server:postwipe-teleporting
MagicBane/Server:postwipe-guilds
MagicBane/Server:combat-4
MagicBane/Server:postwipe-mines
MagicBane/Server:lakebane-master
MagicBane/Server:combat-3
MagicBane/Server:combat-2
These branches are equal.