Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
21,123 Commits 4 Branches 146 Tags
14d80d269dd7f9624983bc5a610e511f31ed33f0
Commit Graph

6035 Commits

Author SHA1 Message Date
Nay
14d80d269d Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Globals/ObjectMgr.cpp
 2013-08-27 16:10:11 +01:00
Filip
19accfc3ee DB: Missing declaration 2013-08-27 13:14:06 +02:00
Filip
a5ed6f6e20 DB/SAI: Sabotage 12676 (part 1) 
Fixes #6460
 2013-08-27 13:11:09 +02:00
Filip
56c168eef5 DB/SAI: Zero Tolerance & Hazardous Materials 
Use the Hand of Drakuru to kill Darmuk, player should stand from a distance.
 2013-08-27 05:14:18 +02:00
Filip
a638f3d90b DB/Loot: Bosses in Shattered Halls Heroic 
Fixes #10638 by @dr-j
 2013-08-27 04:56:56 +02:00
Filip
b8d697477e DB/Comments: Unclear comments 2013-08-26 20:05:43 +02:00
Filip
2d15acd63b DB/SAI: It Rolls Downhill 12673 
Fixes #5718
You need to have mmaps enabled if you want the delivering of the geist to look blizzlike, otherwise it will ignore the path.
 2013-08-26 19:46:26 +02:00
joschiwald
2aa944caee Scripts/Auchindoun: add missing InstanceScripts and cleanup some boss scripts 2013-08-26 18:52:29 +02:00
Filip
02258e93c0 DB/Errors: Error fix 
Fixes #10634
 2013-08-26 16:15:17 +02:00
Nay
b2134dbbe3 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
 2013-08-26 12:40:41 +01:00
Filip
a4fcbd1a36 DB/SAI: Ribbly Screwspigot (4136) 
Fixes #6911
 2013-08-26 02:01:23 +02:00
Filip
608f9e7a54 DB/SAI: Out of Body Experience (12327) 
Fixes #3084
 2013-08-26 01:27:54 +02:00
Filip
eeb2102d5f DB/Sai: Make cauldrons reward buffs 2013-08-25 18:48:24 +02:00
Nay
a7527b3b48 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/tools/map_extractor/mpq_libmpq04.h
 2013-08-25 14:12:32 +01:00
raczman
ba22baebbd Core/Auth: Implement time-based token for user login as described in RFC 6238. 
New column in account table is a base32 of token key bytes,
coincidentally it is the same format Google's Authenticator Android app uses.
If you want that to work, set system time on server correctly and use ntpd.

Closes #10527

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-08-25 14:02:40 +01:00
Vincent-Michael
174efdf05f DB/Creature: Fix startup errors 2013-08-25 02:15:08 +02:00
Filip
61016dcc66 DB/SAI: Cannot Reproduce (13320,13355) & Retest Now (13321,13322,13356,13357) 2013-08-24 20:17:18 +02:00
Filip
5a06f3c90c DB/SAI: The Last of Her Kind credit update 
By @untaught, fixes #10254
 2013-08-24 18:00:46 +02:00
Filip
adaf5b3d48 DB/Conditions: Awakening Rod 2013-08-24 17:37:00 +02:00
Filip
4d098b0871 [DB/SAI] Sleeping Giants (11432 & 11433) 2013-08-24 16:34:23 +02:00
Filip
95bdde84d9 [DB/Errors] Really fix a few more errors. 2013-08-23 20:00:55 +02:00
Filip
04707b1287 [DB/Errors] Fix a few DB errors. 2013-08-23 18:11:11 +02:00
Filip
97a9b7695a [DB/SAI]: I've Got a Flying Machine! (11390) 
Fixes #6609
 2013-08-22 16:59:56 +02:00
Filip
ce7ac33a42 [DB/SAI] Vile Like Fire! 
Fixes #6524
 2013-08-22 15:53:31 +02:00
Vincent-Michael
34cd8e808e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
 2013-08-20 17:48:18 +02:00
