Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,959 Commits 4 Branches 146 Tags
966aa44ff4f51ac8e9812f7402e5ac9defe793cb
Commit Graph

8993 Commits

Author SHA1 Message Date
Aokromes
966aa44ff4 DB/Misc: 3.3.5a fixes 2015-10-18 11:32:45 +02:00
Aokromes
e3ea383237 DB/Misc: 3.3.5a Fixes 2015-10-14 10:25:01 +02:00
Aokromes
95618aa12a DB/Misc: Spawn Blackwing Descent 2015-10-02 00:51:43 +02:00
Aokromes
6ebca49afb DB/Misc: More Travis 2015-10-01 10:39:33 +02:00
Aokromes
412384b78a DB/Misc: More Travis 2015-10-01 10:29:43 +02:00
Aokromes
a0eb482902 DB/Misc: More travis fix 2015-10-01 10:04:41 +02:00
Aokromes
daba736b14 DB/Misc: Add misc 3.3.5a fixes 2015-10-01 09:39:28 +02:00
Aokromes
a72ef66712 Merge branch '4.3.4' of http://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2015-09-21 04:02:32 +02:00
Aokromes
99565a24ae DB/Misc: Naxx pathing 
By Malcrom
 2015-09-21 04:02:20 +02:00
Killyana
ff4c7cfb29 DB/Creature: Remove wrong spawns related to Zeplins 2015-09-20 23:46:48 +02:00
Aokromes
9c47205706 Fix typo 2015-09-19 16:15:51 +00:00
Aokromes
d199edd991 DB/Misc: Horde collectable critters (daily quests) 
By Joe Banks, closes #13
 2015-09-16 05:03:52 +02:00
Aokromes
63cb81257a DB/Misc: Misc Hoo fixes 
By Girip Dragos, updates #16
 2015-09-16 04:39:48 +02:00
Carbenium
38f9421a29 Merge branch '4.3.4' of github.com:Aokromes/TrinityCore into 4.3.4 2015-09-15 21:11:56 +02:00
Carbenium
221f1405b6 Merge branch '3.3.5' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	sql/updates/world/2015_08_29_00_world.sql
	sql/updates/world/2015_08_29_01_world.sql
	sql/updates/world/2015_08_30_00_world.sql
	sql/updates/world/2015_08_31_01_world.sql
	sql/updates/world/2015_09_02_00_world.sql
	sql/updates/world/2015_09_02_01_world.sql
	sql/updates/world/2015_09_02_04_world.sql
	sql/updates/world/2015_09_03_00_world.sql
	sql/updates/world/2015_09_03_01_world.sql
	sql/updates/world/2015_09_03_02_world.sql
	sql/updates/world/2015_09_03_03_world.sql
	sql/updates/world/2015_09_03_04_world.sql
	sql/updates/world/2015_09_03_06_world.sql
	sql/updates/world/2015_09_03_07_world.sql
	sql/updates/world/2015_09_03_08_world.sql
	sql/updates/world/2015_09_03_09_world.sql
	sql/updates/world/2015_09_03_10_world.sql
	sql/updates/world/2015_09_03_11_world.sql
	sql/updates/world/2015_09_04_00_world.sql
	sql/updates/world/2015_09_04_01_world.sql
	sql/updates/world/2015_09_04_02_world.sql
	sql/updates/world/2015_09_04_03_world.sql
	sql/updates/world/2015_09_07_00_world.sql
	sql/updates/world/2015_09_07_01_world.sql
	sql/updates/world/2015_09_07_02_world.sql
	sql/updates/world/2015_09_07_03_world.sql
	sql/updates/world/2015_09_07_04_world.sql
	sql/updates/world/2015_09_07_05_world.sql
	sql/updates/world/2015_09_08_00_world.sql
	src/common/Collision/Management/MMapManager.cpp
	src/common/Cryptography/Authentication/AuthCrypt.cpp
	src/common/Cryptography/Authentication/AuthCrypt.h
	src/common/Cryptography/HMACSHA1.cpp
	src/common/Cryptography/HMACSHA1.h
	src/server/CMakeLists.txt
	src/server/collision/CMakeLists.txt
	src/server/game/CMakeLists.txt
	src/server/game/Entities/Object/ObjectGuid.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/World/World.cpp
	src/server/scripts/CMakeLists.txt
	src/server/scripts/Commands/cs_cheat.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/worldserver/CMakeLists.txt
	src/server/worldserver/Main.cpp
 2015-09-15 20:42:34 +02:00
Aokromes
9ec2bad547 Merge branch '4.3.4' of http://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2015-09-13 18:49:23 +02:00
Aokromes
b3f1ce134d DB/Misc: Remove no longer existing achievement criteria ids 2015-09-13 18:41:32 +02:00
Killyana
1f0e703885 DB: Fix Some DB errors 2015-09-11 21:21:34 +02:00
Aokromes
5c23e0b61f DB/Misc: Fix Stratholme final boss 
Closes #21
 2015-09-11 11:49:40 +02:00
