Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-19 17:05:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,590 Commits 4 Branches 146 Tags
0c1689077401ced1e09c95ed6518645dacf5da8f
Commit Graph

5271 Commits

Author SHA1 Message Date
Vincent_Michael
0c16890774 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.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/boss_kruul.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/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_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
 2013-02-19 18:57:36 +01:00
Kinzcool
12e5541636 DB/Spell: Added an auto-kill spell if you go at No Man's Land in Isle of Conquest 2013-02-18 23:09:53 -05:00
Ascathor
8027c956fc SQL Fix after 933381f 2013-02-18 22:56:54 +01:00
Pitcrawler
933381f80d DB/Misc: Mostly gossip stuff for various creatures. 
Some scripts still need to be implemented.
Fixes quest Blood Oath of the Horde.
 2013-02-18 19:56:35 +01:00
Vincent_Michael
71eaceae5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/Weather.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/CMakeLists.txt
 2013-02-18 18:51:52 +01:00
Nay
028c72a9f2 Core/NPCs: Refactor equipments 
- creature_template.equipment_id deleted
- creature_equip_template.entry == creature_template.entry
- id field added to creature_equip_template -> PK(entry, id)
- id field in creature_equip_template starts at 1
- creature.equipment_id references id of creature_equip_template
- creature.equipment_id = 0 means no equipment at all (default 1)
- creature.equipment_id = -1 means pick a random equipment from creature_equip_template
- add equipment info to .npc info command

While table creature_equip_template got bigger in size, this system is easier to mantain and allows creatures to have a random template from a group of equipments
 2013-02-18 12:24:18 +00:00
Nay
fab33f0774 SQLs: Rename some old SQL files to match standards 2013-02-17 21:11:45 +00:00
Shocker
37292a3038 Remove BOM from 2 SQL files 
Closes #9233
 2013-02-17 06:03:15 +02:00
Shauren
e49aaab6f6 Scripts/Icecrown Citadel: Improvements to Shadowmourne quest line 2013-02-17 02:10:08 +01:00
dr-j
b7b7f964a3 DB/Quests: 
Update Quest Requirements for To Bor'gorok Outpost, Quickly! Closes #9113
 Fix Quest Grouping
 Add Quest Conditions for Hellscream's Champion  Closes #9092
 Fix SAI for Hugh Glass Closes #9097
 2013-02-16 11:20:11 +01:00
Exodius
6141d38269 DB/Loot: 
+ Remove Zulian Mudskunk from Zulian Crocolisk loot template  Closes #9169
+ Add Vicious Oil to Vicous Oil Closes #9147
 2013-02-16 11:10:08 +01:00
Ricko92
4e1aae82b2 DB/SAI: Add script for Quergo's Gold 
Closes #1677
 2013-02-16 10:56:23 +01:00
ZxBiohazardZx
e8b7f8f61b DB/Creature: Add texts for Lurgglbr 
Closes #1608
 2013-02-16 10:36:54 +01:00
Vincent_Michael
49e196e6b0 Misc/Spells: 
- Add some ulduar teleport pos for spells
- Add target hack for ulduar teleport spells
 2013-02-16 03:26:26 +01:00
w1sht0l1v3
a75fe0b2bf DB/Creature: The Ocular 
Now Eyesore Blaster hits this npc for 12600 damage as it should.
 2013-02-16 02:34:08 +02:00
Nay
2277f6db44 TDB 434.04 2013-02-15 17:10:24 +00:00
Nay
f086ee0b96 SQL: Rename files since they are 4.3.4 only 2013-02-15 17:09:03 +00:00
Nay
82ff367be8 Merge remote-tracking branch 'origin/master' into 4.3.4 2013-02-15 17:07:50 +00:00
Nay
e685b7bd9e TDB 335.51 - 2013/02/14 
Ref #8947
Closes #9077
 2013-02-15 17:00:09 +00:00
w1sht0l1v3
7d881a0739 Scripts/TheStormPeaks: Cold Hearted quest update. 
Fix a crash.Thx @DDuarte.
Closes #8865
Move waypoint data from script  to DB table.
 2013-02-15 15:51:18 +02:00
Vincent_Michael
d292b05ac1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-12 21:21:06 +01:00
Nay
12359b993d DB/NPCs: Set trigger flags_extra to a bunch of quest credit markers 
God damn Aokromes, always making me do work and stuff...
 2013-02-11 03:10:02 +00:00
