Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-28 12:52:25 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,975 Commits 4 Branches 146 Tags
d75222feca1b0ffc5f9b10df1fd442eedab95a16
Commit Graph

320 Commits

Author SHA1 Message Date
Spp
d75222feca Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.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_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/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Packets/ByteBuffer.h
 2013-01-14 11:04:03 +01:00
Spp
802657250c Core/Misc: Apply codestyle to multiple files 2013-01-14 09:50:59 +01:00
Gacko
4d9fa7f22c Core/Spell: Gordunni Trap 
Casting npc of the trap should not remove the summoned chest on despawn.
Solves #4811
 2013-01-12 15:01:53 +01:00
Vincent_Michael
66e8d8c69e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
 2013-01-11 19:10:10 +01:00
Vincent_Michael
ecbcca8794 Core: Whitespace cleanup 2013-01-11 14:49:38 +01:00
Vincent_Michael
6cd962ee71 Core: Fix non pch build 2013-01-11 14:21:39 +01:00
krofna
dc30c63533 Script/AQ Implement Ayamiss the Hunter and fix screwup in my Ossirian 
Closes #8862

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-01-11 12:52:19 +00:00
Vincent_Michael
db330750b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
 2013-01-08 16:32:54 +01:00
Malcrom
43d73bebd0 Core/Scripting: Some cleanup 2013-01-07 22:48:40 -03:30
Malcrom
0105bc849f Core/Scripting: Misc clean up and a warning fix 2013-01-07 21:47:38 -03:30
Malcrom
70977f3097 Core/Scripting: Misc fixes 2013-01-07 20:18:47 -03:30
Vincent_Michael
8c58184535 Core: Fix non pch build 2013-01-07 23:40:20 +01:00
blub
be5d3e5fd8 Merge pull request #8755 from krofna/crofixes 
Script/AQ: Implement Buru the Gorger
 2013-01-07 14:04:53 -08:00
blub
669e2ed20f Merge pull request #8725 from krofna/krefixes 
Script/AQ: Rewrite Skeram
 2013-01-07 14:03:28 -08:00
Malcrom
3d1f61b278 Core/Scripting: Move Text for Ayamiss the Hunter to creature text 2013-01-07 16:29:20 -03:30
Shauren
f6b6558814 Scripts/Firelands: Fixed a *major* mistake in previous commit 2013-01-05 13:14:44 +01:00
Shauren
7e29e0d2b2 Scripts/Firelands: Implemented Alysrazor's trash event 2013-01-05 00:59:33 +01:00
Subv
bb1c955c8b Scripts/HallsOfOrigination: Added script for Anraphet and the Vault of Lights. 
Some bugs might still remain.
Crumbling Ruin spell has a problem with radius handling.
 2013-01-04 18:07:56 -05:00
Vincent_Michael
a28d2d22f3 Core: Fix non pch build 2013-01-03 23:40:12 +01:00
Spp
d35d33aa86 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/Kalimdor/CMakeLists.txt
 2013-01-03 09:17:53 +01:00
Malcrom
38c55a15ad Core/Scripting: Rename zone scripts. 2013-01-02 14:52:13 -03:30
Mislav Blažević
ab0d4624b8 Script/AQ: Implement Buru the Gorger 2013-01-02 18:51:41 +01:00
Spp
6b668c8337 Core/Misc: Update headers to 2013 2013-01-02 13:31:19 +01:00
Spp
aed36a8375 Merge branch 'master' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Item/ItemPrototype.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ReferAFriendHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.h
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.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_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_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2013-01-02 13:30:51 +01:00
Vincent_Michael
cc65aba789 Update copyright note for 2013. 
Happy new year.
 2013-01-01 00:41:01 +01:00
Shauren
f1170ba0fb Core: Fixed some level 4 warnings (msvc) 2012-12-31 20:43:14 +01:00
Nay
3375f56bf8 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/scripts/Kalimdor/thousand_needles.cpp
 2012-12-28 17:31:39 +00:00
