Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 16:39:08 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,758 Commits 4 Branches 146 Tags
67d616c195800364074366bee457cc904b429359
Commit Graph

4301 Commits

Author SHA1 Message Date
Malcrom
8332cee052 Scripting/The Slave Pens: Moved boss_mennu_the_betrayer from EAI to CPP. 2013-11-10 10:53:43 -03:30
Malcrom
c2db6d49ce Scripting/The Arcatraz: Add text scripting for deaths 2013-11-10 10:00:47 -03:30
Malcrom
e5b259fb4a Scripting/Arcatraz: Move Zereketh the Unbound, Dalliah the Doomsayer, & Wrath-Scryer Soccothrates to cpp scripting and some cleanup. 2013-11-10 03:22:22 -03:30
Spp
ab2d26cb91 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.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/PetitionsHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Tools/PlayerDump.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/worldserver/worldserver.conf.dist
 2013-11-08 11:12:17 +01:00
Spp
94e2b9332a Core/Logging: Remove LOG_FILTER_XXX defines with it's value (remember logger names are case-sensitive) 2013-11-08 10:50:51 +01:00
Spp
990e4c7851 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Creature/Creature.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/Grids/Notifiers/GridNotifiers.h
	src/server/game/Grids/ObjectGridLoader.h
	src/server/game/Spells/SpellInfo.h
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.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/zulaman.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/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.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/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/scripts/Kalimdor/zone_tanaris.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/tools/map_extractor/System.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
 2013-11-08 10:29:51 +01:00
Sebastian Valle
184fe092c3 Scripts/Spells: Removed the duplicate script. 2013-11-03 12:48:59 -05:00
Sebastian Valle
428cf6b0ee Scripts/Spells: Fixed the warlocks' Fel Flame talent, now it adds to the duration of Immolate and Unstable Affliction. 
Closes #8455
 2013-11-03 12:39:21 -05:00
untaught
45e0af089c Fix quest ... Or Maybe We Don't (12138) and remove the core script 2013-11-03 11:34:20 +02:00
untaught
316da388d5 Fix quest Redeeming the Dead (9685) and remove the core script 2013-11-03 11:17:28 +02:00
untaught
b28c27cb7c [Area Trigger Scripts] Add Support for Teleport for Quest: Breaking Through (11898) 2013-11-03 10:35:12 +02:00
Sebastian Valle
bb057ae40b Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw 
Conflicts:
	src/server/collision/Management/MMapManager.h
 2013-10-29 13:13:37 -05:00
leguybrush
0a308144a8 Core/Code: Unify [more] codestyle for brackets: )\n{\n} to ) { }. 2013-10-28 14:36:07 -04:00
Ascathor
2607738990 Core/Code: Unify codestyle for brackets: {} to { }. 
Also added missing copyright to some files.
 2013-10-27 23:46:02 +01:00
Ascathor
e5553cfb78 Core/Command: Fix ban info order for .pinfo 2013-10-27 20:38:33 +01:00
Shauren
75a790ca47 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-10-26 17:06:50 +02:00
jackpoz
daf5a4b5c3 Core/Chat Commands: Allow to add overlapping teles . 
Allow to add overlapping teles like "abc" even if "abcde" already exists. This wasn't possible and a "Teleport already exists" error was thrown instead.
 2013-10-25 21:50:52 +02:00
Vincent_Michael
9802c7b891 Scripts/Misc: Coding Style unification? (by Aokromes) 2013-10-22 20:24:05 +02:00
Subv
4123468f72 Merge pull request #11050 from Ascathor/master 
Core/Command: Improve .group list to feature several notes and features ...
 2013-10-21 05:28:35 -07:00
gerripeach
93dbf20513 Core/Group: Fix crash in "Group::GetMembersCount" 
closes: #9350
 2013-10-20 06:26:29 +02:00
Vincent_Michael
5915a220a5 Misc: Removed some whitespace 2013-10-19 03:39:58 +02:00
Vincent_Michael
ddada2d182 Scripted/ScarletMonastery: Fix crash for headless horseman 2013-10-18 12:25:50 +02:00
Ascathor
193f4ed868 Core/Command: Improve .group list to feature several notes and features to improve handling. 2013-10-17 14:58:37 +02:00
Shauren
59fd2520fc Core/Creatures: Removed remains of creature_transport table 2013-10-17 00:20:00 +02:00
Shauren
ce55647c41 Core/Transports 
* Rewritten path generation, now uses splines - timers are a lot more accurate now
* Implemented stopping transports
* Implemented spawning transports in instances
* Implemented spawning gameobjects as transport passengers
* Transport passengers are now stored in creature/gameobject table using gameobject_template.data6 from transport's template as map id
 2013-10-16 18:37:29 +02:00
Vincent-Michael
9128088877 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-10-15 23:35:40 +02:00
joschiwald
186e0852d7 Fix non-pch build. 2013-10-14 17:13:27 +02:00
joschiwald
53167ea9a1 Fix build. 2013-10-14 17:04:55 +02:00
joschiwald
0bdeb12636 Scripts/Ahnkahet: Prince Taldaram rewritten to BossAI 
Closes #10993
 2013-10-14 16:46:03 +02:00
jackpoz
6f98e4106e Scripts/TheBlackMorass: Fix first 7 rifts spawn timings 
Partially revert 7e76ab97f8 to properly spawn first 7 rifts. Also allow only 1 EVENT_NEXT_PORTAL event at time.
 2013-10-13 18:30:59 +02:00
