Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,586 Commits 4 Branches 146 Tags
56bd42dcf1ffdf0bf8099a1c87dc7a52ca9663ff
Commit Graph

20586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael
56bd42dcf1 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
 2013-07-15 18:04:04 +02:00
Vincent-Michael
7104e3c70f Core: Fix build 2013-07-15 17:44:32 +02:00
Shauren
779a59e7e2 Core/Config: Refactored ConfigMgr 
* Loading initial configuration files is now separate from loading any additional custom configs
 2013-07-15 17:31:44 +02:00
Vincent-Michael
de193fc80d Scripted: Add some missing override 2013-07-15 15:14:01 +02:00
Vincent-Michael
baeecba6c9 Core: Fix build 2013-07-15 01:07:02 +02:00
Vincent-Michael
08c1a81096 Scripted/Misc: Fix random stuff 2013-07-15 01:01:37 +02:00
Vincent-Michael
9e9bdd77c5 Core: Fix build 2013-07-14 22:48:56 +02:00
Nay
b87f794e16 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
 2013-07-14 18:59:09 +01:00
Nay
8b0cea7a5e SQL: Prevent a warning in 2013_07_14_01_world_item_template.sql 2013-07-14 18:46:48 +01:00
Nay
ee31174caa DB/Items: Change item_template.Flags to uint32 (int(10) unsigned) 2013-07-14 18:15:42 +01:00
Nay
b56b282eee Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/QuestHandler.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/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.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_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/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/boss_kruul.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_ironforge.cpp
	src/server/scripts/EasternKingdoms/zone_loch_modan.cpp
	src/server/scripts/EasternKingdoms/zone_redridge_mountains.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_darkshore.cpp
	src/server/scripts/Kalimdor/zone_desolace.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_felwood.cpp
	src/server/scripts/Kalimdor/zone_feralas.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/server/scripts/Kalimdor/zone_thunder_bluff.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/scripts/World/item_scripts.cpp
 2013-07-14 16:10:20 +01:00
Warpten
cd3a7f4175 Core/Players: Dueling players in your party / raid should not make them always detectable. 
Fixes seeing stealthed rogues & druids, as well as invisible mages in duels.
 2013-07-14 16:46:11 +02:00
Nay
bedb2e56e2 DB/Errors: Fix a db startup error 2013-07-14 14:46:03 +01:00
Nay
d6f3460796 Script/Commands: Fix a crash in .arena captain command 2013-07-13 23:07:01 +01:00
Shauren
330dd624b6 Core/Movement: Do not remove movement flags that have special opcodes associated with them on teleport 
Closes #10162
 2013-07-13 15:26:10 +02:00
Malcrom
4aad735af9 Core/Scripting: Add Wrathbone Flayer script to show channelling visual and correct combat AI. 2013-07-13 09:27:27 -02:30
Nay
4ecc68d3a5 DB/EAI: Remove forgotten EAI scripts 
984fa01b61
 2013-07-12 14:40:54 +01:00
Aokromes
984fa01b61 DB/Misc: Fix Blowing Hodir's Horn 
Fix by KirkHammett closes #10270
 2013-07-12 13:20:54 +02:00
Malcrom
b91fd1c2d4 DB/Waypoints: Add missing .sql to file 2013-07-11 22:46:27 -02:30
Malcrom
f8c3be1f79 DB/Waypoints: Add waypoints to Black Temple instance. 2013-07-11 22:25:57 -02:30
Malcrom
3c73e9baff DB/Waypoints: Add some waypoints to black Temple Instance. 2013-07-11 22:12:40 -02:30
Shauren
30f6efb416 Core/Quests: Fixed quest sharing 2013-07-11 21:45:14 +02:00
Aokromes
f5cd494acb DB/Misc: Fix some spam 
Fix by KirkHammett
 2013-07-11 14:51:35 +02:00
Machiavelli
93226005c6 Scripts/Akama: Uninitialized variable 2013-07-11 13:45:51 +02:00
Warpten
55338ff53b Revert "Shared/Utils: Fixed ApplyPercentModFloatVar." 
This reverts commit 2005be0474.

