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

440 Commits

Author SHA1 Message Date
joschiwald
ea5f39354b Scripts/Taxi: addition to 660f7e72be 
(cherry picked from commit 35aed8902a)
 2016-01-03 02:54:07 +01:00
Vincent-Michael
478cc756eb Update copyright note for 2016 
Happy new year (Again new year with idiots ...)
 2016-01-01 00:34:25 +01:00
Carbenium
0ffc89999e Fix build after recent cherry-picks 2015-11-23 10:32:28 +01:00
MitchesD
843955b8bf Merge pull request #15732 from ShinDarth/reset-health-mana 
Scripts/Duel: implement duel reset of health and mana and improve duel reset
(cherry picked from commit a1150ce20f)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
 2015-11-23 10:11:53 +01:00
Shauren
61c7161a10 Core/Units: Updated melee/spell hit chance calculation 2015-11-10 17:33:36 +01:00
Shauren
88584a7398 Merge pull request #15495 from Treeston/3.3.5-gemperfection 
Core/Spell: Implement "Gem Perfection" (and framework for similar spells in the future)
(cherry picked from commit 15cafba8d5)
 2015-11-07 01:15:21 +01:00
blub
bf7175ee83 Merge pull request #15731 from ShinDarth/toscri 
Convert the Duel Cooldown Reset feature to scripts
(cherry picked from commit 5c449b50aa)
 2015-11-07 00:38:05 +01:00
MitchesD
26d362febc Revert "DB/NPC: Stable Masters" Please in the future mark 335 only commits with *_335 in the end of SQL file, if it has any. 
This reverts commit 18f511431a.
 2015-10-30 14:46:14 +01:00
Killyana
18f511431a DB/NPC: Stable Masters 
Closes #15505

(cherry picked from commit a513abc02c)

# Conflicts:
#	src/server/scripts/World/npcs_special.cpp
 2015-10-30 14:34:46 +01:00
joschiwald
7a2b87cefb Merge pull request #15385 from Tonghost/3.3.5 
Core/Scripts: Remove duplicate code
(cherry picked from commit 5c68223ab6)
 2015-09-24 23:30:42 +02:00
Golrag
d999caee67 Core/AreaTrigger: Added 'bool entered' to OnTrigger 2015-04-18 11:22:30 +02:00
Shauren
d02f4da355 Core/Chat: Implemented instance chat type 2015-04-12 00:20:06 +02:00
Shauren
0ba2e0d5ee Core/Spells: Implemented multiple spell power costs 2015-03-08 13:31:57 +01:00
Shauren
56186319bd Core/Spells: Cooldown updates 
* Refactored cooldown handling to separate class shared by creatures and players
* Updated and enabled cooldown packets
* Implemented creature school lockouts
* Implemented spell charges
* Fixed AuraUpdate structure
* Fixed aura flag AFLAG_NOCASTER handling
* Implemented spell charge related auras
 2015-02-17 01:01:44 +01:00
Nayd
68d026709b Scripts: Remove scripts that were replaced by SAI in ba906b69e0 2015-02-02 04:03:59 +00:00
Vincent-Michael
ab90f74486 Update copyright note for 2015 
Happy new year
 2015-01-01 00:28:09 +01:00
Intel
a782515246 Core/Quests: Updated Quest System to new Format 
All quest requirements are now in quest_objectives table
quest_template table contains _ONLY_ WDB data and must not be modified
Currently supported objectives are MONSTER, GAMEOBJECT, ITEM, TALKTO, CURRENCY, REPUTATION, MONEY, PLAYERKILLS, AREATRIGGER
 2014-12-28 22:55:53 +02:00
