Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 21:32:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
19,004 Commits 4 Branches 146 Tags
0e8011657d08c4a9f12657ccbe2f73aa56effaaa
Commit Graph

5978 Commits

Author SHA1 Message Date
Spp
0e8011657d Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
 2013-01-16 15:29:41 +01:00
Spp
927062f61f Core/Misc: Some changes to reduce differences with 4.3.4 branch + some cosmetic changes 2013-01-16 11:17:14 +01:00
Spp
be3826825e Core/Logging: Use correct realmId when logging to DB 2013-01-16 08:59:56 +01:00
Malcrom
ace7bbeddf Core/Zul'Grub: Fix up Mandokir Boss 2013-01-16 00:41:03 -03:30
Aokromes
134785f7f1 Core/Log: Change an error to contain DB table guid instead of low guid 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-01-16 01:17:13 +00:00
Trista
8081704c66 Merge pull request #8879 from joschiwald/spell_proc_scripts 
Core/SpellScripts: Implement Spell Proc Hooks and use them in old and new ...
 2013-01-15 14:56:45 -08:00
Shauren
9007ef905f Core: Fixed some compile warnings 2013-01-14 15:05:30 +01:00
Spp
0d5cb6af75 Core/Misc: Apply codestyle to multiple files (II) 2013-01-14 11:12:58 +01:00
Spp
d75222feca Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Battlegrounds/BattlegroundQueue.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementUtil.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.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_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/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Packets/ByteBuffer.h
 2013-01-14 11:04:03 +01:00
Spp
7540cfedfc Core/Misc: Minor cosmetic change to avoid some merge conflicts 2013-01-14 10:02:06 +01:00
Spp
802657250c Core/Misc: Apply codestyle to multiple files 2013-01-14 09:50:59 +01:00
Kaelima
c6f5bef468 Merge pull request #8906 from ille/GridLock 
Core/Maps: separate mutex for grid
 2013-01-13 17:35:59 -08:00
Spp
4c247f5d2d Core/Dungeon finder: Fix teleport out after dungeon is finished 
Closes 8914
 2013-01-13 16:22:41 +01:00
Gacko
8be3d4cc80 Core/BG: Add workaround annotation and use exact coords 2013-01-13 16:15:35 +01:00
kaelima
c54fb9efb4 Core/BG: Corrections to cf5058c4e3 2013-01-13 15:43:32 +01:00
therzok
6d9ac921e0 Core/DBC: Fixed startup 
Closes #8930
 2013-01-13 14:25:54 +00:00
Malcrom
df2e54f587 Core/Scripting: More cleanup to Mechanar scripts. Added missing doors and handling to instance. 2013-01-12 19:35:14 -03:30
Warpten
2a2924fb50 Core/GuildFinder: Fixed a possible crash and a typo. 2013-01-12 22:10:47 +01:00
Gacko
26aeed3744 Once last codestyle change. 2013-01-12 20:33:08 +01:00
Gacko
31043b1ae3 Fix codestyle in da21bbe93c 2013-01-12 20:29:40 +01:00
Gacko
da21bbe93c Core/Battleground: Eye of Storm - Fel Reaver Ruins 
Make it possible to deliver the flag at Fel Reaver Ruins which was
impossible before because of a big areatrigger which covered the original
areatrigger for the flag point.

Solves #337. Thanks to @Greymane
 2013-01-12 20:28:12 +01:00
Gacko
f739be5052 Core/UnitAI: Checks in DoCastVictim 
Consider triggered flag and unit state
 2013-01-12 13:47:32 +01:00
w1sht0l1v3
d8b2954507 Core/Tickets: Allow viewing of ticket response(if any) when using .ticket viewid or .ticket viewname. 
Fix an sql name.
 2013-01-12 14:26:30 +02:00
Marius Ungureanu
95fba877fe *Core/DBC: Updated structs. 
**AreaTableEntry
**CharStartOutfitEntry
**CurrencyTypesEntry
**FactionEntry
**GemPropertiesEntry
**GlyphPropertiesEntry
**LFGDungeonEntry
**MapEntry
**SkillLineAbilityEntry
**SpellEntry
**SpellPowerEntry
**SpellShapeshiftFormEntry
**TaxiNodesEntry
**Removed TeamContributionPoints.dbc parsing as it is deprecated since WotLK.
 2013-01-12 00:42:33 +02:00
Marius Ungureanu
c068adec52 Core/Opcodes: Warning fix. 2013-01-12 00:42:33 +02:00
Vincent_Michael
b13e5694b6 Core/Conditions: Implement CONDITION_UNIT_STATE = 21 2013-01-11 23:37:53 +01:00
Shauren
84553f168c Core/DataStores: Changed index on CharStartOutfit.dbc to allow lookups directly using race/class/gender combo instead having to iterate entire store to find the proper entry 2013-01-11 20:50:05 +01:00
Vincent_Michael
66e8d8c69e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
 2013-01-11 19:10:10 +01:00
