Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,485 Commits 4 Branches 146 Tags
3cb066f6fd496e137d44aade3dbe22c14ca564fc
Commit Graph

23485 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael
3cb066f6fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundScore.h
	src/server/game/Handlers/MailHandler.cpp
 2014-06-29 17:32:12 +02:00
joschiwald
876e9dde01 Core/Battleground: addition to c28345e279 2014-06-29 16:53:28 +02:00
jackpoz
c674f229cb Core/Mail: Fix exploit that didn't allow recipient to delete the email 2014-06-29 15:51:34 +02:00
jackpoz
ee4602db3d Core/Battleground: Fix crash added in c28345e279 
Fix a double-delete crash added in c28345e279 caused by copy-constructor copying pointers across different Battleground instances.

Valgrind log:
 Invalid read of size 8
  at : Battleground::~Battleground() (Battleground.cpp:231)
  by : BattlegroundWS::~BattlegroundWS() (BattlegroundWS.cpp:74)
  by : BattlegroundWS::~BattlegroundWS() (BattlegroundWS.cpp:74)
  by : BattlegroundMgr::Update(unsigned int) (BattlegroundMgr.cpp:103)
  by : World::Update(unsigned int) (World.cpp:2067)
 Address 0x5675d140 is 0 bytes inside a block of size 24 free'd
  at : operator delete(void*) (vg_replace_malloc.c:509)
  by : ArenaTeamScore::~ArenaTeamScore() (ArenaScore.h:64)
  by : Battleground::~Battleground() (Battleground.cpp:231)
  by : BattlegroundWS::~BattlegroundWS() (BattlegroundWS.cpp:74)
  by : BattlegroundWS::~BattlegroundWS() (BattlegroundWS.cpp:74)
  by : BattlegroundMgr::Update(unsigned int) (BattlegroundMgr.cpp:103)
 2014-06-29 14:03:29 +02:00
Aokromes
f8720d5be0 DB/Quest: Added the proper special flags to one quest 2014-06-29 10:11:26 +02:00
Aokromes
8556d00c9c DB/Misc: Add gossip_menu_options and conditions to multiple trainers 
By dr-j
 2014-06-29 05:17:07 +02:00
Vincent-Michael
88a3344c49 Core: Fix more warnings 2014-06-28 23:25:48 +02:00
Vincent-Michael
a3e34f5621 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-28 23:06:10 +02:00
Vincent-Michael
d15db5f7ea Core: Fix warnings 2014-06-28 22:43:35 +02:00
Aokromes
a36925937a DB/Misc: Add conditions to one mage trainer 
By dr-j.
 2014-06-28 22:04:46 +02:00
Vincent-Michael
5562f61b23 Core: Fix non pch build 2014-06-28 21:35:03 +02:00
Vincent-Michael
a260454ad6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-28 21:08:20 +02:00
Vincent-Michael
a660247811 Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-28 21:08:06 +02:00
Vincent-Michael
3b1c659b60 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
 2014-06-28 21:07:41 +02:00
Sebastian Valle Herrera
95f864f4ad Core/Creatures: Fixed a typo in respawn code 
Creatures should now respawn correctly in their correct time.
Closes #12378
 2014-06-28 13:19:00 -05:00
jackpoz
b9ec488fd1 Core/Mail: Do not allow to create multiple copies of mail 2014-06-28 19:15:20 +02:00
jackpoz
e77c6fc98b Core/Mails: Fix exploit that allowed to take COD items without paying 2014-06-28 18:23:10 +02:00
jackpoz
82df3f090b Auth/Misc: Move OpenSSL version log from Warning to Information 2014-06-28 17:55:40 +02:00
jackpoz
f3852d19e7 COre/Mail: Don't allow to mark delete mails as read. 2014-06-28 17:53:17 +02:00
Shauren
4c1ccc36a2 Core/PacketIO: Enabled a few movement opcodes (they are mostly skipped anyway, just like for 3.3.5a) 2014-06-28 16:24:54 +02:00
jackpoz
22c26548f3 Merge pull request #12382 from TrinityCore/revert-12268-patch_mimironnew 
Revert "Scripts/Ulduar: Implement Mimiron"
 2014-06-28 13:49:42 +02:00