Nay
7ccef51c8c Merge pull request #8518 from ille/goreset 
scripts/gameobject: correct reset of gameobjects (cages/prisons), move command out of if statement
 2012-12-27 18:50:35 -08:00
Subv
05a7b3aaea Scripts/HoO: Implemented the weather effect while on Earthrager Ptah's sandstorm. 2012-12-26 12:48:10 -05:00
Vincent_Michael
e65da39f23 Core: Fix non pch build 2012-12-26 02:50:19 +01:00
Subv
3742205866 Copyright: Added missing license information. 2012-12-25 19:40:57 -05:00
Subv
587710feb5 Scripts/HallsOfOrigination: Added script for Earthrager Ptah. 
ToDo: Fix spell Sand Vortex on Heroic difficulty.
Note: Feedback needed.
 2012-12-25 19:36:01 -05:00
Subv
f9e592e9c7 Scripts/HallsOfOrigination: Some work on Halls of Origination. 
Temple Guardian Anhuur's script added.
ToDo: Make the triggers invisible.

Merry Christmas folks!
 2012-12-24 18:25:57 -05:00
Subv
3869bb7b3a Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
 2012-12-23 08:33:13 -05:00
Vincent_Michael
a3b34e2894 Core: Fix more some codestyle 2012-12-22 01:13:56 +01:00
Mislav Blažević
36ba35285b Fix 2012-12-21 18:24:21 +01:00
Mislav Blažević
8b34792887 Update 2012-12-21 14:59:40 +01:00
Mislav Blažević
d38dfa82e0 Script/AQ: Rewrite Skeram 
Add spell_target_position for Skeram

Viscidus cosmetic fix

Cosmetic fix

Cosmetic fix .sql
 2012-12-20 17:00:00 +01:00
Mislav Blažević
200968c2dd Script/AQ: Add Creature Text for Viscidus and fix model scaling 2012-12-19 13:29:55 +01:00
Spp
80b1b6c494 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/World/World.h
	src/server/scripts/Kalimdor/moonglade.cpp
 2012-12-19 08:23:34 +01:00
Vincent_Michael
bcff526d28 Core/Script: Add missing changes in c364c367b1 2012-12-18 19:31:41 +01:00
Vincent_Michael
c364c367b1 Core/Script: Fix some codestyle and warnings 2012-12-18 19:16:00 +01:00
Vincent_Michael
3e318686b0 Core: Fix non pch build 2012-12-18 15:33:15 +01:00
Gacko
40292d9a19 Core/DB: Assign texts to correct creatures 
Also convert some never used script texts to creature text for future use.
Some scripts or Talk() calls need to be implemented first.

Solves #8659
 2012-12-18 15:19:13 +01:00
Mislav Blažević
9991f4ae2d Implement Viscidus AQ40 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-12-18 14:09:27 +00:00
Vincent_Michael
3f82ac9ea7 Core: Fix non pch build 2012-12-18 01:49:08 +01:00
Trista
8c286f2b61 Server/Quest: Convert quest_end_script and drop of some c++ 
* drop off c++ script of Clintan Dreamwalker ID: 22834
* convert quest_end_script of 10964 to SAI
* rewrite and add bigger event support
* add a checker to his summon so the spirit script can trigger event alone (I didn't try to rewrite next quest...)

Closes: #8689
 2012-12-18 02:03:30 +02:00
Vincent_Michael
e90ec5608e DB/Scripts: Implemented creature_text for Infinite Corruptor 2012-12-18 00:23:46 +01:00
Spp
a227a34947 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/PetAI.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/stormwind_city.cpp
 2012-12-17 12:13:51 +01:00
CeIa
b87cc31106 Scripts/Events/Achievement: fix 'Out With It' 
Credits to @darkman1983

Closes #8211
Closes #8126

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-12-14 01:23:53 +00:00