kaelima
cf5058c4e3 Core/BG: Corrected data sent in SMSG_BATTLEFIELD_STATUS packet. 
*should* close #7994
 2013-01-11 18:58:12 +01:00
Vincent_Michael
6cd962ee71 Core: Fix non pch build 2013-01-11 14:21:39 +01:00
ille
bb995fcad1 Core/maps: separate mutex for grid 2013-01-11 13:11:08 +01:00
Tuxity
a6c64c8c7e Core/Formulas: Fix rounding problem in conquest rating calculator. 2013-01-11 10:42:00 +01:00
Nay
efa094e893 Merge pull request #8581 from Butterfly69/patch-9 
Core/Spells:Beacon of Light
 2013-01-10 23:29:51 -08:00
Marius Ungureanu
95cf2585bd *Core/Currency: - Fixed Tuxity's latest revisions to currency fixes. - Compilation fix. /slap Tuxity? XD 
Signed-off-by: Nay <dnpd.dd@gmail.com>
 2013-01-11 00:51:56 +00:00
joschiwald
89490e4d7f Core/SpellScripts: implement Spell Proc Hooks and use it in old and new proc system 
Hooks:
- DoCheckProc: executed when aura checks if it can proc
- DoPrepareProc: executed before aura procs (possibility to prevent charge drop/cooldown)
- OnProc: executed when aura procs
- OnEffectProc: executed when aura effect procs
- AfterEffectProc: executed after aura effect proced
- AfterProc: executed after aura proced and charges removed

using PreventDefaultAction() in DoPrepareProc will prevent charge drop and cooldown

default execution of a proc can prevented in OnEffectProc with PreventDefaultAction()

Now we should be able to convert almost all procs from Unit::ProcDamageAndSpellFor to SpellScripts

Notes to old proc system:
- if a proc has a cooldown we must check it in spellscript and add it when we handle the proc
- behavior with charge drops is possible undefined (use PreventDefaultAction() in OnEffectProc to notify that the script is executed)
 2013-01-11 01:21:44 +01:00
Nay
8274e42e3d Core/SAI: Add 2nd parameter to SMART_ACTION_CALL_FOR_HELP to say "%s calls for help!" if enabled 
Similar to SMART_ACTION_FLEE_FOR_ASSIST "%s attempts to run away in fear!"
 2013-01-10 15:09:12 +00:00
Tuxity
91c4f2c2fb Core/Battleground: Fix asynch countdown timer for new players. close #8761 2013-01-10 15:38:39 +01:00
Tuxity
2f48fe7cf1 Core/Currency: 
- Fix a typo in conquest points formulas
- Correctly fix max justice and honor points
- Remove a previous fix when refunding an item, my mistake
ref #8892
 2013-01-10 14:18:14 +01:00
Warpten
3c8a957692 Core/GuildFinder: Fixed a missing typecast. Also correctly display the guild's achievement points. 2013-01-10 12:00:11 +01:00
Tuxity
d754ca16fb Core/Battleground: Fix team logo at countdown timer expire by @Vincent-Michael 
Fix typo when refunding currencies, thx @kennylive
 2013-01-10 10:02:32 +01:00
Tuxity
71b0b30712 Core/Battleground: 
- Fix team logo after countdown timer expire. close #8887
- Add more options with justice and honor points in conf file, also fix a wrong cap value.
- Grant back currencies when refunding an item and fix price.
ref #8892
 2013-01-09 20:37:02 +01:00
Spp
677ed18080 Core/Dungeon Finder: Fix group (5) unable to do new dungeon after finished last dungeon 
- Some optimizations here and there
- Drop unused columns related to dungeon rewards
- Simplify Group reward. All people inside the dungeon should get the reward, no matter how far it's from the boss
 2013-01-09 15:15:42 +01:00
Vincent_Michael
ecedb798aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Conditions/ConditionMgr.h
 2013-01-07 16:39:01 +01:00
Nay
d0e4e20265 Merge pull request #8825 from joschiwald/vmapspelligno 
Core/VMaps: drop "vmap.ignoreSpellIds" in config
this is not longer necessary since we use SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS
 2013-01-07 07:36:40 -08:00
Nay
5f28502c0a Merge pull request #8738 from joschiwald/spell_proc_conditions 
Core/Conditions: implement CONDITION_SOURCE_TYPE_SPELL_PROC and use it i...
 2013-01-06 18:29:55 -08:00
Valcorb
8743e9d368 Fix a small typo 2013-01-07 00:55:11 +01:00
Valcorb
8d9476fd9c Make sure that "guardians" also gain the owner's speed 2013-01-06 22:35:25 +01:00
Vincent_Michael
d5163d846f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.cpp
 2013-01-05 17:01:46 +01:00
Vincent_Michael
7dd0cd4403 Core: Fix non pch build 2013-01-05 16:33:28 +01:00
Machiavelli
b52346522e Core/Vehicles: Add some internal checks in vehicle code to prevent crashable behaviour caused by scripts or other areas of the core. 2013-01-05 15:40:36 +01:00