Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,203 Commits 4 Branches 146 Tags
65aec5f8f73157c1ea6efe130cbcee9dd4dc6597
Commit Graph

28203 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
ariel-
65aec5f8f7 Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Note: additional hand-picked ports from 6.x to fix build

Conflicts:
	sql/updates/world/2016_02_22_00_world.sql
	sql/updates/world/2016_02_22_01_world.sql
	sql/updates/world/2016_02_22_02_world.sql
	sql/updates/world/2016_03_07_00_world.sql
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/game/Scripting/ScriptLoader.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/CMakeLists.txt
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Commands/cs_ticket.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/OutdoorPvP/CMakeLists.txt
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/shared/CMakeLists.txt
	src/server/worldserver/CMakeLists.txt
	src/server/worldserver/Main.cpp
	src/tools/mmaps_generator/CMakeLists.txt
 2016-03-11 18:32:07 -03:00
Aokromes
b0b70d9d42 DB/Misc: 3.3.5a fixes 2016-03-10 19:41:46 +01:00
Dr-J
d1efa0b8b1 DB/Quest: Survey Alcaz Island Credit 
If you already had this quest in log prior you may need to abandon and retake/add quest before it will work as I had been trying to figure out why credit spell would not work even if cast on self, as soon as I removed and re-added quest worked

Thanks to @Kodekc
 2016-03-10 16:12:02 +00:00
Dr-J
5c064e1e73 DB/Misc: Lady Jaina Proudmore 
Few updates to 2b04a9c9d8 as found npc_text 7012 was assigned to gossip menu in db
 2016-03-10 14:27:30 +00:00
Dr-J
c9f9e93c22 Remove Lady Jaina Proudmores CPP script from zone_dustwallow_marsh.cpp 2016-03-09 23:31:36 +00:00
Dr-J
2b04a9c9d8 DB/Quest: Survey Alcaz Island 
Move Lady Jaina Proudmoore script (cw) to sai
Script turn in event for Survey Alcaz Island

Ref #16745 not closing issue yet as even though unrelated issue there maybe issue with credit (needs confirmation as works for me) but is currently delivered by spell_area which does not appear to be correct but the spell to give credit does not work otherwise not even if cast on self
 2016-03-09 23:28:25 +00:00
Nyeriah
c1905771f0 Scripts/Command: Solve several format exception crashes introduced in a recent commit 
Ref #16648
Closes #16751
 2016-03-09 00:42:45 -03:00
Aokromes
7770671eec DB/Misc: 3.3.5a fixes 2016-03-07 19:16:54 +01:00
Aokromes
613de493b9 DB/Loot: Fix Rampaging Worgen 
By thomas33, closes #15440
 2016-03-07 19:04:25 +01:00
DDuarte
a41bd8e943 Tools/MMaps: Add format library linking to mmaps_generator 
(Very) partial cherry pick of ed75b0649a
 2016-03-07 17:30:06 +00:00
Aokromes
7ee7548b94 DB/Misc: Fix some engrish 
By tkrokli closes #16648
 2016-03-07 10:35:33 +01:00
Aokromes
f7a05eba63 DB/Gameobject: Fix respawn time of few Quest GameObjects 
By Tauriella, closes #16701
 2016-03-07 10:32:57 +01:00
Duarte Duarte
2e1e608450 Merge pull request #16696 from TrinityCore/realm6xto335 
Core: Backport 6.x realm changes
 2016-03-07 00:06:37 +00:00
DDuarte
7b687be4ba Core/Auth: Fix the "Added realm" spam 2016-03-07 00:06:13 +00:00
Dr-J
83e8deaa8f DB/Quest: Troll Patrol: High Standards 
Closes #16734
 2016-03-06 21:59:07 +00:00
Dr-J
ce0e1c0fbe DB/Misc: A few updates 
1) Delete the duplicated spawns from 8aabb087f0
2) Correct targeting for text which was bought up on irc yesterday
3) Correct phasing for objects involved with http://www.wowhead.com/quest=13220/putting-olakin-back-together-again
 2016-03-06 21:28:52 +00:00
DDuarte
6cd63ca3d4 Core/Authserver: Partial port of 56cf7ff2a8 
Change the "UpdateIfNeed" logic to a deadline_timer
 2016-03-06 19:46:59 +00:00
DDuarte
2ea31027e5 Core: Backport 6.x realm changes 
Make acessible all the info about current realm (e.g name) anywhere, not only realm id
Reduce the number of differences between the two branches

Original changes by Shauren

Partial port of bacc90b6ba and 63def8aa32
 2016-03-06 19:46:59 +00:00
