Commit Graph
100 Commits
Author SHA1 Message Date
DDuarte 01f7bacd05 Tools/VMapExtractor: Port 060256000b 2016-08-04 18:09:54 +01:00
DDuarte da50b5c9b3 DB/Commands: Update help description of .account (set) addon with new expansions 2016-08-02 21:20:57 +01:00
Duarte Duarte bd415eb586 Add AppVeyor Build badge to the README 2016-07-31 22:43:22 +01:00
DDuarte b9ec8ae328 Scripts/Commands: Fix build warning
(cherry picked from commit 42028a18421f672a3292733cac73840c4e766089)
2016-07-05 11:56:04 +01:00
DDuarte 7ab5145321 Scripts/Commands: Remove unused argument of .cometome command
(cherry picked from commit 1100fe60572b186eee98b6b7cbdccf5a2d67b7e1)

# Conflicts:
#	sql/updates/world/3.3.5/2016_07_05_01_world.sql
2016-07-05 11:23:04 +01:00
Duarte Duarte 7ec0d94119 DB/Schema: Add missing PK to world.playercreateinfo_cast_spell 2016-06-19 22:49:16 +01:00
DDuarte 8b26aea95a Implement real time statistic visualization (#16956)
Docs at https://trinitycore.atlassian.net/wiki/display/tc/Monitoring+a+TrinityCore+server

* Common/Graphs: Initial proof of concept

* Move influx db code to its own class

* Reuse the same socket

* Allow to log values of different categories

* Allow to log events

* Pass the timestamp to influxdb

* Send events in batches

* Send data async

* Log server shutdown.
Fix memory leak.

* Allow to enable/disable Stats in the settings and at runtime

* Read interval between each batch send from config

* Add InfluxDB connection info to configs

* Move each event category to its own table

* Log pathfinding queries

* Move categories table initialization to constructor using enum as key to avoid assigning the table name to the wrong enum value

* Log player login/logout events.
Pass the hostname correctly in the HTTP request.

* Fix linux build

* Handle "Connection: close" HTTP header, reconnecting on next scheduled send.
Disable StatsLogger if connection fails, logging the error.

* Add an enum for categories of logged values, it's still possible to pass a string instead of the enum.

* Don't log the whole batchedData when InfluxDB returns an error, it's too long and unreadable on console.

* Allow to call a function at a specified interval in thread-safe World::Update() context to log data like player count.

* Log map tile load/unload

* Core/StatsLogger: Allow logging more value types other than ints

https://docs.influxdata.com/influxdb/v0.10/write_protocols/write_syntax/

* Fix a typo in string escape of StatsLogger

* Yet more fixes to the escaping in FormatInfluxDBValue

* DB/Gameobject: Fix respawn time of few Quest GameObjects

By Tauriella, closes #16701

* DB/Misc: Fix some engrish

By tkrokli closes #16648

* Tools/MMaps: Add format library linking to mmaps_generator

(Very) partial cherry pick of ed75b0649a

* Core/StatsLogger: Simplify code

Convert values and categories arrays to maps initialized in-place
Remove constructor and destructor

* Core/StatsLogger: Add realm name to the event and value tags

* Log amount of processed packet of each session

* Apply recent singleton changes to sStatsLogger too

* Fix influxdb data format if no realm name is present

* Remove unneeded newlines from request body, fixes response 400 from InfluxDB 0.10

* Rename Reporting folder to Metric

* Rename StatsLogger to Metric

* Rename InfluxDB configs to Metric

* Add Grafana dashboards

* Add a random annoying macro

* Move string formatting to Metric::SendBatch(), reducing performance footprint of Metric::LogEvent() and Metric::LogValue()

* Update grafana graphs refresing tags on load and showing now-15m data, refreshing every minute. These settings can be modified in grafana.

* Rename MetricData fields

* Contrib/Grafana: Rename dashboard files

* Contrib/Grafana: Replace hardcoded Windows/Ubuntu realm names by the default, Trinity

* Config/Worldserver: Add missing section to the index

* Contrib/Grafana: Add singlestat panels with current online players, update diff averages (1 min, 5 mins and 15 mins)

http://i.imgur.com/Zi8lfvS.png

* Core/Metric: Replace the enums MetricEventCategory and MetricValueCategory by strings

For the sake of simplicity and less recompile time when adding new metrics, similar to how TC_LOG_* works

* Contrib/Grafana: Display the current number of online players and not its average

Closes #15075
(cherry picked from commit 3ae10160820782d039c3449107960108fb3a63b9)

# Conflicts:
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/World/World.cpp
#	src/server/worldserver/Main.cpp
2016-06-04 11:26:57 +01:00
DDuarte e873006153 DB/Strings: Fix a .npc info crash
Fixes #17066
2016-05-02 16:01:07 +01:00
Duarte Duarte 71a7f96e22 Scripts/SWP: Remove unused #defines 2016-05-02 03:09:08 +01:00
DDuarte e7c203334b Scripts: Add missing override 2016-04-19 01:37:17 +01:00
DDuarte 5299e25d25 Core/Items: Move Item::GetSkill to ItemTemplate::GetSkill
Also moved some methods of ItemPrototype to .cpp

Thanks to Yehonal for the original patch

Closes #16884

(cherry picked from commit 0257aa05280651b48e07e89950ad6ad5becfe9d2)

# Conflicts:
#	src/server/game/Entities/Item/Item.cpp
#	src/server/game/Entities/Item/ItemPrototype.h
2016-04-17 00:30:48 +01:00
DDuarte 37a79bde97 Travis: Remove libzmq apt-get 2016-04-16 20:38:45 +01:00
DDuarte 8778829a98 SQLs: Update to the /sql/updates organization
Update SQL files should now be in a sub-folder equal to the current branch name

/sql/updates/auth/*.sql -> /sql/updates/auth/6.x/*.sql
/sql/updates/characters/*.sql -> /sql/updates/characters/6.x/*.sql
/sql/updates/hotfixes/*.sql -> /sql/hotfixes/world/6.x/*.sql
/sql/updates/world/*.sql -> /sql/updates/world/6.x/*.sql

This facilitates merges between the version branches
2016-04-16 18:48:11 +01:00
DDuarte eaaee4b7c0 Core/Players: Fix flight form & fall damage (#16955)
(cherry picked from commit fcbbc60b93625211d958431461345fede9dcbe46)
2016-04-16 18:35:30 +01:00
DDuarte 4e0b0e76c9 Core/Quests Fix Quests Borrowed Technology, Volatility and The Solution Solution (#16968)
(cherry picked from commit d1a053e4f5a29f96b3300397e16d3e63a1cf9bae)

Rename sql

(cherry picked from commit 41e776fe64e2072d165b990cc9e9d2bfdd698855)
2016-04-16 18:22:35 +01:00
DDuarte e8179e107b Merge branch '3.3.5-gluth' into 3.3.5 (PR #14865)
(cherry picked from commit b11545800190795de5573fb917e81f61b774427b)
2016-04-16 18:21:22 +01:00
DDuarte 00da19ed9e Merge remote-tracking branch 'sirikfoll/geddon' into 3.3.5 (PR #16975)
(cherry picked from commit 75f7b5ae4baa4eeb8f6e28e2270536274bfecd4c)
2016-04-16 18:20:11 +01:00
DDuarte 98a8f539b4 Merge remote-tracking branch 'sirikfoll/bossAhune' into 3.3.5 (PR #14884)
(cherry picked from commit 37067ad3905059753f38254e72dae62cd2db2ce6)
2016-04-16 17:20:57 +01:00
DDuarte 92905cdaae Update revision_data.h.in.cmake and the updates in base SQLs 2016-04-11 03:28:07 +01:00
DDuarte a1f59c9d8d TDB 6.04 - 2016/04/11 2016-04-11 02:42:03 +01:00
DDuarte 580773dc1a DB/Creature: More exterminations
This time in the Halls of Anguish in Black Temple
ALso script Mutant War Hound
(cherry picked from commit f93d91aa1b7e49edb1b7fd1380abaf83083e6acc)

# Conflicts:
#	sql/updates/world/2016_04_10_00_world.sql
2016-04-11 01:24:59 +01:00
DDuarte 75ff256cc4 Core/SAI: Typo fix of 77087db79318443fff1b6fe3c91b55a315c5bf92
There's no %b, silly

(cherry picked from commit 7a252fc648168bdcaf55318b8d40c015498e9d0f)
2016-04-02 14:52:27 +02:00
DDuarte 252220ed6e Core/SAI: Code improvements to SMART_ACTION_RANDOM_SOUND
Warning fixes and extra sanity checks

Ref #16376

(cherry picked from commit 77087db79318443fff1b6fe3c91b55a315c5bf92)
2016-04-02 14:52:15 +02:00
DDuarte 0afcefea27 Core/Config: Fix 3 more missing config warnings
Closes #16861

Thanks tkrokli
2016-03-31 03:31:21 +01:00
DDuarte 9431b94bff Core/Config: Error logging for ptree_bad_data
Ref https://github.com/TrinityCore/TrinityCore/commit/6487e2f2d6a1ddbeff77362219658376b8a3f9f0#commitcomment-16888976
2016-03-31 03:19:27 +01:00
DDuarte 7f8cd123c4 Core/PacketIO: Properly send normalized realm names
Ref #14949
2016-03-28 23:10:44 +01:00
DDuarte 13db756f9d Core/Config: Remove references to Arena.QueueAnnouncer.PlayerOnly which hasn't been used since 3dd6fdedf7
Ref #16859

(cherry picked from commit 5f3262ff19e5c92b6ff3f885e38c973ca40dc7bc)

# Conflicts:
#	src/server/game/World/World.cpp
2016-03-28 03:18:42 +01:00
DDuarte b372935ce3 Typo fix 423bded9a6 2016-03-28 03:17:51 +01:00
DDuarte be573a7aa4 Core/AHBot: Add missing AuctionHouseBot.Class.CLASS.Allow.Zero to config
Ref #16859

(cherry picked from commit 92be9ad7ad087328210773bfc24ec99d99cae1fb)
2016-03-28 02:37:08 +01:00
DDuarte 423bded9a6 Core/Network: Change SocketMgr.StartNetwork to take the thread count by arg instead of config
AuthSocketMgr doesn't need "Network.Threads" config

Fixes "Missing name Network.Threads in config file authserver.conf"

Ref #16859

(cherry picked from commit 980f28d2ce099f524abdb6faed3fe59ce4c0963a)

# Conflicts:
#	src/server/authserver/Server/AuthSocketMgr.h
#	src/server/game/Server/WorldSocketMgr.cpp
2016-03-28 02:36:58 +01:00
DDuarte 06b3bca0d2 Core/Startup: Warn when a config key isn't found in the config files
Example: "Missing name Guild.SaveInterval in config file worldserver.conf, add "Guild.SaveInterval = 15" to this file"
2016-03-27 23:48:17 +01:00
DDuarte 0d643fdff2 Build fix 2016-03-23 00:34:47 +00:00
DDuarte 9660848385 Scripts: Add override to CheckInRoom() definitions
Fixes -Winconsistent-missing-override

(cherry picked from commit ac727ab208e592c7a2d01ebe321944402860c3ae)
2016-03-22 23:42:16 +01:00
DDuarte cb7238e983 Core/Instances: Fix build in older VS versions
Relax const uses in BossBoundaryEntry so the compiler can generate proper
copy assignment operator (error C2582: 'operator =' function is unavailable in 'BossBoundaryEntry')

Also renamed its members to match our coding standards
(public members should be UpperCamelCase)

(cherry picked from commit 954323d9cb13d4ab3d478bcb51eeb157009d8853)
2016-03-22 23:41:10 +01:00
Duarte Duarte af0da1dde1 Merge pull request #16101 from NathanHandley/3.3.5
Updated AuctionHouseSeller to have item class stack control
(cherry picked from commit bddf9ec6febc9a77308d074bd10db2ddec4b48d5)
2016-03-21 23:33:00 +01:00
DDuarte 849c906014 CMake/Revision: Use raw strings in path/executable #defines
Fixes some possible warnings (e.g. "warning C4129: 's': unrecognized character escape sequence")
especially on Windows
2016-03-02 02:11:44 +00:00
DDuarte a939a3119f Fix non PCH build after 67b977c86a 2016-03-02 02:03:49 +00:00
DDuarte 43f9fdecff Minor 67b977c86a typo fix 2016-03-02 01:46:37 +00:00
DDuarte 67b977c86a Merge branch 'pets' of https://github.com/myran2/TrinityCore into myran2-pets
# Conflicts:
#	src/server/game/Handlers/PetHandler.cpp
#	src/server/game/Handlers/SpellHandler.cpp
#	src/server/game/Server/Packets/PetPackets.cpp
#	src/server/game/Server/Packets/PetPackets.h
#	src/server/game/Server/Protocol/Opcodes.cpp
#	src/server/game/Server/WorldSession.h
2016-03-02 01:38:39 +00:00
DDuarte 147322b570 Github: Minor updates to issue and PR templates 2016-02-29 16:02:49 +00:00
DDuarte 78f89c51de And a typo fix ☕ 2016-02-29 11:22:10 +00:00
DDuarte de7c3c8e1c Core/Packets: Move flushbits to the correct place in SpellDispellLog 2016-02-29 11:21:25 +00:00
DDuarte 5576f06f20 Fix build and add a missing FlushBits to SpellDispellLog::Write() 2016-02-29 01:59:53 +00:00
DDuarte f76771dca0 Core/Packets: Updated and enabled SMSG_SPELL_DISPELL_LOG 2016-02-29 01:54:18 +00:00
DDuarte ce0deb1013 Core/Packets: Enabled CMSG_REQUEST_VEHICLE_SWITCH_SEAT and CMSG_RIDE_VEHICLE_INTERACT 2016-02-29 00:46:36 +00:00
DDuarte a07337967b Core/Packets: Updated and enabled SMSG_SPELL_DELAYED 2016-02-29 00:23:23 +00:00
DDuarte b6b5665158 Give emphasis to the steps part of issue_template.md 2016-02-17 20:59:05 +00:00
DDuarte 08e6294c80 Also add a template for new Github pull requests
https://github.com/blog/2111-issue-and-pull-request-templates
2016-02-17 20:33:23 +00:00
DDuarte a624b4523f Fix typos and shortify issue template 2016-02-17 20:22:12 +00:00
DDuarte 4944802399 Add a Github issue template
https://github.com/TrinityCore/TrinityCore/issues/new
2016-02-17 19:53:19 +00:00
Duarte Duarte 6b529fcd43 Core/DBUpdater: Fix help text download link
Change from forums to GH Releases
2016-01-04 22:51:48 +00:00
DDuarte ff9c999334 Core/Utilities: Fix build in some versions of Ubuntu / GCC
Closes #16125
2016-01-03 20:39:13 +00:00
Duarte Duarte 7b15207902 Merge pull request #16120 from velinath/patch-1
AHBot item class modifiers
2015-12-29 03:52:07 +00:00
Duarte Duarte a53a8fff98 Merge pull request #15582 from mthsena/3.3.5
Config: Typo/Cosmetic changes
(cherry picked from commit 07204140428886f5071cfe3a14dd5d50988268b2)
2015-09-25 00:21:17 +02:00
Duarte Duarte c65aa4cbbe Merge pull request #15579 from M-Pan/3.3.5
Config ; Minor Typo
(cherry picked from commit 7c4dd4059e69e062b60b34d49e1970e4b0d99cd5)
2015-09-25 00:20:39 +02:00
Duarte Duarte 3b1ae19371 Merge pull request #15577 from M-Pan/3.3.5
Revise MaxPrimaryTradeSkill comment

Closes #15575
(cherry picked from commit f7e9acb6edc5c87c95ab2d4ac30394226fa7d215)
2015-09-25 00:20:12 +02:00
Duarte Duarte eb65c8051c Merge pull request #15452 from Treeston/3.3.5
Core/Unit: Allow mounting for certain transformations
(cherry picked from commit 6cdfe9dc095bd19ea495c22cb41cd82f1212b6cd)
2015-09-25 00:03:23 +02:00
Duarte Duarte cdbed0af4c Merge pull request #15550 from Keldo/6.x
Core/Opcode Changed for Bug Tickets
2015-09-20 07:02:45 -07:00
DDuarte f979b28402 Build fix 2015-08-16 22:51:08 +01:00
DDuarte b9106ee000 Add a missing include of d5cf594bfe
(cherry picked from commit 90c9290761ecb7849a036d82c2b93f64920164c6)
2015-08-16 01:10:01 +01:00
DDuarte 5aaf44fc66 Fix build warnings addded in d5cf594bfe 2015-08-16 00:45:07 +01:00
DDuarte 519ba47429 Build: Add 1.59 Boost version to FindBoost 2015-08-15 17:48:00 +01:00
DDuarte 55acb20f6d Core/Bnetserver: Catch and log an exception that happens when WorldserverListenPort is already used
Closes #15284
2015-08-15 12:36:19 +01:00
Duarte Duarte f7a6a93dfb Merge pull request #15251 from xerkoss/patch-3
[Core\Quests] Add missing learn spell objective check.
2015-08-11 16:08:20 -07:00
Duarte Duarte 8ad51b5a6e Merge pull request #15243 from StormBytePP/6.x
Fixed a warning about override keyword missing
2015-08-09 09:47:18 -07:00
DDuarte 57ced3ccbd Fix SpellAurasEffects build on GCC 5.1
Closes #14655
2015-07-31 16:23:29 +01:00
DDuarte cec583c5e2 DB/Commands: Update .additemset description
On 6.x, this commands adds one item of each level if the itemset has multiple levels.

Closes #15179
2015-07-29 00:59:27 +01:00
Duarte Duarte 21a70dbab0 Merge pull request #15145 from pete318/runeforging6x
[6.x] Core/Spell: Learn DK runeforging skill, when receving the spell book ability.
2015-07-28 11:16:06 -07:00
DDuarte 738289daf7 Rename SQL after merge
Also removed tabs
2015-07-28 18:57:31 +01:00
Duarte Duarte 8d0e3ad93f Merge pull request #14924 from Golrag/calendar
Core/PacketIO: CalendarPackets:
2015-07-28 10:52:23 -07:00
DDuarte e2fb3bbd46 Build/CMake: Partially revert recent changes to FindMySQL.cmake
Looking for folders like ".../MySQL/*/include" matches the MySQL Connector C libs which caused some problems.
Related #15072, #15068

P.S ".../MySQL/MySQL Server*/include" doesn't work
2015-07-27 01:10:42 +01:00
DDuarte 2db1ccbc79 Fix SQL import 2015-07-26 00:52:32 +01:00
DDuarte acd3fe5807 DB/Ulduar: Fix Mimirons Rocket Strike not dealing damage in 25man mode 2015-07-26 00:44:11 +01:00
Duarte Duarte 9016fb078a Merge pull request #15155 from StormBytePP/6.x
Correctly displaying error message when libZMQ is not found

Closes #15152
2015-07-25 13:18:57 -07:00
DDuarte 7d9843c380 Core/Misc: Add a few consts to methods 2015-07-22 23:24:56 +01:00
Duarte Duarte b8d169f64f Merge pull request #14946 from AriDEV/6.x
Core/Entities: Update for CombatRatings.
2015-07-19 14:22:47 -07:00
DDuarte 57da378dea Core/SAI: Fix some weird code in SmartAIMgr::IsTextValid
Additions to cb0e6cac63
2015-07-19 21:54:48 +01:00
DDuarte cb0e6cac63 Core/SAI: Fix an issue in IsTextValid when using guids
Fixes #15122
2015-07-19 17:19:41 +01:00
DDuarte 2422cb9c4d DB/World: Change spell_area.racemask to INT(10) since mediumint is too small for some valid values 2015-07-19 04:20:43 +01:00
DDuarte 727de0ef8d DB/Loot: Add conditions to gem drops of Ghost Iron
Addition to d284b5d437
2015-07-19 04:11:08 +01:00
DDuarte dd8f301e16 Core/Globals: Rename AddCreData -> AddCreatureData and MoveCreData -> MoveCreatureData
(cherry picked from commit 5ceb3fd0ab3644f9515e11dea36f7b00316e4136)

Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/OutdoorPvP/OutdoorPvP.cpp
2015-07-19 01:55:12 +01:00
DDuarte 35ffea8d21 Fix warning (build) 2015-07-15 02:26:45 +01:00
DDuarte f5e92f6537 TDB 6.0.2 - 2015/07/14 2015-07-14 00:05:36 +01:00
DDuarte 28b3430b0c DB/World: Cherry-pick 10 commits from 3.3.5
0348c1cae887bc788c1f611a08482156f15c3506 DB/Misc: Fix a runtime error By Killyana, updates #14730
80f73fafb41e288632d5532d2f3a165441df560a DB/Quest Hellfire Fortifications By Killyana, closes #15051
831199b6f75a292f42efb671db2ac1a3eccaa8b1 DB/Gameobject: Dark Keeper Nameplate By Killyana, closes #6915
312b3a56d90189123bd85e82cf6504c3c7f612be DB/Quest: Slaves to Saronite By Killyana, closes #7318
7b7c4b91d968121b24f296e0e211d4027138d3cd DB/Quest: The Challenge By Killyana, closes #4802
627c10da50baeeb01d95bd89854fa48075a98c92 DB/Misc: The Grim Guzzler fight By Killyana, closes #14631
1ecb8695d8bf2e69db869f49400f1be732a914c9 DB/Creature: Senani Thunderheart gossip By tkrokli, closes #14861
a0c43da18865e065d011c6323e094f87db586c78 DB/Creature: Fixing some spawns on The Frozen Halls entrance By Killyana, closes #15014
9154dd667c4aa8a1216616290adbf627dea10af5 Update 2015_07_12_02_world.sql
af8e9738036e2947e31b1f11bc01f7565f988376 DB/Misc: Fix startup error By Killyana, updates #14730
2015-07-12 23:50:22 +01:00
DDuarte 828e2bdd02 DB/World: Cherry-pick 27 commits from 3.3.5
221a874d707d0a9982db230cb3db524eb9e879c0 DB/Quest: Rivenwood Captives By Killyana, closes #3648
dbaf88566be7083408fb8324d7886dc3e0a45cc0 DB/Text: Fix wrong broadcast text id
f5530c719b71309bd476aff528b0d3e1220ca49b DB/Misc: Megzeg Nukklebust By @tkrokli Closes #14863
d08524cfeb9028ead9c378cf18ddf21c63c88a2a DB/Path: Sunreaver Hawkrider in Crystalsong Forest
b067f20f4a0e5ba02b4026a7edae3a5d161e46c6 DB: Fix date for file
0d66b1917e53b38f5a0b6ee44c59e76315405bd6 DB/Path: Silver Covenant Horseman in Crystalsong Forest/Windrunner's Overlook
89c6e5dcf4d8a4168802171b80dca2a3330d2d19 DB/Misc: Various fixes * Quest rewards for Kael'thas and the Verdant Sphere - Closes #14452 * Quest rewards for The Cipher of Damnation - Closes #14879 * VOA Meeting stone - Closes #10502 * Fix a db error
6af3bc69970d3009a8e193fd2d3041232fbbd3e7 Fix file name
170ba68e63c46323f8624ecff24e6de1d38bd97b DB/Quest: Hellfire Fortifications By tkrokli, closes #14887
d5c84d5aaafdb3960e0f497168bcf87c0ae93702 DB/Path: Gundrak Savage pathing
20e3da1e5b3e366dc3f79d869078862e6f399f78 Fix file name
c8ee638517777d1a0e14c55f26341da8fa6d1f21 DB/Quest: Fix 2 swapped values of midsummer event
a29433fbab6e6fe023413af1c9d2d850328f6ac0 DB/Quest: I've Got a Flying Machine Closes https://github.com/TrinityCore/TrinityCore/issues/14965 By Killyana
791356c27e8ec68a49018009d7d1202d9efea2f5 DB/Oculus: mob missing spells / visuals
e243df4df92e477509c37ac4fd54e49c71e79cd0 DB/Oculus: typo in sql
813a903746c9e5d8915453309c38259a635c086a DB/Misc: Fix startup errors By Killyana, updates #14730
7e5307b9f36bb2afb4c368e1a09ff96cf5d9af4f DB/Creature: Innkeeper Keldamyr By MrSmite, closes #12474
77d083eb16758832bf465d460ff6275ba8de8445 DB/Quest: The Perfect Dissemblance By Killyana, closes #12439
9132cfe5e317f8fc4c58a7eb2c39d4f0e82002df DB/Quest: A Race Against Time By Killyana, closes #1074
d3590f92c21b7a36bd2410eb17dfde068510e22a DB/Quest: Master the Storm By Killyana, closes #1883
3720be33e15426ddc3a52edf0a31044d01a8d63e DB/Gameobject: Silithyst Mound By Killyana, closes #14637
5b6cbe88d3fda2dc2097319d912204dba8f3233d Update 2015_06_28_02_world.sql
6527046ede419d35a769621bc55d911e52744494 DB/Misc: Fix a runtime error By Killyana, updates #14730
5ff80739ef0031c1a93c6550062742bf2efd209e DB/Creature: Fixing some auras set with a wrong event By Killyana, closes #14875
7c7d258482cb541b9a57fd9ff9b64f01c51cf4cb DB/Misc: Brewfest - Wrong item in vendors By sirikfoll, closes #14989
fd299c53dc491de4dd7b8cfaa2c5b07e31dbd4be DB/Misc: Spawn several missing gameobjects and creatures in The Eye - Several pack of mobs and triggers spawned - Spawned doors at Kael's room - Corrected spawn coords for Kael'thas and his advisors from sniffs - Removed improper spawns of Ember of Alar
b4a293fd346d622e25e30fca8fe5206be2da3745 SQL: Quickfix a typo
2015-07-12 23:21:42 +01:00
DDuarte 5ee65e0c37 DB/World: Cherry-pick 20 commits from 3.3.5
e500cda6a90f1308cfa40e238feb5b0fb70a1852 DB/Creature: Howling Fjord - Movement - Niffelvar - Part V
7220b448992eacb5c3b419eda2c00328714b2b77 DB/Creature: Howling Fjord - Movement - Bealgun + Agamand - Part VI
8f35186475fb561e883907fb9349b6905b411685 DB/Creature: Winterskorn Hunter - Add 2 Missing Spawns
833a0d2ea52009ea302fedda02882a3e9bd86286 DB/Creature: Reinsert wrongly deleted Creatures
3d8ae16c0049dbb1eac478d978537e076c3cad3f DB/Creature: Negaton Screamer Script http://www.wowhead.com/npc=20875/negaton-screamer
ed2607f12827bc1f4e764f3988093e20aa303db4 DB/Creature: Howling Fjord - Movement - Whisper Gulch
d94c5228a2ec03f4c870ec16e9e570f5c521baa9 DB/Misc: Updates/Bug fixes to my recent commits 1) Also add heroic difficulty spells for Negaton Screamer and assign existing to normal mode only 2) Re-do Slip'kiks waypoints (yes originally used wrong wp from sniff or position instead of points as wp format was different 3) Add Fengus's WP I missed these originally as did not look right but reason why not right was same as above 4) Remove SAI to add buffs to players on death of bosses this is from original script and is incorrect as buff must be cast from gossip as I already scripted 5) Fix the faction/quest issue with Captain Kromcrush 6) Cho'Rush the Observer can once again be killed that line to add invincibility hp was not meant to be in final.
bbcc18bbf5ee5340321c7e057a900ffd8930f02c DB/Quest: Test at Sea * thanks for the spell_custom coresupport from @pete318 * closes #11880
3aa177410010e75934703be9247245881be73490 DB/Spell: Mark of the Fallen Champion - Heal - Targetconditions * closes #12308
1d44e305ac96b48b7cf2e3a54181fcac0421992c DB/Quest: Help Tavara By Killyana closes #2744
557018d6d1d549de88017c887f120e5a67cf8db2 DB/Creature: Deeprun Diver By Killyana, closes #12432
0c4a74ee4555b7252f7a18eb2f7fd42be0319bba DB/Misc: Delete few incorrectly spawned creatures By Killyana, closes #12564
8f7ef3384d73f1e533d7040654ddba0546afa15c DB/Quest: On Spirit Wings By Killyana, closes #5057
5eafe0a48d89c0db29f4dec6419496c314665926 DB/Creature: Delete 2 duplicate spawned mobs By Killyana, closes #14834
cc15bdb9ea0b69fc2e21f174cde1596031a70648 DB/Quest: Finish Me! By Killyana, closes #6814
f1ceb69e8f76c71f802bf6b5378682eabceaa942 DB/Quest: Reclusive Rune Master By Killyana, closes #14829
1ed273efecb0a687597a3a0ff40fa5548cf0ea1c DB/Creature_text: Add missing Broadcast_text By Killyana, closes #14808
d0f1e49a2fdc0d83d8e6f84c4482ef1e45aa3fb6 DB/npc_text: Add missing Broadcast_text By Killyana, closes #14810
4c47ff3392ccb266f88db34835078abbb6d455ef DB/Creature: Thrallmar grunt By Killyana, closes #14844
a68f8e353b4ddde867f472ffe11d95e481597886 DB/Quest: The New Horde By Killyana, closes #14814
2015-07-12 18:26:16 +01:00
DDuarte b6dda7b9de DB/World: Cherry-pick 10 commits from 3.3.5
b96a15d552bc87898b5e934fe70870b20dbc9b93 DB/Creature: UP - Add all Rndmemotes
fd53ab6a77e287b23471ffee8991a1bebbb126cb DB/Creature: Howling Fjord - Movement - Part I
62ebd002d990c24be989c33aa60719ed5a9ba761 DB/Misc: Fix a runtime error
036b4857abbef107fa5b52a406847f1066cf9f59 DB/Quest: Kroshius' Infernal Core - Endevent * Death by chicken!
b7e7d66caa1a0b73eb5a2d26c35d7353cb6151da DB/Misc: Add a ton of missing gossips By Killyana, updates #14793
13e9f688907fe19932e35b4c7fe1b6c1cfed57c7 DB/Misc: Add a ton of BroadcastTextIDs By Killyana, closes #14793
35f2f5530abc3308cfc6b107255eaa3c82076e76 DB/Creature: Remy "Two Times" By Killyana, closes #12616
562da2e8b2b0814b47027dfd1af2dd0d98378f88 DB/Creature: Howling Fjord - Movement - Dereleict Strand - Part II
a3473acf6c8a04a133227fb7780d4b502c3a5112 DB/Creature: Howling Fjord - Movement - Giants Run - Part III
d1c4c5a8f9431d2ccec0867594a3cde85293cb9b DB/Creature: Howling Fjord - Movement - Ivalds Ruin - Part IV

