Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,893 Commits 4 Branches 146 Tags
5e3e431b0694d0df2b60f67b68a76a41dba30963
Commit Graph

18085 Commits

Author SHA1 Message Date
Vincent-Michael
5e3e431b06 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-04 04:24:59 +02:00
jackpoz
720c3cbbd0 Core/Misc: Fix exploit 
Fix exploit that allowed to duplicate stackable splitable items. If the item that cast the spell can't be found anymore, the spell is cancelled.

Fixes https://github.com/TrinityCore/TrinityCore/issues/11977
 2014-05-03 21:22:12 +02:00
Vincent-Michael
13ec761ad2 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.h
 2014-05-03 20:23:44 +02:00
Aokromes
d7b1405725 Merge pull request #11968 from Dehravor/cpp11 
Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros
 2014-05-03 19:25:36 +02:00
Vincent-Michael
9a8cd0593c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-03 18:20:28 +02:00
Lucas
065207b1b8 Core/Spells: Correct a mistake in HOT aura procs 
A crash fix was added in 3e0d2e4944
but the usage of spellProcEvent itself was incorrect, we should instead use spellProto of aura to be procced
 2014-05-03 02:28:49 +02:00
Aokromes
0c8df80415 Core/Auth: Add support for build 13930 of china 
By phoenixfight closes #11978
 2014-05-03 02:11:37 +02:00
jackpoz
3e0d2e4944 Core/Misc: Fix static analysis issues 2014-05-02 23:21:37 +02:00
Vincent-Michael
43c78c4a8e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-02 20:55:53 +02:00
Lucas
3e78578f27 Core/Spells: Fix hots proccing wrong auras 
& Partly revert unnecessary changes in 1719e19572
 2014-05-02 16:17:45 +02:00
Vincent-Michael
e7eed54c10 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-05-01 22:20:55 +02:00
Vincent-Michael
0faf4b1b24 Core/Text: Fix typo in 5caf6aad98 2014-05-01 21:59:19 +02:00
joschiwald
3ff9589c9a Core/Battleground: fixed possible crash in BattlegroundSA 
Closes #11969
 2014-05-01 15:14:42 +02:00
Dehravor
cbd36d5a4e Core/Misc: Remove remaining COMPILER_HAS_CPP11_SUPPORT related macros 2014-05-01 11:19:32 +02:00
Vincent-Michael
824ee30b7f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
 2014-04-30 22:59:51 +02:00
Vincent-Michael
5caf6aad98 Core/Texts: 
* Fix creautre text with gender female
* Small cleanUp
* ObjectMgr.cpp/ObjectMgr.h part from joschi
 2014-04-30 22:15:28 +02:00
Vincent-Michael
3ce6a9d5cf Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
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-29 20:14:42 +02:00
Dehravor
24ae6a6802 Core/Misc: Remove obsolete C++11 backward compatibility macros 
OVERRIDE, FINAL, DELETE_MEMBER
 2014-04-29 16:35:11 +02:00
Vincent-Michael
796b77ca12 Scripts: Remove old script from azuregos 2014-04-29 14:17:30 +02:00
Vincent-Michael
65ae868cc8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
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-28 23:00:41 +02:00
Vincent-Michael
ba8959b733 Core/MSVC: Remove double warning disables 2014-04-28 22:44:56 +02:00
Vincent-Michael
4dfe3246fa Core: Fix warning 2014-04-28 22:32:01 +02:00
jackpoz
d0cc723d2d Scripts/Commands: Fix crash in ".wp modify wpadd" 
Remove the old unsupported "wpadd" subcommand of ".wp modify" .
Closes #11955
 2014-04-28 20:50:47 +02:00
joschiwald
84bff76ba0 Core/Misc: remove some obsolete parameters 2014-04-28 20:05:36 +02:00
joschiwald
f388020366 Merge pull request #11948 from MitchesD/misc 
Scripts/Azuregos: converted to EventMap and WorldBossAI
 2014-04-28 19:58:17 +02:00
MitchesD
0c0d0ed9e5 Scripts/Azuregos: converted to EventMap and WorldBossAI 2014-04-28 19:52:08 +02:00
Vincent-Michael
221fde5711 Core: Fix warning 2014-04-28 09:55:11 +02:00
Vincent-Michael
f4fd258ad1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-28 09:49:24 +02:00
Vincent-Michael
f743ca2816 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
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-28 09:42:20 +02:00
Vincent-Michael
57cf043aec Core/Creature: Missed changes in c536305e3a 2014-04-28 09:19:37 +02:00
Kinzcool
c536305e3a Core: Droped faction_H field -- only one faction table is necessary 2014-04-27 18:13:55 -04:00
Vincent-Michael
a1e8cad703 Core/Creature: Added creature template log for default creature is greater than difficulty creature 2014-04-27 23:12:21 +02:00
Vincent-Michael
f6e53e45a9 Core/Creature: Addet "possible fix" log for creature_template errors 2014-04-27 23:12:20 +02:00
Vincent-Michael
a4dc654aea Core/Creature: Added creature template log for default creature is greater than difficulty creature 2014-04-27 23:11:11 +02:00
Lucas
1719e19572 Fix percentage HOTs proccing everything 
Unforeseen sideeffect of 057169c21c
Percentage HOTs are not supposed to proc anything at all.
Closes: https://github.com/TrinityCore/TrinityCore/issues/11914
 2014-04-27 22:47:54 +02:00
Vincent-Michael
2f4059e9b2 Core/Creature: Addet "possible fix" log for creature_template errors 2014-04-27 21:28:54 +02:00
Vincent-Michael
908870e23f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-27 13:56:56 +02:00
Discover-
91c6c8a911 Merge pull request #11945 from Dehravor/trade 
Core/Trade: Correction of distance checking
 2014-04-27 12:32:32 +02:00
Aokromes
eb722bf220 DB/Misc: Fix few typos 2014-04-27 04:51:35 +02:00
w1sht0l1v3
c20d0cb77e Scripts/Sholazar Basin: Reconnaissance Flight (12671) 
Add workaround for the player/accessory mounting issue.
Some small additions.
Closes: 9443
 2014-04-27 02:23:33 +03:00
Vincent-Michael
de281846cc Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-26 14:51:00 +02:00
joschiwald
113e6b0162 Really fixed build and warnings 2014-04-26 14:42:56 +02:00
Vincent-Michael
3ef7a7299f Core: Fix build 2014-04-26 13:07:00 +02:00
Vincent-Michael
5586950dec Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-26 12:35:21 +02:00
Vincent-Michael
ab85c1546f Core/Achievements: Fixed WoW''s 4th-8th Anniversary 2014-04-26 04:46:54 +02:00
joschiwald
33a9b879ef Fixed non-pch build 2014-04-26 04:03:37 +02:00
joschiwald
211d56d633 Core/BG/SA: 
* replaced some trinity_string with broadcasttexts
* basic implementation of phasing in SA
* spawn some triggers in SA (fixes dest position of teleport pads)
* added text getter to broadcasttext struct
* some cleanup in destructable go event notification
 2014-04-26 03:40:30 +02:00
Vincent-Michael
0242f04f1c Core: Fix build 2014-04-26 03:24:57 +02:00
Vincent-Michael
f98866db3f Core: Fix warning 2014-04-26 03:16:53 +02:00
Vincent-Michael
3ec1d0c8d6 Core/Achievements: Implemented ACHIEVEMENT_CRITERIA_DATA_TYPE_GAME_EVENT 2014-04-26 03:07:49 +02:00