Vincent-Michael
cc9671af90 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw 2013-10-09 23:15:53 +02:00
Vincent-Michael
904fa5b47b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-10-09 23:14:16 +02:00
joschiwald
95cad03fa4 Scripts/HoR: fixed infinite spawn, added some missing spell target conditions and fixed codestyle 
Closes #10754
 2013-10-08 04:22:26 +02:00
jackpoz
6cef507b89 Scripts/HallsOfReflection: Revert 3ffbd27cdd 
Revert 3ffbd27cdd and PR #10985 , this change doesn't fix any issue and instead breaks the logic of the instance event.
 2013-10-07 20:50:08 +02:00
Shauren
fca4a5448a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-10-07 14:30:37 +02:00
Sebastian Valle
e07d76836d Core/MMaps: Separate the path from the walls to prevent falling off the edges client-side and improve the behavior. 
Thanks to Game2Mesh user in ownedcore.
 2013-10-05 18:11:39 -05:00
Sebastian Valle
a27237dedd Core/MMaps: MMaps are now correctly loaded into TC 
P.S: They do behave better in some places, but are still a bit weird in some others, will have to look into that.
P.P.S: I'll have to re-implement all the previous PathGenerator code
 2013-10-04 22:23:17 -05:00
Sebastian Valle
e62f64b591 Tools/MeshExtractor: Fixed loading of locale patch MPQs (This fixes DBC extraction) 2013-10-04 10:25:44 -05:00
Sebastian Valle
1428255e91 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw 2013-10-03 17:48:11 -05:00
Sebastian Valle
d74dcabd85 Core/MMaps: Started this new branch as my playground for mmaps. 
Made some refactoring
Free memory taken by mmaps when a map is destroyed.
 2013-10-03 17:47:38 -05:00
Shauren
a368fae588 Core/Players: Fixed issues with incorrect targets being selected for spells 2013-10-03 17:07:25 +02:00
Baeumchen
3ffbd27cdd Update wrong Escape state 
Found by w5860363 : http://www.trinitycore.org/f/topic/9112-halls-of-reflectioncpp-question%EF%BC%9F/
 2013-10-02 19:08:14 +02:00
Spp
ad29676c27 Fix compile under linux and update auth db with latest changes 2013-09-29 14:15:58 +02:00
Spp
ea2fe0217d Core/RBAC: Simplify RBAC implementation 
- Drop groups (roles than can have inherited roles) and roles (set of
  permissions)
- Permissions can now have inherited permissions (those act as roles)

RBAC DB structure is now limited to four tables
- rbac_permissions: Contains permissions and roles
- rbac_linked_permissions: Contains the relation between permissions and
  linked permissions (those permissions that have linked permissions are
  called roles)
- rbac_default_permissions: Contains the list of permissions to be granted
  to each security level [Added to maintain compatibility in an easy way]
- rbac_account_permissions: Contains the list of permissions granted or
  denied for a particular account.

NOTE: IF YOU ARE USING CUSTOM PERMISSIONS, ROLES OR GROUPS CHECK THE SQL
BEFORE APPLYING...
 2013-09-29 13:19:05 +02:00
jackpoz
ac5b6f337e Core/Scripts: Fix uninitialized values in The Black Morass 
Valgrind log:
 Conditional jump or move depends on uninitialised value(s)
  at 0x1798C2C: npc_medivh_bm::npc_medivh_bmAI::UpdateAI(unsigned int) (the_black_morass.cpp:192)
  by 0x11AEFC0: Creature::Update(unsigned int) (Creature.cpp:542)
  by 0x12E96F8: Trinity::ObjectUpdater::Visit(GridRefManager<Creature>&) (GridNotifiersImpl.h:45)

 Conditional jump or move depends on uninitialised value(s)
  at 0x1798C7E: npc_medivh_bm::npc_medivh_bmAI::UpdateAI(unsigned int) (the_black_morass.cpp:200)
  by 0x11AEFC0: Creature::Update(unsigned int) (Creature.cpp:542)
  by 0x12E96F8: Trinity::ObjectUpdater::Visit(GridRefManager<Creature>&) (GridNotifiersImpl.h:45)

 Conditional jump or move depends on uninitialised value(s)
  at 0x1798CB0: npc_medivh_bm::npc_medivh_bmAI::UpdateAI(unsigned int) (the_black_morass.cpp:205)
  by 0x11AEFC0: Creature::Update(unsigned int) (Creature.cpp:542)
  by 0x12E96F8: Trinity::ObjectUpdater::Visit(GridRefManager<Creature>&) (GridNotifiersImpl.h:45)

 Conditional jump or move depends on uninitialised value(s)
  at 0x1798CE2: npc_medivh_bm::npc_medivh_bmAI::UpdateAI(unsigned int) (the_black_morass.cpp:210)
  by 0x11AEFC0: Creature::Update(unsigned int) (Creature.cpp:542)
  by 0x12E96F8: Trinity::ObjectUpdater::Visit(GridRefManager<Creature>&) (GridNotifiersImpl.h:45)
 2013-09-28 22:18:19 +02:00
Spp
cfaea769bc Core/RBAC: Move RBAC code to namespace rbac 2013-09-27 13:35:45 +02:00
Kirkhammett
89085f7d57 DB/Core: The Storm King's Vengeance 2013-09-27 12:50:34 +02:00
joschiwald
a0c637f52a Core/Scripts: added some OVERRIDEs 2013-09-25 16:37:43 +02:00
joschiwald
1887fa28a0 Merge pull request #10933 from MitchesD/SteamVault 
Scripts/SteamVault: reworked InstanceScript
 2013-09-25 07:13:35 -07:00
Vincent-Michael
3611d82e62 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
 2013-09-23 22:58:29 +02:00