Also added missing changes to df15f87a9a
2015-07-12 17:46:59 +01:00
DDuarte 06ad280213 Scripts/Spells: Cherry-pick multiple commits related to Midsummer
Merge pull request #14776 from sirikfoll/SpellMidsummer

Core/Spells Add support for quest Torch Tossing/More Torch Tossing
(cherry picked from commit 8197467c8787397ff58cd77e8a03a22b8654cac0)

by sirikfoll

---

Rename 2015_08_29_00_world.sql to 2015_06_23_01_world.sql
(cherry picked from commit 352703e89b5b707f541340c3f1ee6bcac0801278)

by MitchesD

---

Scripts/Spells: fix codestyle

thanks @whoami

(cherry picked from commit 0cba5558cf1149e2dc04a50858b00652ed3e31af)

by MitchesD
2015-07-12 15:01:16 +01:00
DDuarte 9aa9106131 Scripts/VioletHold: cherry-pick multiple commits from 3.3.5
---

Scripts/VioletHold: picked some things from pull request #11399 (thx MitchedD for initial work)

(cherry picked from commit 34a721ba84643cf468f63e5c375949aaa3e15cac)

by joschiwald

---

Core/Scripts: Rework Violet Hold bosses adding missing spells/mechanics:
- Cyanigosa, Arcane Vacuum
- Ichoron, globules mechanic
- Moragg, optic link visuals
- Lavanthor, minor changes
- Zuramat, correctly implement void sentries
- Erekem, implement Windfury and correct management of Erekem Guards
- Script for the pre-event
Thx @ManuFe

