Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 11:21:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
42,690 Commits 4 Branches 146 Tags
dd61ba2844fc96b3344183fe0b05ce65985fa8be
Commit Graph

7431 Commits

Author SHA1 Message Date
Nay
b404e0bec1 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	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_priest.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/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/loadlib.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_assembler/CMakeLists.txt
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2013-01-28 01:04:37 +00:00
Xanvial
92068907f5 Scripts/Paladin: Shield of the Righteous 2013-01-28 06:13:27 +07:00
Nay
1b551cc157 Scripts/Commands: Add guild info to .pinfo 
Original patch by @secharles, modified

Closes #8946
 2013-01-26 21:33:13 +00:00
Vincent_Michael
ceed5ea42f Scripts/Icecrown Citadel: Fix warning 2013-01-26 19:57:11 +01:00
Vincent_Michael
480c847156 Core: Some cosmetic changes 2013-01-26 19:49:53 +01:00
w1sht0l1v3
f0800d3926 Scripts/ShadowmoonValley: Fixup script for Lord Illidan Stormrage quest to be doable. 
Notice: this whole script needs a proper rewrite(contains wrong Illidan npc id,bad dialogues,etc).
 2013-01-26 19:19:55 +02:00
Shauren
a3d07b5e6a Core/Spells: Fixed Darkflight, Two Forms and Running Wild for worgens. 
Closes #8905
 2013-01-26 13:25:06 +01:00
WishToDie
1348e4e44d Fix Typo. 2013-01-26 00:57:10 +02:00
w1sht0l1v3
6acfa49065 Script/Commands: Implement command to list the members of a group/party. 2013-01-26 00:41:46 +02:00
Shauren
705d0c8865 Scripts/Icecrown Citadel: Fixed possible crash with Bone Spike Graveyard 
Closes #7171
 2013-01-24 22:51:42 +01:00
Shauren
1c7ade5e54 Scripts/Icecrown Citadel: Fixed Deathbringer Saurfang's Blood Power scaling on first attempt. 
Closes #3283
 2013-01-24 22:46:45 +01:00
Shauren
6c5fbc492c Scripts/Icecrown Citadel: Fixed Essence of the Blood Queen interrupting player spell casts 
Closes #8665
 2013-01-23 23:14:18 +01:00
blub
a6f587a3b1 Merge pull request #9016 from joschiwald/spellscripts4 
Core/Spell: convert more spells to SpellScripts
 2013-01-23 11:19:39 -08:00
w1sht0l1v3
70490c8238 Script/Commands: Add command to join an existing group/party. 2013-01-23 20:58:01 +02:00
joschiwald
af50ce6223 Core/Spell: convert more spells to SpellScripts 2013-01-22 23:36:51 +01:00
Xanvial
e360f87470 Scripts/Paladin: Templar's Verdict 2013-01-23 05:26:51 +07:00
Vincent_Michael
98e01fdb3f Core: Fix build 2013-01-22 21:00:08 +01:00
Nay
6fc17c6b1e Core: Fix compile warnings 2013-01-22 19:34:27 +00:00
Xanvial
d0d3d0f3c4 Scripts/Creature: Hira Snowdawn no longer sells Tome of Cold Weather Flight 2013-01-23 01:20:31 +07:00
Northstrider
da060b1948 Scripts: apply more TC codestyle 2013-01-22 00:07:36 +01:00
Northstrider
3bf7fcef55 Scripts: apply some TC codestyle to instance script 2013-01-22 00:02:08 +01:00
Northstrider
8c64ceda79 Scripts: removed a unneeded header 2013-01-21 23:49:23 +01:00
Northstrider
93c7f975b1 Scripts: implement Alizabal the misstress of hate 
Todo: use the rest of the texts and add the missing ones
 2013-01-21 23:47:17 +01:00
Nay
ebded74eee Merge remote-tracking branch 'origin/master' into mmaps 2013-01-21 20:42:02 +00:00
Vincent_Michael
367e1f7b2b Core: Fix warnings 2013-01-21 10:11:46 +01:00
Aokromes
321b425f36 Update COPYING 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-01-21 02:47:51 +00:00
Nay
3523d84a91 Shooting myself in 3... 2... 2013-01-21 02:34:43 +00:00
Nay
2363552655 Scripts/ZG: Fix a warning and a compile error introduced in previous commit 
Personal opinion: BossAI should not have a public field named "instance"
 2013-01-21 02:24:25 +00:00
Nay
c6c23d67b8 Scripts/ZG: Fix some code style issues and logic errors 2013-01-21 02:10:01 +00:00
Malcrom
33b7685696 Scripting/ZulGrub: Fix last commit 2013-01-20 18:20:46 -03:30
Malcrom
b7dbc8d746 Scripting/Zulgrub: Updated Boss Arlokk Script. 2013-01-20 18:04:06 -03:30
Vincent_Michael
1e57543779 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
 2013-01-20 22:11:06 +01:00
Nay
f4907e92aa Merge pull request #8961 from joschiwald/spellscripts3 
Core/Spells: convert some spells to SpellScripts
 2013-01-20 08:45:23 -08:00
joschiwald
c38d95ac33 Core/Spells: convert some spells to SpellScripts 2013-01-20 04:30:17 +01:00
Vincent_Michael
94944e3072 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
 2013-01-20 00:34:20 +01:00
Gacko
e524539d90 Core/CS: More npcflag info in .npc info 2013-01-19 20:59:48 +01:00
Vincent_Michael
ed44eea699 Core: Fix warnings 2013-01-19 20:28:29 +01:00
Shauren
504ca4105a Scripts/Firelands: Fixed compile without PCH 2013-01-19 13:05:20 +01:00
Vincent_Michael
c6ef4b1047 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-19 01:03:31 +01:00
Vincent_Michael
0740086b6c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-19 01:02:40 +01:00
Malcrom
b115abde31 Script/Scholomance: Update Kirtonos the Herald script. 2013-01-17 19:50:11 -03:30
Spp
7d6634e363 Fix merge problem 2013-01-17 08:48:04 +01:00
Vincent_Michael
224b4480a7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-16 23:43:07 +01:00
Spp
0e8011657d Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
 2013-01-16 15:29:41 +01:00
Warpten
faccbef869 Scripts/ZulGurub: I can do this! 
Commiting stuff one hour after waking up is no good.
 2013-01-16 07:18:47 +01:00
Warpten
3df4075a04 Scripts/ZulGurub: Fixed Hakkar's aspects. 2013-01-16 07:16:22 +01:00
Warpten
797be8d9ff Scripts/ZulGurub: Missing mass replace changes and typo/codestyle fixes. 2013-01-16 07:07:48 +01:00
Warpten
26bf10365e Scripts/ZulGurub: Forgotten change to previous commit. Damned Ctrl+S. 2013-01-16 06:55:46 +01:00
Warpten
803bf2f9cc Scripts/ZulGurub: 
* Fixed non-PCH compile.
* Changed some codestyle on Mandokir.
* Fixed compile warnings and a few typos.
* Remove instance checks and use a wrapper to get AIs.
 2013-01-16 06:51:59 +01:00
Malcrom
ace7bbeddf Core/Zul'Grub: Fix up Mandokir Boss 2013-01-16 00:41:03 -03:30