Aokromes
af84f0b153 DB/Misc: Fix travis 2015-09-11 06:26:54 +02:00
Aokromes
9cdc55d023 DB/Misc: Fix travis 2015-09-11 06:17:11 +02:00
Aokromes
5beae594af DB/Misc: Fix travis 2015-09-11 06:13:01 +02:00
Aokromes
4fda525eb3 DB/Misc: Typo fix 2015-09-11 06:01:20 +02:00
Aokromes
7d371065c8 DB/Misc: 3.3.5a fixes 2015-09-11 05:55:40 +02:00
ShinDarth
38cbefd3c4 DB/World schema backport: updated quest_template table 2015-09-10 15:54:56 +02:00
MitchesD
8abbb54ad0 Merge pull request #15459 from ShinDarth/quest_template_backport 
DB/World schema backport: updated quest_template table
 2015-09-10 13:17:13 +02:00
ShinDarth
33892e0f9d DB/World schema backport: updated quest_template table 2015-09-10 13:16:05 +02:00
Aokromes
1d71c64374 DB/Misc: More travis fix 2015-09-09 05:00:08 +02:00
Aokromes
fffb544b31 DB/Misc: Try to fix travis, again 2015-09-09 04:47:00 +02:00
Aokromes
5878cd46b5 DB/Misc: Sync 3.3.5a db spawns 2015-09-09 04:40:56 +02:00
Aokromes
556c413fcc Update 2015_09_09_00_world.sql 
copy&paste is evil.
 2015-09-09 04:39:45 +02:00
Aokromes
153c8fda6f DB/Misc: Fix startup errors 2015-09-09 04:37:31 +02:00
Killyana
90ef83ad05 DB/Gossip: Fix gossip menus with only one special option 2015-09-08 23:29:13 +02:00
Aokromes
76839694b0 DB/Misc: Missing newline 2015-09-08 21:10:26 +02:00
Killyana
77beb316dd DB/Gossip: Fix some weapon masters gossip menus 
Author: @tkrokli
Closes #15464
 2015-09-08 19:59:00 +02:00
Aokromes
0b8b2906ff DB/Misc: Update travis file structure 2015-09-08 19:21:19 +02:00
Killyana
9829ad846d DB/Quest: Generosity Abounds 
Add condition for the spell Iron Chain
Add cosmetic Exploding Abomination and fix visual issues.
Closes #15461
 2015-09-08 17:28:42 +02:00
Aokromes
b74a906bff DB/Loot: Fix some HoO loot 
By Girip Dragos, updates #16
 2015-09-08 05:26:47 +02:00
Killyana
da612f2041 DB/NPC: Argent Cannon 
Add the regen mana on spell casted, and set initial mana to 0.
Closes #15460
 2015-09-07 21:16:48 +02:00
Dr-J
a791663556 DB/Misc: Correction 
A correction as pointed out by Killyana, reversing faction update do peons with defiant and enraged change hostile rather then the peons with the other 2 buffs turn friendly, Ye I forgot about the dragonmaw illusion buff when testing.
 2015-09-07 19:57:53 +01:00
Aokromes
31713934be DB/Gameobject: Golden Sansam spawns 
By Malcrom
 2015-09-07 20:37:04 +02:00
Aokromes
410d76fba2 DB/Gameobject: Gromsblood spawns 
By Malcrom
 2015-09-07 20:31:43 +02:00
Aokromes
9cea79e08d DB/misc: make travis happy 2015-09-07 20:22:58 +02:00
Aokromes
d8d14fd444 DB/Gameobjects: Dreamfoil spawns 
By Malcrom
 2015-09-07 20:10:44 +02:00
Aokromes
a4564f2018 DB/misc: fix typo 2015-09-07 20:00:21 +02:00
Aokromes
091373d961 DB/Gameobjects: Purple Lotus spawns 
By Malcrom
 2015-09-07 19:58:09 +02:00
Aokromes
75a9c26033 DB/Misc: Fix typo 2015-09-07 19:55:00 +02:00
Killyana
fb9d4cba44 DB/Poi: Locales Poi 
Repush to fix characters encoding issue
 2015-09-07 19:33:08 +02:00
Killyana
cb4fc2e2eb DB/Pages: Locales pages 
Repush to fix characters encoding issue
 2015-09-07 19:30:23 +02:00
Killyana
6c5d473369 DB/Quest: "Where Kings Walk" and "Warchief's Blessing" 
By: @Rushor @xfurry  @Grz3s
Closes #15246
 2015-09-07 19:15:14 +02:00