Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-05 08:28:57 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,507 Commits 4 Branches 146 Tags
a508ce1976caaf8ede6afcea7e8a857399f548ef
Commit Graph

23507 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael
a508ce1976 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
 2014-07-05 14:28:58 +02:00
Shauren
d28b66bca8 Core/Skills: Fixed players getting all ranged skills when learning one of bows/crossbows/guns 2014-07-04 17:27:22 +02:00
Shauren
70daf21554 Rename 2014_07_01_02_world playercreateinfo_skills.sql to 2014_07_01_02_world_playercreateinfo_skills.sql 2014-07-04 14:27:27 +02:00
jackpoz
519d76c194 Core/VMAPs: Fix object orientation 
Merge 2f8b8e55d9
Quoting original commit log:
This patch fixes 2 issues with the vmap extractor. 1) Incorrectly converts vertex coordinates. 2) Forgets to convert coordinates on triangle indices.

The effects of [1] causes models to be flipped. This isn't very noticeable on most trees as flipping a cylinder results in the same cylinder, but it's very noticeable on any non-symmetrical geometry (which, even includes trees, it's just harder to notice). [2] Didn't seem to be a problem when the coordinates were incorrectly converted, but when applying the correct conversion caused some triangles to be flipped (i.e. facing inwards).

You will need to re-extract vmaps and re-generate mmaps for these changes to take effect.

Fixes #417
 2014-07-03 22:52:36 +02:00
joschiwald
7b74a725c8 Core/Spells: fixed Deep Freeze after 2a3546ca36 
Closes #12424
 2014-07-03 22:32:41 +02:00
Aokromes
37f7cc4615 DB/Items: Fix typos on 4c3cb80 
By dr-j
 2014-07-03 12:26:40 +02:00
Aokromes
13f849aea8 Rename 2014_06_20_01_world_spell_dbc.sql to 2014_06_20_01_world_creature_text.sql 2014-07-03 08:32:14 +02:00
Trisjdc
531de49fe7 Core/Spells: Spells which do not apply auras should not apply DR 
- Solves issue where Intimidating Shout applied DR twice on the main target
 2014-07-03 00:42:55 +01:00
Aokromes
9f0698b605 DB/Vendor: Add Arcanum of the Stalwart Protector reputation version 2014-07-02 14:48:04 +02:00
Aokromes
4c3cb8038a DB/Items: Fix realtime duration of event items 
By dr-j closes #12421
 2014-07-02 13:33:10 +02:00
Aokromes
2ca24b0906 DB/SAI: Fix Cosmetic Chains on Kirgaraak 
By dr-j, closes #12420
 2014-07-02 13:30:56 +02:00
Aokromes
1e15c577eb DB/Misc: Fix some runtime errors/incorrect triggers 
By dr-j
 2014-07-02 09:53:30 +02:00
joschiwald
22113d1626 Core/Spells: restore some special aura proc handling 
Note: can cause some unexpected behavior

Closes: #12413
 2014-07-02 03:11:47 +02:00
Shauren
abb16a521a Update 2014_07_01_02_world playercreateinfo_skills.sql 
Fixed table name
 2014-07-01 17:33:44 +02:00
Shauren
2a3546ca36 Core/Skills: Use SkillLineAbility.dbc to determine player initial spells - skill assignment done in a new table playercreateinfo_skills 
* Removed DK start skill hacks
* Resolved missing skills in character skill tab

Closes #12311
 2014-07-01 17:20:48 +02:00
Aokromes
d4cec6b397 DB/Misc: Fix some startup errors 
By dr-j
 2014-07-01 16:14:14 +02:00
Aokromes
4a05a082fd DB/Quest: The Left Piece of Lord Valthalak's Amulet 
By dr-j, closes #11753
 2014-07-01 12:18:16 +02:00
Shauren
fd910567ec Core/Loot: Fixed looting creatures that have only quest items in their loot 
Closes #12400
 2014-06-30 00:24:40 +02:00
Vincent-Michael
39140fe1cc DB/Locale: Fix some locales problems 
Preparation for tdb release in soon soon (Fix first db errors) :P
 2014-06-29 23:52:19 +02:00
Aokromes
a1bbadbfc7 Rename 2014_06_29_02_world_misc.sql to 2014_06_29_02_world_misc.sql 2014-06-29 19:28:47 +02:00
Aokromes
ef8549c6a6 DB/Misc: correct some trinity_string encoding 
By easy1, closes #11912
 2014-06-29 18:42:49 +02:00
Vincent-Michael
6d93a0a810 Core/Battleground: Fix merge fail 2014-06-29 17:44:32 +02:00
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