Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 15:40:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,776 Commits 4 Branches 146 Tags
b6e028eb352dce734fe81d7054d7eaa623f35df3
Commit Graph

6843 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
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
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
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
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
Aokromes
9c16940193 DB/SAI: Fix runtime error 4856 
By Fateswhisper, closes #11907
 2014-04-21 03:53:49 +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
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
Aokromes
d4e355d534 DB/Creature Text: Add texts for Injured Soldiers 
By untaught closes #11872
NOTE: don't posts multiple unrelated bugs on a single ticket.
 2014-04-20 14:01:44 +02:00
Aokromes
6efe5d9603 DB/Creature: Fix Birgitte Cranston 
By untaught, closes #11842
 2014-04-20 11:57:48 +02:00
Vincent-Michael
aa6ae2773f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
 2014-04-19 22:49:25 +02:00
Aokromes
fac3f445b1 Rename 2014_04_19_world_misc.sql to 2014_04_19_00_world_misc.sql 2014-04-19 20:53:59 +02:00
Vincent-Michael
8a110f2645 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_gobject.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2014-04-19 19:57:46 +02:00
Aokromes
1521352d34 DB/Quest: Plundering the Plunderers 
By dr-j, closes #11902
 2014-04-19 19:10:58 +02:00
Aokromes
29dccd9a4c DB/Quest: Script replacement of/or issueing of items needed for quests 
By dr-j closes #11901
 2014-04-19 19:08:15 +02:00
Unholychick
574fa30ea6 Core/Spells: Convert Avenging Wrath to spellscript 
Closes #11896
Closes #3464
 2014-04-18 20:21:05 +02:00
Dr-J
220a45b0cf Scripts/Ulduar: Archivum Console 
- Scripts for Archivum Console, Brann Bronzebeard (33235), Prospector Doren/Loren
- Fixing quest chaining for both versions of the archivum data disc chains
- Fixes loot so correct quest starter item drops from assembly when done in hard mode rather than 10m quest item dropping in 25 and nothing dropping in 10 man
- Scripted events for turn in of Archivum Data Disk, The celestial Planetarium and watcher Analysis's and turn in of ancient history (Val'anyr, Hammer of Ancient Kings chain)
- Fix both versions of the Celestial Planetarium

Closes #11547
Closes #11556
 2014-04-17 21:52:08 +02:00
Aokromes
b0d0bed9ef DB/Creature: Highlord Bolvar Fordragon 
By MitchesD, closes #11893
 2014-04-17 07:56:50 +02:00
Kinzcool
f9381d2e8c DB/Creatures: Added trigger flag to the remaining triggers 2014-04-16 20:15:01 -04:00
joschiwald
119688d964 Rename 2014_02_15_00_world_spelldifficulty_dbc.sql to 2014_04_17_01_world_spelldifficulty_dbc.sql 2014-04-17 02:03:53 +02:00
joschiwald
8877a87c99 Merge pull request #11614 from MitchesD/kelthuzad 
Scripts/Kelthuzad: move spells into spelldifficulty_dbc and cleanup
 2014-04-17 02:02:51 +02:00
joschiwald
0a014e1431 Scripts/UtgardeKeep: fixed some issues on Ingvar the Plunderer 
Closes #10859
 2014-04-17 00:09:43 +02:00
Kinzcool
07fd33fa2a DB/BroadcastText: Corrected texts using backslashes and ALL the errored "EmoteDelay"s due to a fail in the parser *cough* *cough* 2014-04-15 20:51:56 -04:00
Kinzcool
d26889744d DB/NPCText: Conversion to BroadcastText system for npc text (part IV) 2014-04-15 20:08:10 -04:00