Note to self: do not touch maths past 10 any more.
 2013-07-11 11:10:05 +02:00
Malcrom
f274560c4a Core/Scripting: Minor fix to Shade of Akama Script. 2013-07-10 21:21:05 -02:30
Malcrom
b7cf456f53 Core/Scripting: Additions to Shade of Akama Script. Just ending sequence left to do. 
Please supply feedback if anything is not like offi so I can fix.
 2013-07-10 18:29:32 -02:30
Warpten
2005be0474 Shared/Utils: Fixed ApplyPercentModFloatVar. 
This has been around since 2010-12-11 :)
 2013-07-10 21:44:08 +02:00
Malcrom
50e59114b1 Core/Scripting: Some cleanup for Hyjal Script. 2013-07-10 16:36:23 -02:30
Malcrom
f44f004dc5 Core/Scripting: Fixup Onyxia Script to use events. 2013-07-10 14:09:32 -02:30
Malcrom
4fe0f1339e Core/Scripting: A couple fixes for Hellfire Ramparts. 2013-07-10 13:09:37 -02:30
Malcrom
7d5be7a3ef Core/Scripting: A little update to Hellfire Ramparts. Thanks joschiwald. 2013-07-10 11:51:15 -02:30
Aokromes
8b7ae2cde8 DB/Misc: Spawn some missing gameobjects 
Data by KirkHammett
 2013-07-10 11:48:15 +02:00
Malcrom
81d8739d68 Core/Scripting: Converted Watchkeeper Gargolmar to use events. 2013-07-10 00:13:36 -02:30
Malcrom
ea49f98170 Core/Scripting: Fix up Hellfire Ramparts instance and add Instance save. 2013-07-09 23:32:34 -02:30
Malcrom
d5687a1003 Core/Scripting: Few minor fixes for Shattered Halls. 2013-07-09 18:42:52 -02:30
Malcrom
fb783fb098 Core/Scripting: A couple fixes for shattered Halls 2013-07-09 18:27:03 -02:30
Shauren
f8ba2c066b Core/Units: Removed check for current movement flags in SetRooted method to restore its old functionality as we relied on its old broken state 2013-07-09 17:36:10 +02:00
Malcrom
17398a4043 Core / Scripting: Coverted a couple Shattered Halls npc scripts to use events 2013-07-09 07:10:48 -02:30
Malcrom
ebe1ef2492 Core / Scripting: Updates to Shattered Halls and added Instance save. 2013-07-08 23:29:55 -02:30
Vincent-Michael
e464d2bd2c Scripted: Some cleanups + ninja changes 2013-07-08 21:15:23 +02:00
Malcrom
d8b39e9bae Core/Scripting: Fix some errors in Shade of Akama script. 2013-07-08 16:31:29 -02:30
Malcrom
ac85fac977 Core / Scripting: fix a few warnings. 2013-07-08 14:44:10 -02:30
Malcrom
92eec6831a Core: Scripting: Shade of Akama WIP 2013-07-08 12:39:32 -02:30
blub
bebae5d3fa Create 2013_07_08_00_world_gameobject.sql 
SQL: Fix fail in 5a6eacfa33
 2013-07-08 16:38:48 +02:00
Aokromes
5a6eacfa33 DB/Spawns: Add missing Gameobjects into The Shattered Halls 
Note: some doors needs to be scripted after this.
 2013-07-07 20:34:26 +02:00
Aokromes
7202e40618 DB/Misc: Fix typo 2013-07-07 20:16:48 +02:00
Aokromes
dc5936a296 DB/Misc: Fix some runtime errors 
Also spawns 2 missing doors on Old Hyjal, this doors needs to be scripted.
 2013-07-07 20:14:52 +02:00
Nay
3561ab98ba Misc: Use override and final C++11 keywords in a few places (mostly scripts) 
OVERRIDE and FINAL are TC macros (expand to nothing if compiler does not  support C++11)
 2013-07-06 20:21:45 +01:00
Hobbilis
0c911af24c DB/SAI: Converting Axtroz EventAI to SmartAI 
Closes #9610
 2013-07-06 17:07:50 +02:00