aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-04-29Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
Conflicts: src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp src/server/scripts/EasternKingdoms/boss_kruul.cpp src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp src/server/scripts/EasternKingdoms/zone_hinterlands.cpp src/server/scripts/EasternKingdoms/zone_loch_modan.cpp src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp src/server/scripts/Kalimdor/boss_azuregos.cpp src/server/scripts/Kalimdor/zone_azshara.cpp src/server/scripts/Kalimdor/zone_darkshore.cpp src/server/scripts/Kalimdor/zone_desolace.cpp src/server/scripts/Kalimdor/zone_durotar.cpp src/server/scripts/Kalimdor/zone_felwood.cpp src/server/scripts/Kalimdor/zone_feralas.cpp src/server/scripts/Kalimdor/zone_moonglade.cpp src/server/scripts/Kalimdor/zone_mulgore.cpp src/server/scripts/Kalimdor/zone_orgrimmar.cpp src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp src/server/scripts/Kalimdor/zone_tanaris.cpp src/server/scripts/Kalimdor/zone_thousand_needles.cpp src/server/scripts/Kalimdor/zone_thunder_bluff.cpp src/server/scripts/Kalimdor/zone_ungoro_crater.cpp src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp src/server/scripts/Northrend/zone_dalaran.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp src/server/scripts/Spells/spell_dk.cpp src/server/scripts/Spells/spell_druid.cpp src/server/scripts/Spells/spell_generic.cpp src/server/scripts/Spells/spell_hunter.cpp src/server/scripts/Spells/spell_item.cpp src/server/scripts/Spells/spell_mage.cpp src/server/scripts/Spells/spell_paladin.cpp src/server/scripts/Spells/spell_priest.cpp src/server/scripts/Spells/spell_shaman.cpp src/server/scripts/Spells/spell_warlock.cpp src/server/scripts/Spells/spell_warrior.cpp src/server/scripts/World/item_scripts.cpp
2014-04-29Merge pull request #11950 from Dehravor/override-final-deletejackpoz
Core/Misc: Remove obsolete C++11 backward compatibility macros
2014-04-29DB/Gossip: Fix "Alchemist Pestlezugg <Alchemy Supplies>" gossipuntaught
Closes #11958
2014-04-29Core/Misc: Remove obsolete C++11 backward compatibility macrosDehravor
OVERRIDE, FINAL, DELETE_MEMBER
2014-04-29DB/Gossip: Fix "Gyll <Gryphon Master>" Gossipuntaught
Closes #11956
2014-04-29Scripts: Remove old script from azuregosVincent-Michael
2014-04-29Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
2014-04-29DB/Creature: Fix even more creature templatesAokromes
2014-04-29DB/Creature: Fix even more creature templatesAokromes
2014-04-28DB/SlavePens: Corrected a lot of wrong Slave Pens spawnsKinzcool
2014-04-28Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
Conflicts: src/server/game/Entities/Pet/Pet.cpp src/server/game/Entities/Player/Player.cpp src/server/scripts/Commands/cs_npc.cpp src/server/scripts/Commands/cs_wp.cpp src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
2014-04-28Core/MSVC: Remove double warning disablesVincent-Michael
2014-04-28Core: Fix warningVincent-Michael
2014-04-28DB/Creature: Fix even more creature templatesAokromes
2014-04-28DB/Creature: Fix even more creature templatesAokromes
2014-04-28DB/Creature: Fix even more creature templatesAokromes
2014-04-28Scripts/Commands: Fix crash in ".wp modify wpadd"jackpoz
Remove the old unsupported "wpadd" subcommand of ".wp modify" . Closes #11955
2014-04-28DB/Creature: Fix even more creature templatesAokromes
Yes, i know this increases startup errors.
2014-04-28Core/Misc: remove some obsolete parametersjoschiwald
2014-04-28Merge pull request #11948 from MitchesD/miscjoschiwald
Scripts/Azuregos: converted to EventMap and WorldBossAI
2014-04-28Scripts/Azuregos: converted to EventMap and WorldBossAIMitchesD
2014-04-28SQL: Fix typo (thx @cr4st)Vincent-Michael
2014-04-28DB/Command: Added missing data in 6045c05e0d5390c8d8a3f2d85691f1e37010328aVincent-Michael
2014-04-28SQL: Update old .sql files to keep consistency with auth_database.sqlVincent-Michael
Also update characters_database.sql (generated by mysqldump)
2014-04-28DB/RBAC: Fix rbac_permissions orderVincent-Michael
2014-04-28DB/Creature: Fix even more creature templatesAokromes
2014-04-28DB/Creature: Fix even more creature templatesAokromes
2014-04-28Core: Fix warningVincent-Michael
2014-04-28Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
2014-04-28Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
Conflicts: src/server/game/Entities/Creature/Creature.h src/server/game/Globals/ObjectMgr.cpp src/server/scripts/Commands/cs_reload.cpp src/server/shared/Database/Implementation/WorldDatabase.cpp
2014-04-28DB/Creature: Fix even more creature templatesAokromes
2014-04-28Core/Creature: Missed changes in c536305e3a3c4f41e94d14fae73ba7a2d8d13be2Vincent-Michael
2014-04-27Core: Droped `faction_H` field -- only one faction table is necessaryKinzcool
2014-04-27Core/Creature: Added creature template log for default creature is greater ↵Vincent-Michael
than difficulty creature
2014-04-27Core/Creature: Addet "possible fix" log for creature_template errorsVincent-Michael
2014-04-27Core/Creature: Added creature template log for default creature is greater ↵Vincent-Michael
than difficulty creature
2014-04-27Merge pull request #11957 from Unholychick/patch-1jackpoz
Fix percentage HOTs proccing everything
2014-04-27Fix percentage HOTs proccing everythingLucas
Unforeseen sideeffect of 057169c21c141f690891c908b8f09e63d917289d Percentage HOTs are not supposed to proc anything at all. Closes: https://github.com/TrinityCore/TrinityCore/issues/11914
2014-04-27Core/Creature: Addet "possible fix" log for creature_template errorsVincent-Michael
2014-04-27DB/Creature Fix even more hard modes valuesAokromes
I have this is annoying thing?
2014-04-27DB/Creature: Link more creatures with their hard modesAokromes
Thx jackpoz by the sql to ease my life! This will add a flood of startup errors, don't open new tickets, they will be fixed.
2014-04-27Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4Vincent-Michael
2014-04-27Merge pull request #11945 from Dehravor/tradeDiscover-
Core/Trade: Correction of distance checking
2014-04-27DB/Creature Fix even more hard modes valuesAokromes
2014-04-27DB/Creature: Fix even more hard modes valuesAokromes
2014-04-27DB/Creature: Fix more hard modes valuesAokromes
2014-04-27DB/Creature: Fix some hard modes valuesAokromes
2014-04-27DB/Creature: Link some creatures with their hard modesAokromes
This will add some startup errors.
2014-04-27DB/Misc: Fix few typosAokromes
2014-04-27DB/Creature: Fix more factionsAokromes