jackpoz
1bd4ff6cb9 Revert "Scripts/Ulduar: Implement Mimiron" 2014-06-28 13:49:34 +02:00
Shauren
af10f2807e Core/PacketIO: Added value for SMSG_BUY_BANK_SLOT_RESULT and enabled it 2014-06-28 13:36:16 +02:00
Trisjdc
0ac6f16896 Merge pull request #12268 from Unholychick/patch_mimironnew 
Scripts/Ulduar: Implement Mimiron
 2014-06-28 12:17:32 +01:00
Aokromes
68958205d4 DB/Conditions: Arcanum of the stalwart protector 
Closes #10163
 2014-06-28 03:57:17 +02:00
Aokromes
c97a994564 DB/Misc: Karen No (and related quests) 
By Wylath, closes #9217
 2014-06-28 03:37:46 +02:00
Aokromes
5ffce750df DB/Misc: Missing Graveyard in Zone 44 
Closes #9724
 2014-06-28 03:34:47 +02:00
joschiwald
745833ccbc Core/Battleground: removed hardcoded levels of alterac valley npcs 2014-06-28 02:30:02 +02:00
Aokromes
16d66e809c DB/SAI: Fix more runtime errors 
By dr-j
 2014-06-28 01:55:21 +02:00
joschiwald
d20a5f3df0 Scripts/Commands: fixed possible client crash with .go command 2014-06-28 00:57:44 +02:00
joschiwald
c28345e279 Core/Battleground: refactored BattlegroundScore 
(original code by Machiavelli)
 2014-06-27 23:14:15 +02:00
jackpoz
df164bf2d7 Core/Misc: Fix gcc warnings 2014-06-27 20:55:37 +02:00
Vincent-Michael
f3de6f0284 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-27 19:39:23 +02:00
joschiwald
52023b1e6b Scripts/MagistersTerrace: fix possible crash 2014-06-27 18:45:49 +02:00
Trisjdc
78ffaf6ca6 Core/Spells: Implement CREATURE_TYPEFLAGS_PROJECTILE_COLLISION, and solve some targeting problems with TARGET_DEST_TRAJ 2014-06-27 16:58:46 +01:00
Aokromes
17f91aee76 DB/SAI: Fix more runtime errors 
By dr-j
 2014-06-27 15:57:49 +02:00
Aokromes
b61dd90f1c DB/Misc: Fix startup and runtime errors 
By dr-j
 2014-06-27 14:37:24 +02:00
Trisjdc
0a641bace9 Core/Spells: Ensure Haunt's healing takes in consideration crit damage 2014-06-27 00:40:59 +01:00
Trisjdc
4ed4b165f1 Core/Misc: Define CREATURE_TYPEFLAGS_PROJECTILE_COLLISION 2014-06-27 00:39:24 +01:00
Shauren
a2b860b781 Core/DataStores: Implemented uint64 field type for DBC files and fixed structure of Achievement_Criteria.dbc 2014-06-27 00:37:17 +02:00
Shauren
21687aa857 Core/Battle.net: Fixed password change prepared statement 2014-06-27 00:35:47 +02:00
Vincent-Michael
f94fe58f78 Script/MagistersTerrace: Fix fail in 27f2855248 2014-06-26 23:16:56 +02:00
jackpoz
c9a129708f Core/Mail: Fix exploit that allowed to send free emails 2014-06-26 23:11:12 +02:00
Vincent-Michael
27f2855248 Core: Fix warnings and kill again whitespace ... 2014-06-26 22:50:06 +02:00
joschiwald
32d2e25556 Merge pull request #12364 from MitchesD/misc_2 
Scripts/MagistersTerrace: reworked InstanceScript and fixed some issues ...
 2014-06-26 22:28:51 +02:00
MitchesD
6ebb64892f Scripts/MagistersTerrace: reworked InstanceScript and fixed some issues on boss Vexallus 
* removed old hacks and added missing auras
* Vexallus converted to EventMap
 2014-06-26 22:25:24 +02:00
Shauren
74850abcfc Core/Loot: Skinning improvements 
* Set skinnable flag only after all loot was taken
* Creatures are skinnable only once - after skinning, the player only has to loot the creature again if he did not take all skinning loot
 2014-06-26 22:01:55 +02:00
Vincent-Michael
e97b6e6403 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-26 19:48:16 +02:00
Shauren
224b5c08df Core/Spells: Fixed professions resetting back to 1 when learning new level (expert/artisan) 2014-06-26 17:39:09 +02:00
Aokromes
4368747de6 DB/Spawns: Add multiple Brewfest missing things 
By Discover-, updates #3619
 2014-06-26 11:15:06 +02:00