Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
22,259 Commits 4 Branches 146 Tags
3f99890b129c836cd364169ec4d69620bff0ca82
Commit Graph

6568 Commits

Author SHA1 Message Date
Vincent_Michael
3f99890b12 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
 2014-01-21 21:58:30 +01:00
Aokromes
e169e2476d DB/SAI: Fix Saronite Mine Slave 
By dr-j closes #11452
 2014-01-21 11:55:37 +01:00
Vincent_Michael
d4479d9413 Missing changes in 313b294d6b 2014-01-19 21:10:41 +01:00
Vincent_Michael
7e527f9075 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Server/Protocol/Opcodes.cpp
 2014-01-19 20:52:16 +01:00
Vincent_Michael
313b294d6b Core/RBAC: Fix difference problems with 4.3.4 2014-01-19 20:48:15 +01:00
Discover-
3102da5263 Misc/SQL: Rename SQL from fa2616fe4e 2014-01-19 17:05:36 +01:00
Discover-
f6264169d8 Merge pull request #11299 from Carbenium/MailboxCmd 
Core/Command: Add mailbox command
 2014-01-19 07:29:11 -08:00
w1sht0l1v3
8367944171 Core/Scripts: Fix kill credit for quest The Hunter and the Prince(13400). 2014-01-19 00:30:25 +02:00
Vincent_Michael
4027686b5b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/ItemHandler.cpp
 2014-01-18 01:01:11 +01:00
Aokromes
ea740deb26 Rename 2014_01_02_00_trinity_string.sql to 2014_01_17_00_trinity_string.sql 2014-01-17 12:29:48 +01:00
Zabustak
101cad1f28 Show Kick, Mute and Ban in world 2014-01-17 12:23:36 +01:00
joschiwald
6e01c0b0b4 DB: update more creature templates 2014-01-15 18:21:13 +01:00
joschiwald
5b6b26262f Misc: missing changes after merge 2014-01-14 12:38:19 +01:00
Vincent_Michael
cc85d1b5b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/World/npcs_special.cpp
	src/server/worldserver/worldserver.conf.dist
 2014-01-13 20:34:21 +01:00
zengwf
23acf75d3b Core/Movement: Add LOS check for fleeingmovement target point. 
Prevents fleeing or feared units from going to upper floor ignoring walls/ceilings with mmaps on(and usually get stucked).

Current implementation just randomly selects a distance and angle against the frighting unit, when in narrow circumstance such as underground caves, such targeting point would be at another floor.

Closes #11300
Ref #9475 (needs fixed confirmation)
 2014-01-12 00:33:33 +00:00
Dr-J
b83c252851 Scripts/NPCs: Remove core script for rogue trainers which was overriding db conditions 
SAI and conditions for rogue trainers to provide elegant leter to rogues provided that is level 24 or higher, does not have elegant letter and does not have taken, rewarded or complete the quest which elegant letter starts

Closes #11378

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-01-12 00:17:21 +00:00
Dehravor
a1f0798792 DB/Guild: Fix incorrect input length limits 
There is one incorrect field length related to guilds in the database, which can be used to cause an overflow client-side, by sending CMSG_GUILD_INFO_TEXT with long strings.

The guild information has the same 500 characters client-side limit as the guild bank tab information, but on server-side it can be 65k characters long. A lengthy guild info makes the whole Guild panel unusable.

Length of the other fields match the client's limits in the database: guild bank tab name (16), public note (31), officer note (31), motd (128), guild bank tab info (500).

Closes #11395

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-01-12 00:12:38 +00:00
DDuarte
08003577de Merge branch 'master' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/Battlefield/BattlefieldMgr.cpp
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/scripts/Spells/spell_dk.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
 2014-01-11 17:26:22 +00:00
DDuarte
33c2bd5ce1 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_ghostlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/tools/CMakeLists.txt
 2014-01-10 18:32:05 +00:00
DDuarte
86107a0296 Merge branch 'master' into 4.3.4 2014-01-10 03:16:59 +00:00
Kittnz
dc09715312 DB/Spawns: remove duplicate NPCs on Zeppelin from Orgrimmar to Thunder Bluff 
Closes #11420
 2014-01-09 23:44:14 +01:00
joschiwald
e80d1f3465 Scripts/BloodFurnace: 
* cleanup InstanceScript
* fix broggok poison cloud

Scripts/Naxxramas/Grobbulus:
* fix poison cloud
* fix mutating injection
 2014-01-09 23:17:02 +01:00
