Subv
31f6612baa
Merge pull request #8384 from Amit86/toc_fix_typo
...
Fix a typo in Trial Of The Crusader ELEGIBLE -> ELIGIBLE
2012-11-21 05:18:59 -08:00
Subv
17071df235
Merge pull request #8383 from blipi/lfg_fixes
...
Core/Dungeon Finder: Properly save old state for LfgPlayerData
2012-11-20 19:35:45 -08:00
Subv
a17d44bcc2
Merge pull request #8381 from blipi/lfg_fixes
...
Core/Dungeon Finder: Old state should be saved, not the new one
2012-11-20 19:19:30 -08:00
Subv
d42212b595
Core/Battlegrounds: Add methods for determining the winner of a BG if it has ended due to not enough players.
...
Implemented for Arathi Basin, Alterac Valley, Warsong Gulch and Eye Of The Storm.
All other BGs winner are currently decided based on the number of players of each side, they will be implemented later.
2012-11-18 22:07:44 -05:00
Subv
a337abc436
Scripts/Instances: Added missing definition from previous commit.
2012-11-18 20:53:27 -05:00
Subv
bbe146d104
Scripts/Instances: Save Magister's Terrace door (and statue) state.
...
Closes #6889
2012-11-18 20:33:03 -05:00
Subv
b768ebc68f
Fixed build.
...
Thanks vincent-michael
2012-11-17 15:21:05 -05:00
Subv
01d2126e7c
Core/SAI: Allow the actions CALL_KILLEDMONSTER, CALL_GROUPEVENTHAPPENS and CALL_AREAEXPLOREDOREVENTHAPPENS to be used on vehicles, affecting all of their passengers.
2012-11-17 14:57:20 -05:00
Subv
d55771267a
Core/EventAI: Removed table creature_ai_summons.
2012-11-16 12:30:48 -05:00
Subv
aff6684b7a
SQL: Reorganized SQL files regarding previous merge.
2012-11-16 09:21:51 -05:00
Subv
cef716ff86
Core/SQL: Renamed SQL from previous merge
2012-11-16 08:35:56 -05:00
Subv
ecf3f6c2c7
Merge pull request #8291 from Gacko/utgardekeep
...
Core/DB: Utgarde Keep
2012-11-16 05:33:16 -08:00
Subv
d13ca54ecc
Core/Log: Added more information to the log in MoveSplineInitArgs::Validate
2012-11-15 08:27:23 -05:00
Subv
b295688322
Core/Maps: Changed SMSG_SET_PHASE_SHIFT to send either 8 or 0 depending on whether the player is phased or not.
2012-11-14 17:22:39 -05:00
Subv
11df55f8b1
Core/DBC: The index of a DBC fmt is represented by 'n'
...
(Solves previous commit error)
2012-11-14 17:06:46 -05:00
Subv
7bee7d3a9a
Core/Maps: Set correct phase flag from DBC when using phases.
...
Fixes AreaTriggers and some other things.
Thanks @lehtola for the tip.
2012-11-14 17:00:21 -05:00
Subv
cb9dd9bd7e
Merge pull request #8280 from DjYXA/patch-1
...
Daze mechanics Fix - By Arrakio
2012-11-14 07:59:17 -08:00
Subv
6325060804
Core/Spells: Enslave Demon shouldn't be usable on player pets.
...
Closes #7133
2012-11-14 10:33:56 -05:00
Subv
10a8a4f8f6
Missing variable in the function call.
2012-11-14 09:42:05 -05:00
Subv
51414967c4
Core/Build: Fixed a little mistake.
2012-11-14 09:35:45 -05:00
Subv
4e22731467
Merge pull request #8258 from ille/pointercheck
...
Core/Scripts: tweak code in pyrewood_ambushAI::SummonCreatureWithRandomT...
2012-11-05 10:10:33 -08:00
Subv
ebdbe869af
Core/SQL: Changed codification of recent SQL file to ANSI
2012-10-25 10:54:22 -05:00
Subv
9084c89ea8
Core/SQL: Renamed file from previous merge.
...
Corrected the guids.
2012-10-25 10:11:56 -05:00
Subv
55892048ef
Merge pull request #8127 from Gacko/childrens_week
...
Core/DB: Children's Week
2012-10-25 07:43:02 -07:00
Subv
69a81836ab
Merge pull request #8174 from tibbi/sota
...
correcting SotA teleports + cleanup
2012-10-25 05:56:01 -07:00
Subv
43d57c7547
Core/Build: Build fix from previous merge
2012-10-21 17:28:04 -05:00
Subv
bcabdb08e4
Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4
2012-10-21 17:26:37 -05:00
Subv
1fc3aad9d7
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/DataStores/DBCfmt.h
src/server/game/DungeonFinding/LFGMgr.h
src/server/scripts/Kalimdor/feralas.cpp
2012-10-21 17:18:35 -05:00
Subv
4fd9f8693b
Core/SQL: Renamed SQL from previous merge.
2012-10-21 17:13:18 -05:00
Subv
82c251dc3d
Merge pull request #8088 from Gacko/q13038
...
Core/DB: Quest 'Distortions in time'
Closes #3011
2012-10-21 15:11:50 -07:00
Subv
bc1714161a
Merge pull request #8146 from Gacko/usetraps
...
Core: Implement Gameobject::Use() for traps
Closes #8137
Closes #4811
2012-10-21 15:10:42 -07:00
Subv
e475b50f58
Core/Conditions: Fixed a mistake in Conditions loading which didn't allow to use SAI conditions with negative source entry (guid)
2012-10-21 15:33:31 -05:00
Subv
5548e89191
Merge pull request #8138 from durotar/master
...
Core/Script: Gnomeregan - Deleting duplicate texts and script adjusted
2012-10-21 05:35:40 -07:00
Subv
1252e167e5
Core/SQL: Corrected a mistake from previous merge.
...
Author: @Gacko
2012-10-20 10:41:16 -05:00
Subv
14adb5bcac
Merge pull request #8134 from Gacko/q2987
...
Core/DB: Quest 'Gordunni Cobalt'
2012-10-20 07:07:21 -07:00
Subv
38ca1531d8
Core/SQL: Renamed SQL from previous pull request merge.
2012-10-19 17:37:20 -05:00
Subv
5362fc54f5
Merge pull request #8107 from durotar/master
...
Core/Script: Update creature_text for Gnomeregan
2012-10-19 15:34:45 -07:00
Subv
77a8d6f127
Scripts/Spells: Corrected the spirit value used in the Mana Tide Totem script.
2012-10-19 16:16:30 -05:00
Subv
56df638092
Core/Entities: Fixed declining a group invitation
2012-10-17 20:23:18 -05:00
Subv
f8feb1ec0e
Core/Scripts: Fixed build
2012-10-17 17:35:50 -05:00
Subv
2356e936a4
Scripts/Spells: Updated some Shaman SpellScripts to 4.3.4
2012-10-17 15:04:51 -05:00
Subv
705873091b
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/TicketHandler.cpp
src/server/game/Tickets/TicketMgr.cpp
src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
2012-10-16 21:55:01 -05:00
Subv
27f091806a
Core/SpellAreas: Changed the way quest_start and quest_end works.
...
They now follow this rule:
The player's quest status of quest_start must have the mask defined in quest_start_status in order for the spell to be applied/kept.
The player's quest status of quest_end must _NOT_ have the mask defined in quest_end_status in order for the spell to be removed
To generate the mask:
Take the QuestStatus enum in QuestDef.h, use (1 << theValueYouWant) to obtain a mask and you can use | to combine masks.
This expands the usage of the spell_area table, making possible to give a player an aura while he has a quest, but remove it as soon as the quest is completed (not rewarded).
Feature request by @Svannon
2012-10-16 21:44:28 -05:00
Subv
b49891e348
Core/Entities: Fixed the WorldObject::BuildMonsterChat method.
...
closes #7556
2012-10-16 20:17:45 -05:00
Subv
644d3c0987
Codestyle: Fixed codestyle from previous commits.
2012-10-16 14:41:13 -05:00
Subv
4d526fd73d
Core/Vendors: Fixed the "Item not found" error message when trying to buy an item from a vendor.
2012-10-16 14:28:41 -05:00
Subv
bbb5712e97
Core/Vendors: Fixed the "Item does not go into that slot" problem.
...
The client sends the player guid when trying to store the item in the default backpack (255)
2012-10-16 13:18:32 -05:00
Subv
bc792e7c66
Core/Achievements: Fixed a recursive call in AchievementGlobalMgr::GetAchievementCriteria
2012-10-16 11:27:36 -05:00
Subv
fba9c0a82e
Scripts/Halion: Fixed some warnings
2012-10-16 09:39:56 -05:00
Subv
8536b360a0
Core/Spells: Fix a possible crash in Light's Beacon when a player logged in with the aura.
2012-10-16 09:24:53 -05:00
Subv
7cc1b999a6
Merge pull request #8073 from cristal/PvPLogData
...
Core/Battlegrounds: Fix visual honor gain in PvPLogData
2012-10-15 19:21:08 -07:00
Subv
fc796fb879
Scripts/Spells: Deleted a deprecated SpellScript (Astral Shift)
2012-10-15 18:01:16 -05:00
Subv
fe55f735c1
Scripts/Spells: Updated some more spells to 4.3.4
2012-10-15 14:27:56 -05:00
Subv
e10c4afc35
SQL: Renamed SQL from previous merge.
2012-10-15 13:46:42 -05:00
Subv
acc617c1ab
Merge pull request #7979 from Naios/phase_definitions_rebase
...
[4.3.4] Phase Definitions, Terrainswap & Multiphasing (v.2)
2012-10-15 11:38:29 -07:00
Subv
c757f811f2
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/scripts/Commands/cs_modify.cpp
2012-10-15 11:15:25 -05:00
Subv
963aa5a159
Scripts/Spells: Updated some warlock spellscripts to 4.3.4
2012-10-14 19:18:18 -05:00
Subv
c199e30874
Core/XP: Players only get 10% xp for killing NPCs of the same expansion or lower.
2012-10-12 10:46:06 -05:00
Subv
b06e9cfd41
Revert "Core/Entities: Do not create the model twice for a GameObject."
...
This reverts commit 0f166336ca .
2012-10-12 09:33:34 -05:00
Subv
7918ac0dea
Merge pull request #8051 from Aokromes/master
...
Core/Battlefield: Compile Fix
2012-10-11 18:40:40 -07:00
Subv
eff164caf6
Core/Build: Fixed some more errors from recent merge.
...
Closes #8038
2012-10-10 17:31:00 -05:00
Subv
ec21666cc6
Core/Build: Fixed some compile errors left from the merge.
2012-10-10 15:45:05 -05:00
Subv
c51f984837
Core/Misc: Only remove auras in arenas for non-gm players.
...
Closes #7559
2012-10-10 15:12:05 -05:00
Subv
970009cb3b
Core/Players: Remove the mute from the DB when the timer expires.
2012-10-10 11:49:51 -05:00
Subv
a8fa67c53c
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/World/World.cpp
src/server/game/World/World.h
2012-10-10 10:29:18 -05:00
Subv
1f699f2cd3
Core/Scripts: Fixed the command to restore deleted characters.
2012-10-10 10:14:26 -05:00
Subv
ecc2362c69
Scripts/Commands: Fixed the command to restore a deleted character.
...
Thanks @vlad852
2012-10-10 09:25:25 -05:00
Subv
af00564184
SQL: Renamed SQL from previous pull request.
2012-10-10 09:15:34 -05:00
Subv
595d194d99
Core/Players: Fixed a possible crash if a player is in an invalid zone
...
Thanks to the ones who commented in the commit that introduced the issue.
2012-10-10 09:13:03 -05:00
Subv
6b5aa93dda
Merge pull request #8035 from Retriman/BG
...
DB:
2012-10-10 07:08:51 -07:00
Subv
ef6e7e0914
Merge pull request #8001 from tibbi/reputation_convert
...
correct reputation converting at faction change
2012-10-10 06:43:47 -07:00
Subv
3e5af53bf7
Core/Achievements: ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL doesn't require a killing blow anymore, only a honorable kill.
...
Author: @tibbi
Closes #6224
2012-10-09 22:59:18 -05:00
Subv
b75b6d33b0
Core/Achievements: Fixed achievements with ACHIEVEMENT_CRITERIA_TYPE_WIN_ARENA
...
Closes #6339
2012-10-09 22:50:02 -05:00
Subv
93189bacc5
SQL/StackRules: Added one more stack rule.
...
Totem of Wrath and Heart of the Crusader should not stack.
2012-10-09 12:04:04 -05:00
Subv
5eccf9f4da
SQL/StackRules: Added one more stack rule.
...
Blood Frenzy (Warrior) and Savage Combat should not stack.
ref #7667
2012-10-09 11:22:46 -05:00
Subv
cce014a2ba
SQL/StackRules: Added a stack rule for some spells.
...
Improved Scorch, Improved Shadow Bolt and Winter's Chill should not stack
ref #7667
2012-10-09 11:01:51 -05:00
Subv
c18b3d7169
Merge pull request #8029 from tibbi/char_glyphs
...
allow glyph1 be null like other glyph slots
2012-10-09 08:03:45 -07:00
Subv
0620d22491
Core/SAI: Added a missing break.
2012-10-08 18:38:15 -05:00
Subv
c6f4f0287a
Merge pull request #7999 from tibbi/Cinderglacier
...
Make Rune of Cinderglacier not proc off dots
2012-10-07 17:57:58 -07:00
Subv
00373eee90
Merge pull request #8015 from Retriman/masspellsTIII
...
Core/Spells:
2012-10-07 17:52:14 -07:00
Subv
4dc28e9420
Core/SAI: Fixes crashes when using SMART_EVENT_[IC/OOC]_LOS
...
It should also fix some wrong behaviors in scripts that use these events.
2012-10-07 19:31:13 -05:00
Subv
42d606a81b
Core/Spells: Fixed a crash caused by Beacon of Light.
...
GroupReference sources should always be checked against NULL pointers.
2012-10-07 19:02:59 -05:00
Subv
74707a08d3
Core/Misc: Fix a format error in ByteArrayToHexStr
...
Was appending an extra space.
Closes #7959
2012-10-04 19:13:39 -05:00
Subv
93a78d9bb5
Merge pull request #7950 from Retriman/ahorasi!
...
Core/Script: Dungeon Ahnkahet Boss Amanitar.
2012-10-02 18:34:27 -07:00
Subv
d44ec4b7da
Merge pull request #7936 from Retriman/ahorasi!
...
Core/Script: Dungeon Ahnkahet Boss Amanitar.
2012-10-01 13:22:58 -07:00
Subv
174deb131a
SQL: Rename SQL from previous merge.
2012-09-30 17:47:47 -05:00
Subv
816595613b
Merge branch 'master' of github.com:TrinityCore/TrinityCore
2012-09-30 17:46:20 -05:00
Subv
875e642622
Merge pull request #7924 from Retriman/master
...
Core/Script: Update creature_text for boss Jedoga Shadowseeker
2012-09-30 15:27:49 -07:00
Subv
431db10e1a
Core/Battlefield: fix world states on player login for wintergrasp
2012-09-28 09:44:34 -04:00
Subv
4a77a3062e
Merge branch 'master' of github.com:TrinityCore/TrinityCore
2012-09-26 17:11:31 -05:00
Subv
693bdc6ce6
Miscellaneous: Minor codestyle change.
2012-09-26 12:17:26 -05:00
Subv
1bb39edd02
Core/Maps: Use DBC value to determine the maximum depth that a player can reach in an area before being teleported back up.
2012-09-26 12:10:23 -05:00
Subv
0d8a8e9486
Core/Entities: Updated some pet stats code to Cataclysm.
2012-09-26 11:03:46 -05:00
Subv
df12eba820
Core/Entities: Use the Ranged Attack Power multiplier from the DBC to calculate ranged attack power bonus from agility
2012-09-26 10:50:44 -05:00
Subv
6446a73cc1
Core/PacketIO: Fixed CMSG_MESSAGECHAT_ADDON_BATTLEGROUND
2012-09-18 19:19:38 -05:00
Subv
4f21324762
Merge pull request #7793 from Elron103/pull-requests
...
Core/Calendar: Add TwoSide Interaction configuration option for Calendar...
2012-09-16 17:31:13 -07:00
Subv
dd9d7e6870
Core/Spells: Fixed SPELL_AURA_DEPOSIT_BONUS_MONEY_IN_GUILD_BANK_ON_LOOT
2012-09-10 18:43:06 -05:00
Subv
7bfd36ae80
Core/Spells: Fixed SPELL_AURA_CAST_WHILE_WALKING
2012-09-10 18:20:26 -05:00
Subv
dd7e73b347
Core/Spells: Send SMSG_SPELL_[START/GO] also for spells with SPELL_ATTR8_AURA_SEND_AMOUNT
2012-09-10 18:01:29 -05:00
Subv
5d57bd646b
Core/Spells: Add parenthesis to some bitwise AND comparisons
2012-09-10 15:54:28 -05:00