Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 05:11:55 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,036 Commits 4 Branches 146 Tags
391992ed80f3f91b95d19d5cab1b0b4e8f8fb8be
Commit Graph

28036 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Carbenium
391992ed80 Core/PacketIO: Updated and enabled CMSG_ITEM_PURCHASE_REFUND 2016-02-02 01:06:44 +01:00
Carbenium
6fbfc61de1 Core/PacketIO: Updated and enabled CMSG_DISMISS_CRITTER 2016-02-01 20:14:10 +01:00
Shauren
a174fa4d7b Core/PacketIO: Updated and enabled CMSG_CONFIRM_RESPEC_WIPE, SMSG_RESPEC_WIPE_CONFIRM 2016-01-30 23:56:02 +01:00
Carbenium
3ec79c96c3 Merge pull request #16428 from Carbenium/mmap-memleak 
Collision/MMap: Fix a memleak reported by valgrind
 2016-01-30 20:44:49 +01:00
Carbenium
32e8b6506f Collision/MMap: Fix a memleak reported by valgrind 
Tiles which are owned by the mesh should have the DT_TILE_FREE_DATA flag to ensure
deallocation on removal from the mesh.

Log:
==23516== 6,181,976 bytes in 6 blocks are definitely lost in loss record 15 of 15
==23516==    at 0x4C298A0: operator new[](unsigned long) (vg_replace_malloc.c:389)
==23516==    by 0x2052660: dtCustomAlloc(int, dtAllocHint) (Memory.h:11)
==23516==    by 0x29D7FDA: dtAlloc(int, dtAllocHint) (DetourAlloc.cpp:43)
==23516==    by 0x230AA70: MMAP::MMapManager::loadMap(std::string const&, unsigned int, int, int) (MMapManager.cpp:166)
==23516==    by 0x1DD585B: Map::LoadMMap(int, int) (Map.cpp:125)
==23516==    by 0x1DD7266: Map::LoadMapAndVMap(int, int) (Map.cpp:200)
==23516==    by 0x1DD93C6: Map::EnsureGridCreated_i(CoordPair<64u> const&) (Map.cpp:453)
==23516==    by 0x1DD9129: Map::EnsureGridCreated(CoordPair<64u> const&) (Map.cpp:429)
==23516==    by 0x1DED100: Map::GetGrid(float, float) (Map.cpp:2200)
==23516==    by 0x1DE0F4C: Map::GetAreaFlag(float, float, float, bool*) const (Map.cpp:2349)
==23516==    by 0x198521B: Map::GetZoneId(float, float, float) const (Map.h:353)
==23516==    by 0x197CFF0: WorldObject::GetZoneId() const (Object.cpp:1277)

Phase tiles aren't managed by detour so they shouldn't be free'd automatically on removal.
See MMapManager::UnloadPhaseTile
 2016-01-30 20:40:54 +01:00
Dr-J
3d2d628889 Remove unintended file 2016-01-30 15:23:37 +00:00
Dr-J
a224c400b1 DB/SAI: Overthane Balargarde 
A couple of updates to previous commit a258e36039

Closes #4841
 2016-01-30 15:16:18 +00:00
Shauren
01be486f2f Core/Misc: Removed unneccessary boost/asio/buffer.hpp include 2016-01-28 17:49:41 +01:00
Shauren
8bc3f5545e Merge pull request #16378 from Zedron/6.x 
Core/Spells: Fixed a possible crash in spell_pal_light_s_beacon
 2016-01-27 21:54:47 +01:00
Boomper
3f503cd1d1 Core/Spells: Fixed Heroic Leap 
Closes #14807
Closes #14134
 2016-01-27 21:53:05 +01:00
Aokromes
2e2fe86f31 DB/Misc: Delete duplicate spawns 2016-01-26 14:17:42 +01:00
Carbenium
5918140146 DB: Add missing DELETE statement (2016_01_22_00_world) 2016-01-26 09:20:16 +01:00
Shauren
e0437ca494 Core/Spells: Implemented casting spells on movement finish from SPELL_EFFECT_JUMP, SPELL_EFFECT_JUMP_DEST and SPELL_EFFECT_CHARGE 2016-01-25 19:35:41 +01:00
Zedron
4b4237174f Core/Spells: Fixed a possible crash in spell_pal_light_s_beacon 2016-01-24 17:09:02 -06:00
Shauren
11ad71e2fc Core/Misc: Fixed array out of bounds access when loading locales_achievement_reward, locales_creature_text, locales_gossip_menu_option and skip LOCALE_none when iterating over locales 2016-01-24 15:08:49 +01:00
Shauren
d5b0ffbe9b Core/Misc: Added safeguard against generating invalid selection weight data in Trinity::Containers::SelectRandomWeightedContainerElement 2016-01-23 11:34:47 +01:00
Aokromes
55bfd2d738 DB/Misc: Fix startup errors 2016-01-23 06:58:12 +01:00
Aokromes
5275d31f10 Update 2016_01_22_00_world.sql 2016-01-23 04:38:26 +01:00
Shauren
044edced9a Core/Spells: Ignore category cooldowns for triggered spells. 
* This fixes weird issues where triggered spell fails because it has the same category as the spell triggering it

Closes #15794
Closes #15048
 2016-01-22 22:11:11 +01:00
myran2
2652d700e1 Core/Spells: Updated combo point handing 
Closes #15996
 2016-01-22 20:27:48 +01:00