Kinzcool
1b4a610976 DB/Triggers: Added anti-exploration in Hellfire Ramparts 2013-02-10 13:05:53 -05:00
Vincent_Michael
92573c4fb5 DB/Factionchange: Add a missing spell (Teleport: Darnassus / Teleport: Thunder Bluff) at player_factionchange_spells 2013-02-10 04:53:48 +01:00
Kinzcool
8e58779d91 DB/Triggers: Fixed access to Duskwither Spire 2013-02-09 19:36:29 -05:00
Vincent_Michael
caf70ee40d DB/Creature: Fix Onyxian Lair Guard equipment 2013-02-10 00:00:53 +01:00
Nay
984e1feadf Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
 2013-02-09 20:33:30 +00:00
Nay
e33f70c002 DB/Quests: Fix quest The Collapse and Deploy the Shake-n-Quake 
Ref #1005
Ref #2034
Ref ae30704847
Closes #3595
 2013-02-09 15:13:49 +00:00
Kinzcool
8066e43dd8 DB/Triggers: Added areatriggers in Shadowfang - when you'll try to jump out of the dungeon walls, you will be teleported 2013-02-08 17:51:55 -05:00
Shauren
b6e56e42ea Core/Auth: Reverted part of fb43a92cc2 - session key is still needed after logging in to be able to switch realms 2013-02-08 01:03:56 +01:00
Shauren
fb43a92cc2 Core/Accounts: sessionkey field in account table is only a temporary storage to pass data from authserver to worldserver and should only be used as such. Clearing sessionkey from database after a successful login to prevent possible exploits. 2013-02-07 16:15:23 +01:00
Vincent_Michael
1fbc25766f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-06 21:49:12 +01:00
w1sht0l1v3
f27a83e98f Fix up previous commit. 2013-02-06 18:39:09 +02:00
w1sht0l1v3
d42dac4cee DB/Misc: Fixup quest Hot On The Trail (A:24849 H:24851) 2013-02-06 18:32:28 +02:00
Gacko
32546a64c9 Add comment to f205613eb5 2013-02-06 09:08:56 +01:00
Kinzcool
2fa8d06b25 DB/Items: Added Heart-Shaped Box, missing for Love in the Air event 
Closes: #9130
 2013-02-05 22:30:34 -05:00
Warpten
6a0b7950a7 Core/Spells: Fixed Molten Core's proc. 2013-02-06 00:30:40 +01:00
click
00d299f12f Core/SQL: Explicitly set the auth.account-table to use the INNODB-engine (to allow foreign keys and transactions) 
If you have an OLD database (auth), and RBAC SQL-alterations, make SURE that it's InnoDB, otherwise run this (it can be run multiple times anyway)
(The only change added is to alter the table to explicitly be an InnoDB-table)
 2013-02-05 22:20:55 +01:00
Gacko
f205613eb5 DB/Disable: Ignore LOS for Krakles Thermometer 
Closes #5560
 2013-02-05 19:40:20 +01:00
Spp
f7c7f0f0f6 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/scripts/Kalimdor/zone_durotar.cpp
 2013-02-05 09:57:14 +01:00
Kinzcool
630ad4b0b5 DB/Creature: Updated Unseen template 2013-02-04 20:03:04 -05:00
w1sht0l1v3
1e8bf1aad1 DB/Misc: Fix achievement Flirt With Disaster. 2013-02-04 23:39:04 +02:00
Vincent_Michael
7f2a1ece62 Fix merge fail (fucking saving button -.-) 2013-02-04 22:17:23 +01:00
Vincent_Michael
12c8cdc26c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2013-02-04 22:14:56 +01:00
Nay
8f6e9dc85c DB/Commands: Fix RBAC commands (remove an extra dot) 2013-02-04 20:25:18 +00:00
Nay
2a69143cec DB/Characters: Update sql/base/characters_database.sql 2013-02-04 16:22:43 +00:00
Nay
735419965c DB/Auth: Update sql/base/auth_database.sql 2013-02-04 16:08:45 +00:00
Spp
fb7a544d84 Correction to previous commit (Use proper way to delete from spell_script_names) 2013-02-04 17:04:40 +01:00
Spp
61979f8591 Scripts/Player: Add OnMapChanged to PlayerScripts (after map changed) 
Core/Dungeon Finder: Use OnMapChanged script to cast/remove Luck of the draw
- Also move code to force party update to LfgPlayerScript
- Remove some obsolete Lfg code after recent commits
 2013-02-04 16:52:43 +01:00
Gacko
30e1516387 Rename sql files of 760d62e934 2013-02-04 16:43:12 +01:00