(cherry picked from commit 0bb7f89e82c65f6b750e5d96766c2092031803b5)

Conflicts:
	src/server/scripts/Northrend/VioletHold/boss_erekem.cpp

by mik1893

---

Rename 2015_06_08_01_world.sql to 2015_06_25_00_world.sql
(cherry picked from commit 8176902b17ce7050029f70a87bec3284c1090785)

by MitchesD

---

Scripts/VioletHold: fixed non-pch build and codestyle

(cherry picked from commit e34f74dacea82f85b3b945e23f3432deda4595b7)

by MitchesD

---

Scripts/VioletHold: Fix codestyle and unwanted crash in Violet/Hold
closes #14952 and #14953

(cherry picked from commit 49809bd404ae7b58ac81086d52297532ec85972a)

by mik1893

---

Scripts/VioletHold: fix a crash during Ichoron encounter
Closes #14962

(cherry picked from commit 7c01638d45b3eaed7af124a43f21cc6d15407667)

by mik1893

---

Core/Misc: Fix build warnings

(cherry picked from commit 55681666b3cc0e33eeb5cdb77e638e68c19f452c)

Conflicts:
	src/server/authserver/Main.cpp

by jackpoz
2015-07-12 14:55:04 +01:00
DDuarte d6fb50126b Update .gitattributes to prevent CRLF issues 2015-07-10 20:45:37 +01:00
DDuarte b06a8e58e7 CRLF to LF 2015-07-10 20:45:29 +01:00
Duarte Duarte 247b031a6f Merge pull request #15029 from AriDEV/6.x
Server/DataStores: Updated DBC version checks to 6.2.0 (20216)
2015-07-08 14:29:36 -07:00
DDuarte 678a08c8c5 Core: Fix multiple warnings
Travis should be building again now
2015-07-04 02:43:43 +01:00
DDuarte 0f082e8f92 Core/Executables: Add --version and -v to worldserver and bnetserver arguments
Closes #14993
2015-07-04 00:45:52 +01:00
DDuarte 58adb74717 Dep: Disable 2 warnings in zmqpp and CascLib 2015-07-03 02:23:58 +01:00
DDuarte ccfaf663aa Fix build and SQL import after cherry-picks 2015-07-03 02:10:54 +01:00
DDuarte df15f87a9a DB/Schema: Increase size of ConditionValueX fields in world.conditions
Required by bigger masks due to new races in MoP
2015-07-03 01:33:52 +01:00
Duarte Duarte fd1b69eb3f Merge pull request #14988 from ShinDarth/cherry-picks-6
Some cherry picks from 3.3.5a to 6.x
2015-07-01 17:28:28 -07:00
DDuarte d4deb17a2f Build/CMake: Fix finding MySQL install 2015-06-29 14:03:52 +01:00
DDuarte 2ce76a25c3 Fix build after recent cherry picks 2015-06-26 03:57:57 +01:00