Filip
d74b8f0a1a DB: Fixup for last file name 2013-08-20 00:46:56 +02:00
Shauren
8ae88954aa Delete 2013_08_19_02_world_sai.sql 
Removed file which broke the repo (tab in name)
 2013-08-20 00:31:05 +02:00
Filip
651285173d [DB/MISC]: To Rule The Skies (23061) & Onyx Scales 2013-08-19 23:46:39 +02:00
joschiwald
e0f010b310 Scripts: Random script fixes and code optimizations 2013-08-19 20:03:06 +02:00
Vincent-Michael
9727cc49ef Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-19 15:05:11 +02:00
Filip
5ec04483cb [DB/SAI] Rejek: First Blood 
Fixes #6113
 2013-08-19 01:17:14 +02:00
Vincent-Michael
f16f427c48 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Outland/Auchindoun/SethekkHalls/boss_anzu.cpp
	src/server/scripts/Spells/spell_hunter.cpp
 2013-08-18 18:13:14 +02:00
Vincent-Michael
c32dbd1432 Core/Spells: Fix hunter T7 4P Bonus 
Closes #8320
 2013-08-18 00:55:44 +02:00
Filip
865353e4a6 [DB/MISC] Spawn entry for TEMP Blackhoof Village Windmill 2013-08-17 23:28:32 +02:00
WishToDie
6a7ac8cef9 Fix typo in commit 7c7f19228e 2013-08-18 00:05:02 +03:00
w1sht0l1v3
1ad954e215 Core/Scripts: Placeholders for instances Maraudon and Dire Maul. 
It is needed for Random Dungeon Finder credit.
 2013-08-17 19:14:48 +03:00
w1sht0l1v3
7c7f19228e Core/Scripts: Placeholders for instances The Slave Pens and The Underbog. 
It is needed for Random Dungeon Finder credit.
 2013-08-17 17:50:33 +03:00
Filip
08133c7fef [DB/MISC] Appropriate GO id 2013-08-17 14:31:31 +02:00
w1sht0l1v3
0333d22fe9 Core/Scripts: Placeholder for instance Ragefire Chasm. 
It is needed for Random Dungeon Finder credit.
 2013-08-17 15:25:09 +03:00
w1sht0l1v3
7b9f34afc5 Core/Scripts: Placeholder for instance The Stockade. 
It is needed for Random Dungeon Finder credit.
Correct entry for last encounter in the instance.
 2013-08-17 14:59:49 +03:00
Filip
918427dcb1 [DB/SAI]: Unleash the Raptors (11147) 
Fixes #9728
 2013-08-16 22:45:23 +02:00
Filip
724f843d55 Merge pull request #10553 from MitchesD/creature_addon 
DB/Creature: Add missing creature_addon
 2013-08-16 13:40:16 -07:00
MitchesD
5a7fb5a6cf DB/Creature: Add missing creature_addon 2013-08-16 22:12:34 +02:00
Filip
a4f7f43319 DB Error fixes. 2013-08-16 21:33:39 +02:00
Vincent-Michael
74689b1d93 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-16 18:35:54 +02:00
Filip
99a3df6e20 [DB/SAI]: Digging Through Bones (10922) 
Fixes #3231
 2013-08-16 16:13:53 +02:00
MitchesD
90dcb2a448 Scripts/DrakTharonKeep: update Tharon'Ja 
- update Tharon Ja to BossAI
- update one creature - cosmetic npc

Closes #10524
 2013-08-16 14:34:42 +02:00
Xanvial
01178f5958 Core/Spells: Fix paladin talent "Grand Crusader" 
Closes #9072

Signed-off-by: Vincent-Michael <Vincent_Michael@gmx.de>
 2013-08-16 00:04:52 +02:00
Vincent-Michael
443940c084 DB/Spells: Fix shaman talent "Tidal Waves" drop charges with effect 1 2013-08-15 22:41:53 +02:00
Vincent-Michael
21fe779dfb Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-08-15 16:49:58 +02:00