Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,662 Commits 4 Branches 146 Tags
master
Commit Graph

7915 Commits

Author SHA1 Message Date
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
Vincent_Michael
11bd11badc Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-15 23:34:50 +01:00
Vincent_Michael
9391d087fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
 2013-01-15 23:33:36 +01:00
w1sht0l1v3
fc05b3dc58 Core/Scripting: Implement quest Reconnaissance Flight (id 12671) 
Fix sql naming for last file.
 2013-01-15 21:56:20 +02:00
Malcrom
b138d7fdf4 Core/Scripting: Bosses should now work in ZG. 
Note: Mandokir is being rewritten blizzlike and not everything is working properly yet.
 2013-01-15 13:23:33 -03:30
Vincent_Michael
6f8aa6a782 Core/Spells: Reorder more scripts in some script files and some cosmetic stuff 2013-01-14 20:28:32 +01:00
Vincent_Michael
65cd79dc77 Core/Misc: Update headers to 2013 2013-01-14 17:42:06 +01:00
Shauren
9007ef905f Core: Fixed some compile warnings 2013-01-14 15:05:30 +01:00
Nay
e6a07076c3 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2013-01-14 13:58:34 +00:00
Spp
0d5cb6af75 Core/Misc: Apply codestyle to multiple files (II) 2013-01-14 11:12:58 +01:00
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
kaelima
557fde86e4 Script/Ruby Sanctum: Miss in a05e78bb18 Thanks joschiwald 2013-01-14 04:38:05 +01:00
kaelima
a05e78bb18 Script/Ruby Sanctum: Some cleanup and minor fixes 
Solves #8573
Closes #8490
 2013-01-14 02:40:24 +01:00
Malcrom
83c753f607 Core/Scripting: more Zul'Grub updates 2013-01-13 20:58:48 -03:30
Malcrom
114617fcb0 Core/Scripting: Fix build 2013-01-13 19:59:09 -03:30
Malcrom
0759f6c910 Core/Scripting: More Zul'Grub updates 2013-01-13 19:48:25 -03:30