Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
26,610 Commits 4 Branches 146 Tags
5426aa6d4e002014e1ec329db7b8a290772dae8f
Commit Graph

26610 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aokromes
5426aa6d4e Misc: Change Travis for 4.3.4 branch 2015-07-26 17:11:23 +02:00
Carbenium
a6e427bc28 Merge branch '4.3.4' into Gitlab434_4.3.4 2015-07-26 17:02:05 +02:00
Carbenium
81ae7c4eb6 Fix build after merge 2015-07-26 16:52:59 +02:00
Carbenium
86eb651757 Merge branch '3.3.5' into 4.3.4 
Conflicts:
	sql/base/dev/world_database.sql
	sql/updates/world/2015_07_14_00_world.sql
	sql/updates/world/2015_07_14_01_world_335.sql
	sql/updates/world/2015_07_19_00_world_2015_07_18_04.sql
	sql/updates/world/2015_07_19_05_world.sql
	sql/updates/world/2015_07_21_00_world.sql
	sql/updates/world/2015_07_24_00_world.sql
	sql/updates/world/2015_07_24_01_world.sql
	sql/updates/world/2015_07_24_02_world.sql
	sql/updates/world/2015_07_24_03_world.sql
	sql/updates/world/2015_07_24_04_world.sql
	sql/updates/world/2015_07_24_05_world.sql
	sql/updates/world/2015_07_25_03_world.sql
	sql/updates/world/2015_07_25_04_world.sql
	src/server/collision/Management/MMapManager.cpp
	src/server/collision/Management/MMapManager.h
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Weather/WeatherMgr.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/shared/Utilities/Util.cpp
 2015-07-26 16:52:35 +02:00
Aokromes
7f850af28e DB/Misc: More 3.3.5a fixes 2015-07-26 16:19:32 +02:00
Aokromes
1d1ac1050f DB/Misc: Fix import 2015-07-26 15:44:36 +02:00
Aokromes
33d42d2d01 DB/Misc: Fix import 2015-07-26 15:40:17 +02:00
Rushor
4508a53d00 DB/SAI: Update Southern Barrens 2015-07-26 14:48:03 +02:00
Aokromes
efad70639f DB/Misc: 3.3.5a to 4.3.4 auth database conversor 
(you can still use the same auth db for 3.3.5a)
 2015-07-26 13:58:42 +02:00
Aokromes
ebfee9b3c0 DB/Misc: 3.3.5a to 4.3.4 characters database conversor 2015-07-26 13:05:34 +02:00
Rushor
a3fd3b6569 DB/SAI: Elwynn Forest 2015-07-26 12:21:33 +02:00
joschiwald
66bbdfb82c Merge pull request #15164 from LuqJensen/mimiron 
Scripts/Ulduar: Fix a visual issue with Mimirons Rocket Strike and Fix Mimiron DB target attacking players
 2015-07-26 03:35:40 +02:00
Unholychick
0d5a0c81a8 Scripts/Ulduar: Fix a visual issue with Mimirons Rocket Strike 
In p2 he should fire left or right rocket at random, not always left one. ref https://www.youtube.com/watch?v=oY-nZ0EjDRw

Fix Mimiron DB target attacking players.
 2015-07-26 03:30:29 +02:00
Vincent-Michael
fd26c3c87c Core/Misc: Added new error logs for gameobject_questitem / creature_questitem tables 
(cherry picked from commit 2fcab335df)
 2015-07-26 01:21:13 +01:00
DDuarte
4476f6c867 DB/Ulduar: Fix Mimirons Rocket Strike not dealing damage in 25man mode 
(cherry picked from commit acd3fe5807)
 2015-07-26 00:45:03 +01:00
