Commit Graph
22818 Commits
Author SHA1 Message Date
Vincent-Michael 908870e23f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-27 13:56:56 +02:00
Discover- 91c6c8a911 Merge pull request #11945 from Dehravor/trade
Core/Trade: Correction of distance checking
2014-04-27 12:32:32 +02:00
Aokromes 3fc5d0670c DB/Creature Fix even more hard modes values 2014-04-27 11:35:38 +02:00
Aokromes dac5eb3a8a DB/Creature: Fix even more hard modes values 2014-04-27 09:56:23 +02:00
Aokromes 4b704437a1 DB/Creature: Fix more hard modes values 2014-04-27 09:29:07 +02:00
Aokromes 05e107f32e DB/Creature: Fix some hard modes values 2014-04-27 08:51:51 +02:00
Aokromes 81c9add7c4 DB/Creature: Link some creatures with their hard modes
This will add some startup errors.
2014-04-27 08:02:34 +02:00
Aokromes eb722bf220 DB/Misc: Fix few typos 2014-04-27 04:51:35 +02:00
Aokromes 9ed38880e8 DB/Creature: Fix more factions 2014-04-27 04:43:51 +02:00
Kinzcool cc9875d226 DB/Gossips: Added some missing gossips 2014-04-26 22:20:05 -04:00
w1sht0l1v3 c20d0cb77e Scripts/Sholazar Basin: Reconnaissance Flight (12671)
Add workaround for the player/accessory mounting issue.
Some small additions.
Closes: 9443
2014-04-27 02:23:33 +03:00
Vincent-Michael de281846cc Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-26 14:51:00 +02:00
joschiwald 113e6b0162 Really fixed build and warnings 2014-04-26 14:42:56 +02:00
Aokromes 0eaa32a7cc DB/Creature: Fix typos on dc8a7a6
**CENSORED** npcs with same name.
2014-04-26 14:21:13 +02:00
Vincent-Michael 3ef7a7299f Core: Fix build 2014-04-26 13:07:00 +02:00
Vincent-Michael 5586950dec Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-26 12:35:21 +02:00
Vincent-Michael dc4c67ab40 DB/Achievement: Fix last typo 2014-04-26 12:35:08 +02:00
Gacko 938947880a Move merge_updates_windows.bat to right folder and add Unix version 2014-04-26 10:41:31 +02:00
Kinzcool 6bf71b80ae DB/Gossips: Assigned some gossips with typos to their BroadcastTextId 2014-04-26 00:43:37 -04:00
Vincent-Michael 35798d7f9e I need Sleep (I failed today hard... :/ ) 2014-04-26 05:52:20 +02:00
Vincent-Michael ab85c1546f Core/Achievements: Fixed WoW''s 4th-8th Anniversary 2014-04-26 04:46:54 +02:00
joschiwald 33a9b879ef Fixed non-pch build 2014-04-26 04:03:37 +02:00
joschiwald 211d56d633 Core/BG/SA:
* replaced some trinity_string with broadcasttexts
* basic implementation of phasing in SA
* spawn some triggers in SA (fixes dest position of teleport pads)
* added text getter to broadcasttext struct
* some cleanup in destructable go event notification
2014-04-26 03:40:30 +02:00
Vincent-Michael 0242f04f1c Core: Fix build 2014-04-26 03:24:57 +02:00
Vincent-Michael 9dee56cb27 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-26 03:17:44 +02:00
Vincent-Michael f98866db3f Core: Fix warning 2014-04-26 03:16:53 +02:00
Vincent-Michael 3ec1d0c8d6 Core/Achievements: Implemented ACHIEVEMENT_CRITERIA_DATA_TYPE_GAME_EVENT 2014-04-26 03:07:49 +02:00
Vincent-Michael 0042e6f815 Revert "Core/Achievement: Fix typo in 68b508df27d20faeecf77933008f250b32f22392"
This reverts commit a4e7ae8d20.
2014-04-26 02:48:03 +02:00
Vincent-Michael a4e7ae8d20 Core/Achievement: Fix typo in 68b508df27 2014-04-26 02:45:37 +02:00
Vincent-Michael 68b508df27 Core/GameEvent: Use game_event table for blizzard birthday 2014-04-26 02:05:29 +02:00
Kinzcool b1d1d65506 DB/Locales: Official Localizations of creature_template of koKR, zhCN, zhTW and Spanish (MX) locales 2014-04-25 19:58:43 -04:00
Vincent-Michael 1390621f4d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/scripts/Commands/cs_reload.cpp
2014-04-25 23:42:40 +02:00
Vincent-Michael c81d6e9b4b Core/Texts:
* Enable some BroadcastTexts stuff (is not finish)
* Added reload command for broadcast_text table
ToDo:
- Enable: Sound/Emote stuff, etc.
- Auth base need refresh
2014-04-25 23:25:59 +02:00
Shauren 7edfbaeb6e Merge pull request #11946 from Dehravor/cata-crash
Core/WorldSocket: Fix crash when CMSG_AUTH_SESSION contains modified addon size value
2014-04-25 23:19:31 +02:00
Dehravor fa950a554a Core/WorldSocket: Fix crash when CMSG_AUTH_SESSION contains modified addon size value 2014-04-25 22:59:22 +02:00
jackpoz f27057bf24 Core/Misc: Fix build warnings 2014-04-25 21:46:43 +02:00
jackpoz 2585e799f9 Core/Misc: Change how Position struct is retrieved
Update Position::GetPosition() and similar methods signatures to reflect 2a4c9bcaf9 changes by return a Position object instead of accepting a Position parameter by reference.
2014-04-25 21:19:30 +02:00
Dehravor 59a84951da Core/Trade: Correction of distance checking 2014-04-25 20:52:17 +02:00
Aokromes dc8a7a6fa5 DB/Creature: Fix some incorrect factions 2014-04-25 20:40:29 +02:00
Discover- 9c68103c21 Merge pull request #11938 from Dehravor/inspect
Core/Handlers: Add inspect distance and target checks
2014-04-25 15:19:41 +02:00
jackpoz eb711fd9e9 Core/LFG: Fix crash
Fix crash added in ab1d0512ea by adding an additional NULL check.
Fixes #11941
2014-04-25 11:35:32 +02:00
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
Dehravor abb97bac18 Core/Handlers: Add inspect distance and target checks 2014-04-24 14:34:19 +02: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