Shauren
6dbb516b65 Core/Items: Refactored ItemTemplate 2014-12-21 13:35:43 +01:00
Rat
eda9094226 Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into Spells 2014-11-29 14:52:53 +01:00
Rat
ce5b683a07 Core/Spells: fixed Script project building 2014-11-28 14:00:50 +01:00
joschiwald
da37723b5f Core/Packets: updated SMSG_INITIALIZE_FACTIONS and added struct for SMSG_CHANNEL_LIST 2014-11-17 18:21:41 +01:00
Intel
4e684f74a8 Core/DataStores: Updated DungeonEncounter.dbc, DurabilityCosts.dbc, DurabilityQuality.dbc, EmotesEntry.dbc, EmotesText.dbc, Faction.dbc, FactionTemplate.dbc structs 2014-11-08 19:26:20 +02:00
Intel
5f2b5a325b Core/DataStores: Updated AreaTrigger.dbc struct 2014-11-06 01:13:06 +02:00
Shauren
209a743bbe Core/Entities: Updated updatefields 2014-10-26 22:06:48 +01:00
Shauren
9e1930959d Core/Entities: Changed object lowguid to uint64 2014-10-26 02:57:28 +02:00
joschiwald
747350a0bc Scripts: replaced various Location struct defines with proper Position or G3D::Vector3 2014-10-26 01:56:06 +02:00
Shauren
b3e3cfa81f Core/Entities: First part of removing GetGUIDLow() uses 2014-10-22 17:33:55 +02:00
Shauren
b10d3cd24a Scripts/Commands: Replaced lowguid printing in command output with ToString() formatted guid 2014-10-22 15:46:25 +02:00
Shauren
9cc7044546 Core/Entities: First batch of removing implicit conversions of ObjectGuid to uint64 2014-10-21 19:23:32 +02:00
Vincent-Michael
02192ab870 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-10-12 02:02:07 +02:00
DDuarte
103fd9cb63 Scripts/GO: Remove go_field_repair_bot_74A 
Replaced by SAI in c05a4189e2
 2014-10-11 20:40:48 +01:00
Shauren
8e288dd673 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlefield/Battlefield.h
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.h
	src/server/game/Battlegrounds/BattlegroundScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/DungeonFinding/LFG.h
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/DungeonFinding/LFGQueue.cpp
	src/server/game/DungeonFinding/LFGQueue.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Creature/GossipDef.h
	src/server/game/Entities/Creature/TemporarySummon.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectAccessor.cpp
	src/server/game/Globals/ObjectAccessor.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CalendarHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reset.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_zuljin.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.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/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp
	src/server/scripts/Northrend/IcecrownCitadel/boss_the_lich_king.cpp
	src/server/scripts/Northrend/Naxxramas/boss_kelthuzad.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-09-20 11:05:30 +02:00
Shauren
48deb443f9 Core/Scripts: Fixed build of misc scripts, only zone_* and instance_* remain 2014-09-15 22:52:09 +02:00
Shauren
a0e50ea35f Core/Entities: Use ObjectGuid class in game project 2014-09-14 16:14:12 +02:00
Shauren
7f2cdfd166 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/scripts/World/npcs_special.cpp
 2014-09-12 20:26:46 +02:00
Dr-J
4e25304a66 Remove mount vendor cpp script 2014-09-12 13:48:51 +01:00
DDuarte
6885eb4f2c Merge remote-tracking branch 'origin/master' into 4.3.4 2014-09-07 19:36:33 +01:00
Dr-J
9e816c8701 Remove CPP script for Ethereal Teleport Pad 
Remove CPP script which was not using proper mechanism for activating (ie gossip)
 2014-09-07 03:45:50 +01:00
Vincent-Michael
c7e1eae2ce Core: Remove again whitespace (meh :/) 2014-09-07 04:06:50 +02:00
Vincent-Michael
8a97243728 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-01 09:19:57 +02:00
jackpoz
dd4dbdcd16 Core/Misc: Refactor scripts to fix static analysis warnings 
First batch of fixes targeting 100 issues reported by Coverity
 2014-08-31 20:42:02 +02:00
Vincent-Michael
741f3dde2e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp
 2014-08-26 19:21:22 +02:00
DDuarte
430b3adfe8 Scripts: Correct despawn time of multiple objects 
WorldObject::SummonGameObject respawn time is in seconds and not milliseconds
 2014-08-26 13:37:55 +01:00
Vincent-Michael
98e27a4f15 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/tools/map_extractor/System.cpp
 2014-08-24 16:33:29 +02:00
jackpoz
c20f92c08c Merge branch 'Rochet2/questreward' 
Close pull request #12657
 2014-08-24 14:38:55 +02:00
Rochet2
9beae1dc97 Removed OnQuestComplete hook, use QuestReward instead. Implemented OnQuestStatusChange hook 
Also fixed some comments and added overrides
The OnQuestComplete hook was unused and didnt work properly
 2014-08-24 14:31:38 +03:00
Vincent-Michael
547115476f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Spells/spell_warrior.cpp
 2014-08-24 02:11:33 +02:00
jackpoz
7fe7f30521 Core/Misc: Fix some -Wconversion warnings 2014-08-23 19:56:41 +02:00
Shauren
4a741258f1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Item/Item.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-08-12 00:45:24 +02:00
jackpoz
8402570bb8 Scripts/Misc: Fix static analysis issues 
Replace CAST_AI() macro with ENSURE_AI() when dynamic_cast is not supposed to return NULL.
 2014-08-09 00:12:20 +02:00