Commit Graph

5996 Commits

Author SHA1 Message Date
Tuxity
cb118cddc7 Core/Arenas:
- You earn 180 cp when you win a match
- Correctly display cp to the good currency meta
- Rename a currency meta to avoid errors
2013-01-23 09:19:49 +01:00
Northstrider
534cba6cae Core/Auras: fix mana regeneration for cataclysm food 2013-01-22 22:18:34 +01:00
Tuxity
5b7c01e48c Core/Spells: Add missing break in previous commit 2013-01-22 17:43:18 +01:00
Tuxity
c72afa9ecf Core/Spells: Fix Tree of Life (Passive). Closes #8544
I learn something today, thx Shauren
2013-01-22 15:44:47 +01:00
Kevin Darcel
cf95ac2373 Merge pull request #9010 from Souler/fix_dispel_effects
[4.3.4] Spells: Dispel effects can always be casted
2013-01-22 03:50:08 -08:00
Northstrider
93c7f975b1 Scripts: implement Alizabal the misstress of hate
Todo: use the rest of the texts and add the missing ones
2013-01-21 23:47:17 +01:00
Souler
bff076bd2a Spells: Dispel effects can always be casted.
Signed-off-by: Souler <soulerhyd@gmail.com>
2013-01-20 20:01:23 +01:00
Shocker
9f04720779 Merge pull request #8997 from Souler/fix_mages_invisibility
Core/Spells: Mages should be able to see everything while on Invisibility
2013-01-19 20:13:27 -08:00
Shauren
a5e7936a0f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-19 18:36:39 +01:00
Shauren
0333c4ce8f Core/DataStores: Corrected reading CharStartOutfit.dbc 2013-01-19 18:19:30 +01:00
Souler
456d9a6cea Spells/Mage: Mages should be able to see everything while on Invisibility 2013-01-19 15:31:42 +01:00
Shauren
bc35a466e5 Core/Movement: Use a facing spline for chase movement 2013-01-19 13:34:17 +01:00
Shocker
6c71d555a0 Core/Achievements: Delete from guild_achievement_progress table when encountering an invalid criteria in that table 2013-01-19 02:17:41 +02:00
Vincent_Michael
0740086b6c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-19 01:02:40 +01:00
Shocker
7d28c10bd0 Core/Misc: Delete spell from character_spell table too when encountering an invalid spell 2013-01-18 03:22:58 +02:00
Vincent_Michael
fbcb2e5335 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-01-17 23:49:26 +01:00
Spp
d5faec2c0e Core/Account: Move AccountMgr back to singleton 2013-01-17 14:58:15 +01:00
Warpten
a8652baaa4 Core/Auras: Removed an unnecessary check.
mode is already checked in the first lines of SPELL_AURA_PHASE's handler.
2013-01-16 18:34:10 +01:00
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