Merge remote-tracking branch 'upstream/live' into live
Showing
- conf/default/version.conf 2 additions, 2 deletionsconf/default/version.conf
- scripts/globals/casket_loot.lua 5 additions, 2 deletionsscripts/globals/casket_loot.lua
- scripts/globals/spells/trust/excenmille.lua 1 addition, 3 deletionsscripts/globals/spells/trust/excenmille.lua
- scripts/globals/spells/trust/naji.lua 0 additions, 4 deletionsscripts/globals/spells/trust/naji.lua
- scripts/zones/Buburimu_Peninsula/mobs/Backoo.lua 2 additions, 0 deletionsscripts/zones/Buburimu_Peninsula/mobs/Backoo.lua
- scripts/zones/Castle_Zvahl_Baileys/npcs/Switchstix.lua 1 addition, 1 deletionscripts/zones/Castle_Zvahl_Baileys/npcs/Switchstix.lua
- scripts/zones/Chateau_dOraguille/npcs/Perfaumand.lua 21 additions, 12 deletionsscripts/zones/Chateau_dOraguille/npcs/Perfaumand.lua
- scripts/zones/Chateau_dOraguille/npcs/_6h0.lua 11 additions, 13 deletionsscripts/zones/Chateau_dOraguille/npcs/_6h0.lua
- scripts/zones/King_Ranperres_Tomb/mobs/Corrupted_Soffeil.lua 4 additions, 4 deletionsscripts/zones/King_Ranperres_Tomb/mobs/Corrupted_Soffeil.lua
- scripts/zones/King_Ranperres_Tomb/mobs/Corrupted_Ulbrig.lua 5 additions, 5 deletionsscripts/zones/King_Ranperres_Tomb/mobs/Corrupted_Ulbrig.lua
- scripts/zones/King_Ranperres_Tomb/mobs/Corrupted_Yorgos.lua 4 additions, 4 deletionsscripts/zones/King_Ranperres_Tomb/mobs/Corrupted_Yorgos.lua
- scripts/zones/King_Ranperres_Tomb/npcs/Tombstone.lua 3 additions, 5 deletionsscripts/zones/King_Ranperres_Tomb/npcs/Tombstone.lua
- scripts/zones/King_Ranperres_Tomb/npcs/_5a0.lua 15 additions, 17 deletionsscripts/zones/King_Ranperres_Tomb/npcs/_5a0.lua
- scripts/zones/Northern_San_dOria/npcs/Grilau.lua 12 additions, 13 deletionsscripts/zones/Northern_San_dOria/npcs/Grilau.lua
- scripts/zones/PsoXja/IDs.lua 1 addition, 7 deletionsscripts/zones/PsoXja/IDs.lua
- scripts/zones/PsoXja/mobs/Diremite.lua 4 additions, 4 deletionsscripts/zones/PsoXja/mobs/Diremite.lua
- scripts/zones/Southern_San_dOria/npcs/Ambrotien.lua 12 additions, 15 deletionsscripts/zones/Southern_San_dOria/npcs/Ambrotien.lua
- scripts/zones/Southern_San_dOria/npcs/Endracion.lua 13 additions, 16 deletionsscripts/zones/Southern_San_dOria/npcs/Endracion.lua
- sql/item_basic.sql 2 additions, 0 deletionssql/item_basic.sql
- sql/item_equipment.sql 29 additions, 29 deletionssql/item_equipment.sql
Loading
Please register or sign in to comment