Commit Graph

22776 Commits

Author SHA1 Message Date
Vincent-Michael
b6e028eb35 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-25 08:42:40 +02:00
Aokromes
0dbc8d4f48 DB/Gossip: Add missing gossip to Argent Squire 2014-04-25 08:03:05 +02:00
Aokromes
610a9453f6 DB/Gossip: Add missing gossip to Sar'this 2014-04-25 07:53:51 +02:00
jackpoz
ab1d0512ea Core/LFG: Fix LFG GS requirement not updated until relog
Fix Player receiving "You do not meet the requirements for the chosen dungeons" for too low Gear Score level even after equipping items with high enough Gear Score.
2014-04-25 00:13:48 +02:00
Kinzcool
b4c62ce5b6 DB/Locales: Official localizations for gameobject_template of koKR, zhCN, zhTW and Spanish (MX) locales 2014-04-24 17:03:43 -04:00
Vincent-Michael
49630f42d4 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Server/WorldSession.cpp
2014-04-24 22:02:46 +02:00
Kinzcool
e6b267a352 DB/Locales: Official localizations of broadcast_text of kokR, zhCN, zhTW and Spanish (MX) locales 2014-04-24 15:46:38 -04:00
Shauren
fe99d6ef76 Core/Movement: Fixed an exploit allowing players to crash the server by using modified movement packets 2014-04-24 10:22:57 +02:00
Kinzcool
d3b8ab5769 DB/Locales: Official localizations of item_template for koKR, zhCN, zhTW and Spanish (MX) locales 2014-04-23 22:00:11 -04:00
jackpoz
9d1afbba57 Core/Player: Check Player race and class on login
Don't allow login for Players with bad race/class combination to avoid any further crash later.
2014-04-23 21:37:27 +02:00
Vincent-Michael
b39ba5656e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-23 20:05:45 +02:00
jackpoz
6b42f99540 Core/AuctionHouse: Fix AuctionHouse exploit
Fix an exploit in Auction House using either CheatEngine or WPE that allowed to sell more items than the Player had in inventory or to crash worldserver.
Fixes #11831
Fixes #11928
2014-04-23 20:01:20 +02:00
Warpten
698690038e Merge pull request #11935 from velinath/master
Core/Commands: Corrected display of output for .rbac account list command. (thanks Spp-)
2014-04-23 16:22:56 +02:00
velinath
3a3c332436 Correct display of output for .rbac account list command. (thanks Spp-) 2014-04-23 08:05:29 -04:00
Kinzcool
4dbef34803 DB/Misc: Fixed some BroadcastText errors 2014-04-23 00:30:17 -04:00
Vincent-Michael
3eb2d615f3 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
2014-04-23 06:22:39 +02:00
Aokromes
8eb23a7b63 DB/Creature: Lorrin Foxfire
Closes #11918
2014-04-23 03:30:53 +02:00
Kinzcool
762e10f76b DB/Locales: Official localizations for quest_template of French, German, Spanish, Spanish (MX) and Russian locales
* Note: ObjectiveText's, OfferRewardText's and RequestItemsText's are missing
2014-04-22 19:54:58 -04:00
joschiwald
465e4a0b0f Core/Achievements: achievement earned message will now use broadcasttext instead of trinity_string 2014-04-23 01:14:20 +02:00
Kinzcool
f4d172726b DB/CreatureText: Assigned the proper BroadcastTextID's to some that had one too higher 2014-04-22 14:49:52 -04:00
Vincent-Michael
5bb19ce017 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
2014-04-22 20:06:40 +02:00
joschiwald
583039c1c5 Core/SmartScripts: use broadcasttext instead of trinity_string in SMART_ACTION_FLEE_FOR_ASSIST and SMART_ACTION_CALL_FOR_HELP 2014-04-22 19:24:47 +02:00
joschiwald
742f32f15a Core/Texts: Implemented loading BroadcastTexts 2014-04-22 17:57:23 +02:00
joschiwald
805a026c6c DB/CreatureText: readd accidentally deleted text 2014-04-22 16:07:27 +02:00
Kinzcool
44fedc6624 DB/Locales: Official localization for creature_template of French, German, Spanish and Russian locales 2014-04-22 02:39:38 -04:00
Kinzcool
15b9c19238 DB/Locales: Official localizations for gameobject_template of French, German, Spanish and Russian locales (castbarcaption isn't part of the commit) 2014-04-22 00:39:11 -04:00
Kinzcool
2ca758366c DB/Locales: Official localizations for item_set_names of French, German, Spanish and Russian locale 2014-04-21 23:32:42 -04:00
Kinzcool
60c214e99c DB/Locales: Official localizations for item_template of French, German, Spanish and Russian locales 2014-04-21 22:24:50 -04:00
Kinzcool
0b6cfe4319 DB/Texts: Added locales_broadcast_text; official localization for the gossip_menu_option, creature_text and npc_text of
French, German, Spanish, Russian locales.
2014-04-21 18:25:54 -04:00
joschiwald
6c0ff5717f Scripts/Gnomeregan: moved Blastmaster Emi gossip to db 2014-04-21 21:39:51 +02:00
Discover-
30e6b64551 Merge pull request #11917 from warmech/master
Fixed spelling typo in gnomeregan.cpp script.
2014-04-21 19:13:58 +02:00
Kinzcool
4fa511c3a8 DB/CreatureText: "A few" manual updates to assign the proper BroadcastTextID to the typoed creature_texts -- because fuck you typos (Part V)
* Corrected ~2200 typos
2014-04-21 12:52:29 -04:00
Aokromes
58cb866fe5 DB/Quest: Latent Power (12094)
By dr-j closes #11922
2014-04-21 18:35:30 +02:00
Aokromes
4df2372751 Rename 2014_04_21_01_world_disables.sql to 2014_04_21_02_world_disables.sql 2014-04-21 17:52:34 +02:00
Aokromes
2668398bb0 DB/Quest: Sacrifices Must be Made
By dr-j, closes #11920
2014-04-21 17:51:24 +02:00
Vincent-Michael
cec7c9f07e Misc/Guild: Fix guild_xp_for_level structure (startup errors) 2014-04-21 17:46:53 +02:00
Vincent-Michael
f5b02d1278 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-21 16:57:46 +02:00
Vincent-Michael
3a26a570f7 Core: Fix whitespace / tabs 2014-04-21 16:57:32 +02:00
joschiwald
6b52cef5bc Core/Spells: corrected implementation of SPELL_EFFECT_QUEST_START 2014-04-21 16:48:05 +02:00
Vincent-Michael
0ab9f938ad Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-21 16:35:36 +02:00
Aokromes
e3e342b0f7 DB/Quest: operation Gnomeran chain correction
By untaught, closes #8314
2014-04-21 07:48:11 +02:00
warmech
12b895e5ba Fixed spelling typo in gnomeregan.cpp script.
Fixed a typo on line 32 where [GOSSIP_START_EVENT "I am ready to being"] should read [GOSSIP_START_EVENT "I am ready to begin."]
2014-04-20 23:00:32 -05:00
Aokromes
9c16940193 DB/SAI: Fix runtime error 4856
By Fateswhisper, closes #11907
2014-04-21 03:53:49 +02:00
Vincent-Michael
d1618d2422 Core/Creature: Added better error output for wrong spawn mask 2014-04-21 01:09:43 +02:00
Vincent-Michael
81c99b3338 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/tools/map_extractor/dbcfile.h
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/adtfile.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
2014-04-20 22:54:39 +02:00
Warpten
e25416ee23 Merge pull request #11913 from NorthStrider/master
Core/Units: Don't set new power type if old power type is the same
2014-04-20 21:54:45 +02:00
ZackTsuna
518190ee88 Core/Units: Don't set new power type if old power type is the same 2014-04-20 21:22:21 +02:00
Aokromes
c26dec8dbb DB/Misc: Adition to 29dccd9
By dr-j, closes #11911
2014-04-20 19:48:08 +02:00
Aokromes
2132fc41fa DB/Creature: Fix Earthcaller Ryga
By untaught, closes #11827
2014-04-20 19:10:50 +02:00
Shauren
fd6fcbb547 Repository: Set line endings in .patch/.diff files to LF via .gitattributes 2014-04-20 16:51:10 +02:00