joschiwald
1a5c0ad92f DB/Creature: update more creature templates 2014-01-08 16:12:36 +01:00
joschiwald
2b9234b32a DB: update some creature templates 2014-01-07 00:06:30 +01:00
joschiwald
738afccfc1 DB/Spells: correct more spelldifficulty_dbc entries 
* add log message to find wrong entries
 2014-01-05 00:49:54 +01:00
joschiwald
853b9e9c58 DB/Spells: remove duplicate/invalid entries from spelldifficulty_dbc 
* For new entries: use spellid0 as id to avoid conflicts with dbc file
 2014-01-04 23:29:36 +01:00
joschiwald
cd76d32907 Core/Entities: correct creature damage, offhand damage should work too 
* todo: some creatures need dmg_multiplier update in creature_template
 2014-01-04 18:22:06 +01:00
Malcrom
0e7805bac9 Db/Classlevelstats: Little fix for base warrior damage. 
I won't be working on this anymore until next year
 2013-12-31 13:52:16 -03:30
Malcrom
997d2adb21 DB/classlevelstats: Update mage exp0, exp1, exp2 base damage 2013-12-31 00:05:54 -03:30
Malcrom
ba43e38d6f DB/classlevelstats: Exp1 & Exp2 Paladin base damage. 
Exp1 57 to 60 and 71 to 73 estimated.
Exp2 67 to 70 and 81 to 83 estimated.
 2013-12-30 22:12:34 -03:30
Malcrom
27c58c3ed8 DB/Classlevelstats: Fix damage for Exp0 Paladin Class. 
25, 55, 59, and 61 to 83 are estimated all others are accurate.
 2013-12-30 21:28:39 -03:30
Malcrom
99b0ee19ca DB/ClassLevelStats: All stats for testing. 2013-12-30 11:28:01 -03:30
Malcrom
b1431bdd47 DB/Classlevelstats: Base damage for expansion 1 2013-12-29 23:31:07 -03:30
Malcrom
6c74d660bd DB/Classlevelstats: Add base damage for exp2 2013-12-29 21:17:48 -03:30
Malcrom
765cd83237 DB/Creature_classlevelstats: update attack power. 2013-12-28 13:56:44 -03:30
Malcrom
b854e5b696 DB/SAI: Fix for quest 12449 & 12417 from MitchesD. 
Closes #11373
 2013-12-28 11:17:15 -03:30
Malcrom
6304c8d593 DB/Creature_classlevelstats: Add attack power. Rogue class still lacking data. 2013-12-28 10:39:45 -03:30
Malcrom
e62ad6acfc DB/Creature_classlevelstats: Prepare table for attack power and damage. 2013-12-28 10:32:58 -03:30
joschiwald
8d57e081e2 Merge pull request #11359 from MitchesD/obsidian_sanctum 
Scripts/ObsidianSanctum: added creature_formations for surrounding creatures and some clean up
 2013-12-27 13:58:25 -08:00
MitchesD
3921f20c18 Scripts/ObsidianSanctum: added creature_formations for surrounding creatures and some clean up 2013-12-27 19:56:01 +01:00
Malcrom
51af314875 DB/SAI: Fix AI for Lord Kragaru 2013-12-27 11:25:11 -03:30
Malcrom
fa29ddc529 Db/Misc: Fix more dup aura messages. 2013-12-25 12:39:47 -03:30
Malcrom
06edb4dca2 DB/Misc: Fix some more dup aura errors. 2013-12-25 11:40:40 -03:30
Malcrom
baf04e4674 Db/Misc: Fix a few more dup aura errors. 2013-12-25 10:46:26 -03:30
Malcrom
18f523fff7 DB/Misc: Fix a couple errors I introduced. 2013-12-25 09:05:32 -03:30
Malcrom
b8e626199c Scripting/Multi: Some cleanup. 2013-12-24 17:56:38 -03:30
Kinzcool
00b123bc5a DB/Gameobjects: Added a few missing gameobject templates. 2013-12-24 13:05:35 -05:00
Malcrom
9d2d4ba921 Scripting/Hellfire: Moved some gossip to db and fix some magic numbers. 2013-12-24 12:15:41 -03:30
Malcrom
eacc165a12 Scripting/Ghostlands: Moved some gossip to db and fixed some magic numbers. 2013-12-24 08:39:35 -03:30
joschiwald
fd6167cf66 Scripts: 
- cleanup obsidian sanctum script
- prevent yelling texts if non player died in some scripts
 2013-12-23 23:55:15 +01:00