Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
26,942 Commits 2 Branches 1 Tag
38f9421a2932d8f7f9701e0e10f87e3dee0efa8c
Commit Graph
26942 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
MitchesD 31eb2c5e0b Merge pull request #15483 from ShinDarth/335_quest_template 
DB/World schema backport: updated quest_template table
 2015-09-10 16:12:59 +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
Duarte Duarte 6cdfe9dc09 Merge pull request #15452 from Treeston/3.3.5 
Core/Unit: Allow mounting for certain transformations
 2015-09-09 08:37:03 -07:00
Aokromes 4295266886 Revert previous commit 2015-09-09 05:29:56 +02:00
Aokromes 46234c5f37 Build/Misc: Implement clang 3.6 2015-09-09 05:19:36 +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
Duarte Duarte ab5ecb7470 Merge pull request #15466 from M-Pan/3.3.5 
Config: Minor Typo
 2015-09-08 12:00:08 -07:00
m_pan 1503be010b Config: Minor Typo 
#    Updates.SourcePath   >   #    Updates.MySqlCLIPath
 2015-09-08 13:49:14 -05: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
Aokromes 1709282c2c Core/AHbot: fix seller guids 
closes ##18
 2015-09-08 05:16:08 +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
treeston d42a498063 Allow mounting while under transformations that can be cast while mounted. 
Closes #12042.

Credit to @SeTM for base code used.
 2015-09-07 19:04:44 +02:00
Killyana f1f922c910 DB/Object: Add Ore spawns in Felwood 
By @Malcrom
 2015-09-07 19:01:00 +02:00
Killyana c2ac6d7178 Quest: Threat from Above 
Fix double credit.
By: @Saben65
Clloses #15457
 2015-09-07 17:58:51 +02:00
Dr-J 53e9e43d3c DB/Quest: The Booterang: A Cure For The Common Worthless Peon 
More updates, 

1) remove random movement and spawn dist from creature as only peons with dazed & confused should have random movement
2) Peons with Lazy and Good for nothing and Dazed and Confused are friendly to players only peons which are defiant and enraged are hostile and attackable by players.
 2015-09-07 12:08:01 +01:00
Aokromes 29b0f94552 DB/Misc: Add missing item to fix startup error 
By Malcrom
 2015-09-07 06:05:51 +02:00
Aokromes 2808d8b578 DB/Misc: Fix some startup errors 
By Malcrom, king of fixes
 2015-09-07 05:29:57 +02:00