Rushor
c5f178afc6 DB/SAI: Update Northern Barrens 2015-07-26 00:10:08 +02:00
jackpoz
e008ae7520 Core/Misc: Update helgrind suppressions 2015-07-25 23:50:29 +02:00
Vincent-Michael
730ddaf0bf Core: Fix non pch build 2015-07-25 23:21:25 +02:00
Vincent-Michael
d2d4bc2668 Core: Header cleanup in game/*/*.cpp 
(cherry picked from commit 2e586bc520)

Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/DataStores/DB2Stores.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/ObjectGuid.cpp
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectAccessor.cpp
	src/server/game/Handlers/BankHandler.cpp
	src/server/game/Handlers/CombatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TokenHandler.cpp
	src/server/game/Handlers/VoiceChatHandler.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Packet.cpp
	src/server/game/Server/Packets/SpellPackets.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellScript.cpp
	src/server/game/Warden/Warden.cpp
	src/server/game/Warden/WardenWin.cpp
	src/server/game/Weather/WeatherMgr.cpp
 2015-07-25 21:53:30 +01:00
Rushor
97929e70c1 DB/SAI: Update Mount Hyjal 2015-07-25 22:32:14 +02:00
Rushor
5b762e9ff7 DB/SAI: Update Moonglade 2015-07-25 21:27:59 +02:00
Rushor
c796b01b42 DB/SAI: Update Loch Modan 2015-07-25 21:20:24 +02:00
Shauren
f03f5cc1f2 Buildsystem/MSVC: Enabled /bigobj for all x64 build types 
(cherry picked from commit 52127197ec)
 2015-07-25 16:42:46 +01:00
Shauren
130878c1a5 Core/Collision: Removed direct GameObject references from collision project 
(cherry picked from commit a029f97c82)

Conflicts:
	src/server/collision/Models/GameObjectModel.cpp
 2015-07-25 16:22:33 +01:00
Rushor
1681246e54 DB/SAI: Update Isle of Queldanas 2015-07-25 17:20:23 +02:00
Rushor
090c9b8c45 DB/SAI: Update Felwood 2015-07-25 17:13:19 +02:00
MitchesD
c40d3be6dc Core/SmartScripts: added new action SMART_ACTION_COMBAT_STOP 
* this avoid using hacks like evade, faction change or rooting. I wonder how SAI could be without this

(cherry picked from commit d68df33c76)
 2015-07-25 16:54:25 +02:00
Aokromes
0ece8e2734 Merge branch '4.3.4' of http://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2015-07-25 16:43:28 +02:00
Aokromes
ac4b601e7a Move files to proper places 2015-07-25 16:42:44 +02:00
Rushor
1eb34fc3a0 DB/SAI: Update Dustwallow Marsh 2015-07-25 16:30:17 +02:00
joschiwald
8a9f1b871a Scripts/Ulduar: fixed freya loot and added missing conditions 
thanks @Keader

Closes #15098
 2015-07-25 15:28:39 +02:00
Aokromes
2f74e5099c Readme: Revert incorrect commit 2015-07-25 13:44:09 +02:00
Rushor
7e2b3ea459 DB/SAI: Update Dun Morogh 2015-07-25 10:56:29 +02:00
Rushor
2aaab040ce DB/Quest: A Flawless Plan 
* closes #12190
* thanks to @Pitcrawler + @Killyana for missing Spawns
 2015-07-25 08:52:47 +02:00
Aokromes
15e020a77f DB/Misc: More 3.3.5a fixes 2015-07-25 03:23:22 +02:00
Aokromes
8b92c83f6b Update 2015_07_24_07_world.sql 2015-07-25 03:16:05 +02:00
Aokromes
b86f678a8b DB/Misc: Revert incorrect moves 2015-07-25 03:03:29 +02:00
Carbenium
2fde367029 Merge branch '4.3.4' into Gitlab434_4.3.4 2015-07-25 02:50:18 +02:00
Carbenium
24c19fe8b4 Core/ObjectGuid: revert some changes from merge 2015-07-25 02:04:48 +02:00
Killyana
6bac7d0120 DB/NPC/Quest: Grizzly Hills Giant and Rallying the Troops 
Close #14781
 2015-07-25 02:00:32 +02:00
Carbenium
bc8f5194c4 Merge branch '4.3.4' into Gitlab434_4.3.4 2015-07-25 01:16:50 +02:00
Carbenium
ab0d8cec6d Core/Quest: Fix loading quests after merge 2015-07-25 01:02:55 +02:00
Rushor
6ce6445e38 DB/Spawn: Dark Iron Brewer 2015-07-25 00:51:45 +02:00
Rushor
a4b551ceb5 DB/Quest: Into the Soulgrinder 
* much thanks to @Killyana for all the Updates
* updates issue #3178
 2015-07-25 00:14:42 +02:00
Rushor
312da02d94 DB/Misc: Northwatch Foothold + Razor Hill Updates 2015-07-24 23:10:54 +02:00
Kilyana
09b11e2195 DB/NPC: Dark Iron Brewer 
closes #15047
 2015-07-24 22:32:46 +02:00
Carbenium
ad99eb8dfe server starts now successfully. login is possible 2015-07-24 22:15:10 +02:00
Rushor
af54aaf6d8 DB/SAI: Update Winterspring 2015-07-24 20:31:52 +02:00
Rushor
3950ea3881 DB/SAI: Update Feralas for 3.3.5 
* closes #15126
* updated by @Killyana
 2015-07-24 19:42:25 +02:00
Killyana
3bfdb548dd DB/Item: Sack of Ulduar Spoils / Large Sack of Ulduar Spoils 
* closes #15059
 2015-07-24 19:20:05 +02:00