Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 17:27:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,831 Commits 4 Branches 146 Tags
f4fd258ad1e3831ab157aebc01db34726bce61a8
Commit Graph

6872 Commits

Author SHA1 Message Date
Vincent-Michael
f4fd258ad1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-28 09:49:24 +02:00
Vincent-Michael
f743ca2816 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2014-04-28 09:42:20 +02:00
Aokromes
bd6474b369 DB/Creature: Fix even more creature templates 2014-04-28 09:40:19 +02:00
Kinzcool
c536305e3a Core: Droped faction_H field -- only one faction table is necessary 2014-04-27 18:13:55 -04:00
Aokromes
c7221536de DB/Creature Fix even more hard modes values 
I have this is annoying thing?
 2014-04-27 21:11:14 +02:00
Aokromes
6caa8e309a DB/Creature: Link more creatures with their hard modes 
Thx jackpoz by the sql to ease my life!
This will add a flood of startup errors, don't open new tickets, they will be fixed.
 2014-04-27 19:47:53 +02:00
Vincent-Michael
908870e23f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-27 13:56:56 +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
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
Aokromes
0eaa32a7cc DB/Creature: Fix typos on dc8a7a6 
**CENSORED** npcs with same name.
 2014-04-26 14:21:13 +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
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
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
9dee56cb27 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-26 03:17:44 +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
Aokromes
dc8a7a6fa5 DB/Creature: Fix some incorrect factions 2014-04-25 20:40:29 +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
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
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
Vincent-Michael
b39ba5656e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-04-23 20:05:45 +02: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
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