Carbenium
d3be63d0c8 Fix some linebreaks in 2016_01_22_00_world.sql 2016-01-22 19:37:22 +01:00
Killyana
657b7ccbb9 DB/SAI: Update SMART_ACTION_SET_INGAME_PHASE_MASK 2016-01-22 19:18:13 +01:00
Aokromes
812e3ad568 Update 2016_01_22_00_world.sql 2016-01-22 16:57:23 +01:00
Aokromes
773a94041b DB/Misc: Spawn Blackwing Descent 
I suppose by Malcrom
 2016-01-22 13:46:43 +01:00
Aokromes
52604405c1 DB/Misc: Sync 6.x gameobject spawns with 3.3.5a 2016-01-22 13:26:31 +01:00
Aokromes
fa73a782c7 DB/Misc: Sync 6.x gameobject spawns with 3.3.5a 
Yes. i known phaseIds are incorrect, if you don't have better to blame, fix it yourself. They will be fixed when i finish this.
 2016-01-22 12:31:03 +01:00
Shauren
f4ebab2a73 Buildsystem: Try picking up zmq lib for VS 2013 if using VS 2015 2016-01-21 17:50:37 +01:00
Carbenium
575d5f5ff8 Core/PacketIO: CMSG_BATTLEMASTER_JOIN_ARENA 2016-01-20 23:01:12 +01:00
[Dev]Rival
38116dd905 Core/BattlegroundIC: Duplicate Keep Cannons. 
(cherry picked from commit fb6a7407e2)
 2016-01-20 22:08:26 +01:00
jackpoz
8f13fe9c3b Scripts/ICC: Fix static analysis issue 
Fix an issue reported by static analysis

(cherry picked from commit 4191bb868a)
 2016-01-20 22:01:17 +01:00
jackpoz
8f91df0465 Scripts/Commands: Modify ".setskill" command to target current Player by default 
(cherry picked from commit e138e094a9)
 2016-01-20 21:59:49 +01:00
jackpoz
0f157f1eac Merge pull request #16186 from ariel-/spellmodcharges 
Core/Spells: Fix redundant mod charge drop and spell crit calc
(cherry picked from commit b39216eed3)
 2016-01-20 21:58:38 +01:00
Francesco Borzì
6c3f2b9d9b Merge pull request #16208 from ShinDarth/putricide-fix 
[3.3.5] Scripts/ICC: Fixed Professor Putricide
(cherry picked from commit 3e42d83e9c)
 2016-01-20 21:56:55 +01:00
jackpoz
06fdcb9e18 Merge pull request #16193 from Goatform/3.3.5 
Core/GameObjects: Fixed an issue where traps were not redirected to Grounding Totem
(cherry picked from commit 2a50ea5cf1)
 2016-01-20 21:55:50 +01:00
jackpoz
ea2c2c9763 Merge pull request #16188 from Asterc/3.3.5 
Core/Player: Fix profession specialization being re-learnt on login after unlearning it
(cherry picked from commit 1c89b4dcdf)

Conflicts:
	src/server/game/Entities/Player/Player.cpp
 2016-01-20 21:53:51 +01:00
Aokromes
524c3b2e26 Build/Misc: Clarify the meaning of one setting 
(cherry picked from commit 6861deaae2)
 2016-01-20 21:31:10 +01:00
jackpoz
36ed04bc6b Scripts/Commands: Fix ".help" command to show commands in alphabetical order 
(cherry picked from commit 841ce54a0d)
 2016-01-20 21:29:21 +01:00
jackpoz
e7f7ffa73f Scripts/Commands: Modify ".learn" command to target current Player by default 
(cherry picked from commit f22b1938db)
 2016-01-20 21:28:17 +01:00
Vincent-Michael
834ce504ae Core/Objects: Fix typo in 19cab2c508 
(cherry picked from commit dbe854cd31)

Conflicts:
	src/server/game/Globals/ObjectMgr.h
 2016-01-20 21:10:36 +01:00
Shauren
038138592d Merge pull request #15995 from ShinDarth/mmr 
Core/Arena: more arena configs
(cherry picked from commit 776103cfea)

Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.cpp
 2016-01-20 20:59:40 +01:00
Shauren
a6dd6d7841 Core/Logging: Include more info in bad realm log 2016-01-20 17:19:42 +01:00
Shauren
a36d8d54c5 Warning fix 2016-01-19 20:43:35 +01:00
Shauren
3cd3184394 Core/Quests: Implemented new quest objective types 2016-01-19 20:12:09 +01:00
Shauren
a50b1d0924 Core/Items: Updated item socketing opcodes 2016-01-18 19:52:49 +01:00
MitchesD
34a07db263 DB/Creature: fixed invalid spawnMasks for all creatures 
* fixed +- 1500 startup errors
 2016-01-17 20:52:49 +01:00
Killyana
5fd33ef16c DB/Quest: Master and Servant 
Remove unneeded condition to allow quest item usage in all areas as the item can be used only in few npcs
Closes #16136

(cherry picked from commit f4e2fb8f79)
 2016-01-17 14:17:59 +01:00
Killyana
1552fc93bc DB/Creature: Fix Wretched Captive Orientation 
For all branchs

(cherry picked from commit c812b0dbf5)
 2016-01-17 14:16:02 +01:00
Killyana
3294071c79 DB/Creature: Add missing spawns 
(cherry picked from commit 082eeda7fe)
 2016-01-17 14:06:08 +01:00
Killyana
a56f92e889 Script/Creature: Imprisoned Beryl Sorcerer 
Add missing emote state
Move the credit quest on the 5th hit instead of the 7th one

(cherry picked from commit 13e509a622)
 2016-01-17 14:04:51 +01:00
Killyana
e16f695453 DB/Creature: Franclorn Forgewright 
Make the npc visible only for dead players
Remove the SAI and move the aura to Creature addon

(cherry picked from commit 1c877ecbd2)
 2016-01-17 14:04:01 +01:00