Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-16 15:09:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
29,718 Commits 4 Branches 147 Tags
c3243e20760a0200be98e94de5f56336b1c2bc35
Commit Graph

29718 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Numielle
91827e87d1 Core/Spells: Fixed double heal reduction on Eart Shield (issue #4032). 2014-04-20 23:48:57 +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
Shauren
0f5632c70e Core/Misc: Fixed some -Weffc++ warnings 2014-04-20 16:48:35 +02:00
jackpoz
e830225b21 Core/Misc: Fix change faction on dead Night Elves keeping the speed buff 
Fix change faction on dead Night Elves causing the new player keeping the 175% wisp speed buff.
Players will be resurrected automatically on change faction.
Closes #255
 2014-04-20 15:02:19 +02:00
Shauren
fc538c5088 Tools: Enabled struct packing to ensure that structures are read from files properly 2014-04-20 14:49:44 +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
40a29a3c99 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_zuljin.cpp
 2014-04-20 11:33:40 +02:00
jackpoz
fb6365ac68 Core/Misc: Check GetVictim() for NULL before dereferencing it 
Add additional NULL checks all around the code before dereferencing GetVictim() result.
Keep in mind UpdateVictim() result has nothing to do with GetVictim() result and the caller shouldn't assume anything about GetVictim() based on UpdateVictim().
 2014-04-20 00:38:25 +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
jackpoz
8ca6371793 Core/Misc: Ensure GetVictim() returns a valid reference when expected 
Add a new method EnsureVictim() which asserts a valid not NULL reference will be returned to the caller. Use this whenever the GetVictim() would be dereferenced .
 2014-04-19 21:48:22 +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
Warpten
d9493d9cc9 Scripts/Ruby Sanctum: Fixed corporeality scaling changes. 
Thanks to Unholychick.

P.S.: #9231 if still valid will be fixed soon (tm)
 2014-04-19 19:18:51 +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
jackpoz
93a68a66c3 Core/MMAPs: Improve NPC behavior with fences and high climbs 
Increase the max walkable angle and max walkable climb in MMAPs generator to allow NPCs to jump on fences and climb steps.
This requires MMAPs to be extracted again with mmaps_generator, old extracted MMAPs are still compatible but will not provide the benefits of this commit.
Fixes #9965
 2014-04-19 15:35:13 +02:00
Unholychick
574fa30ea6 Core/Spells: Convert Avenging Wrath to spellscript 
Closes #11896
Closes #3464
 2014-04-18 20:21:05 +02:00