Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,385 Commits 4 Branches 146 Tags
f5fd7bad69c04352f5e367b8aca2035e0eff57d9
Commit Graph

2592 Commits

Author SHA1 Message Date
Vincent_Michael
f5fd7bad69 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_lady_deathwhisper.cpp
 2013-01-31 00:10:17 +01:00
Gacko
754418a8de Script/ICC: Fix phase check in Saurfang script 
Related to changes in dbecf05e39
 2013-01-30 19:34:59 +01:00
Gacko
dbecf05e39 Core: Logical fixes and improvements in EventMap 2013-01-30 18:39:34 +01:00
Vincent_Michael
5a74336c5e Core: Fix non pch build 2013-01-30 18:24:29 +01:00
Vincent_Michael
8814d8c136 Script/ToCr: Fix crash for lord jaraxxus Mistress Kiss + cleanup 2013-01-30 18:06:19 +01:00
Spp
709129f222 Merge branch 'master' into 4.3.4 (+ some changes to minimize differences) 
Conflicts:
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/Formulas.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Waypoints/WaypointManager.cpp
	src/server/game/Skills/SkillDiscovery.cpp
	src/server/game/Skills/SkillExtraItems.cpp
	src/server/game/Warden/WardenCheckMgr.cpp
	src/server/game/Weather/WeatherMgr.cpp
 2013-01-30 11:57:02 +01:00
Spp
8cd408ae6c Core/Misc: Some changes to minimize differences with 4.3.4 branch 2013-01-30 10:34:18 +01:00
Spp
fa5dd4bd4e Core/Misc: Remove some calls to const_cast 2013-01-30 08:39:06 +01:00
Souler
d92347bc22 Scripts/Mage: Unsummon current mage's Water Elemental before summoning a new one 
Closes #8433
 2013-01-29 15:10:47 +00:00
Nay
4aa4fce89a Merge remote-tracking branch 'origin/master' into 4.3.4 2013-01-29 03:34:10 +00:00
Nay
1b180e683e Core&DB/Trainers: Remove trainer_spell from creature_template since it is not longer necessary on Cata 2013-01-29 02:25:24 +00:00
Gacko
29cd1dbec1 Core/Quest: Bloody Breakout 
Closes #641
 2013-01-28 19:50:01 +01:00
Nay
98f01c2b12 Core/Misc: Fix compile errors introduced in previous merge 
There are probably other merge issues that got through, please report them
 2013-01-28 02:54:27 +00:00
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
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