jackpoz
510bb30b2c Scripts/Misc: Fix issues reported by static analysis 2016-03-06 16:11:55 +01:00
Aokromes
9ba8fe52d2 Core/Quest: Remove duplicate things 2016-03-06 09:35:55 +01:00
ariel-
54b470fab6 Make it stop. Seriously 2016-03-06 04:48:19 -03:00
ariel-
effaed4e33 CI: non consistent behaviour of branch checkout FTW 2016-03-06 04:42:00 -03:00
ariel-
00a823cd7a Added docker mysql config 2016-03-06 04:38:18 -03:00
ariel-
9e56471658 CI: error was from gitlab, mysql *should* initialize properly /sigh 2016-03-06 04:29:33 -03:00
ariel-
691b0df6ae Core/Conditions: fix a memory leak for CONDITION_SOURCE_TYPE_TERRAIN_SWAP 
Reported by Aokromes.

(cherry picked from commit 3a7f311547)

Conflicts:
	src/server/game/Entities/Object/Object.cpp
 2016-03-06 04:08:04 -03:00
ariel-
efdaa4201f Install mysql too, apparently it's not included 2016-03-06 03:58:23 -03:00
ariel-
bf6eb656ee Core/Quests: initialize Emotes array 
Ref #59
 2016-03-06 03:52:42 -03:00
ariel-
95b6332bef Revert "Core/Auras: Should not remove other targets' aura if it keeps on same phase than caster" 
Was causing assertion fails in UnregisterSingleTarget, further research into the issue is needed.

This reverts commit d44dd09737.

Reopens #42
 2016-03-06 03:40:06 -03:00
ariel-
6ca676917b Gitlab CI: try three 2016-03-06 03:38:20 -03:00
Shauren
7fe5a77f5e Warning fix 2016-03-05 20:17:37 +01:00
Shauren
3d0b065135 Core/Commands: Fixed a crash in .wp mod by @Magnifikator 
Closes #16732
 2016-03-05 20:16:42 +01:00
Shauren
e73d5a7bf4 Core/Commands: Fixed incorrect use of GetGUID instead of GetSpawnId in waypoint commands 
Updates #16732
 2016-03-05 20:14:58 +01:00
treeston
49de12b1cf Unit/PlayerAI: Yeah, we allow charmer to be null now, should probably check for that. 
Fixes and closes #16728.
 2016-03-05 13:29:49 +01:00
Dr-J
431da2ffc9 DB/Quest: Drag and Drop 
Updates my previous script from before I actually sniffed this

The Aldur'thar Sentry will now actually grab the Dark Subjugator and drop of edge,
 2016-03-05 01:26:26 +00:00
sirikfoll
c4e4ee3ae1 Core/Scripts: Fixed Yogg-Saron Portals 
Closes #16390
Closes #16708
 2016-03-04 20:45:28 +01:00
treeston
f46a0e7eb3 Instance/SunkenTemple: Some cleanup. 2016-03-04 17:52:07 +01:00
Aokromes
d55d32fa0f Misc/Extractor: Add batch file for extractors 
You must copy it to your wow directory with the tools and run it.
Linux version is welcomed.
 2016-03-04 14:58:09 +01:00
ariel-
aa8ccda98a Gitlab CI: try two 2016-03-04 10:05:05 -03:00
Aokromes
2b2368a117 Update readme 2016-03-04 12:42:34 +00:00
ariel-
cda7b41884 Add .gitlab-ci.yml, first try. 2016-03-04 08:30:00 -03:00
MitchesD
a1b18a13fa Rename 2016_03_03_NPC_THRALL_WARCHIEF_world_335.sql to 2016_03_04_02_world_335.sql 2016-03-04 10:50:31 +01:00
MitchesD
e081bc36dc Merge pull request #16720 from tkrokli/npc_thrall_warchief 
Core/Scripts: npc_thrall_warchief hardcoded text
 2016-03-04 10:49:57 +01:00
Aokromes
6999e327f9 DB/Misc: Fix startup error 2016-03-04 08:49:17 +01:00
Aokromes
bb967ef84f DB/Misc: Fix startup errors 2016-03-04 08:40:26 +01:00
Aokromes
edfd85314e DB/Misc: remove 3.3.5a only fix 2016-03-04 08:18:16 +01:00
Aokromes
4f7948af31 DB/Misc: Fix startup errors 2016-03-04 08:13:25 +01:00
Aokromes
361e5640ae Rename 016_03_04_01_world.sql to 2016_03_04_01_world.sql 2016-03-04 08:11:44 +01:00
Aokromes
5b1ea3e4e5 Merge branch '4.3.4' of http://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2016-03-04 07:52:34 +01:00
Aokromes
dec2d5216c DB/Misc: 3.3.5a fixes 2016-03-04 07:51:56 +01:00
Aokromes
6cdd29611b DB/Misc: Fix startup error 
Closes #16721
 2016-03-04 06:10:40 +01:00