Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-27 20:32:21 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,958 Commits 4 Branches 146 Tags
eca7a2afc143e5d2d2d2e4e9bfbdc8ea507a9e55
Commit Graph

18958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
tibbi
c0e0f1d89b allow glyph1 be null like other glyph slots 2012-10-09 16:58:29 +01:00
kaelima
2958f64ffc Scripts/Misc: Correct two wrong urand's 
(found by Aokromes)
 2012-10-09 14:53:29 +02:00
Subv
0620d22491 Core/SAI: Added a missing break. 2012-10-08 18:38:15 -05:00
Nay
a3aebf7790 Merge pull request #8005 from tibbi/sota 
correcting SotA demolisher spawn, adding preparation buff to 2nd round t...
 2012-10-08 16:35:05 -07:00
tibbi
05eaf75501 adding forgotten UpdateCharacterNameDataLevel call 2012-10-08 20:02:11 +01:00
tibbi
405c3b09aa adding a new prepared statement for selecting char at_login and titles 2012-10-08 17:29:02 +01:00
tibbi
5896da6689 some optimization + adding level to CharacterNameData 2012-10-08 17:21:09 +01:00
Kaelima
5c98a43852 Merge pull request #8010 from Retriman/SpellsSIIII 
Core/Misc:
 2012-10-07 22:44:03 -07:00
Kaelima
17568c03b3 Merge pull request #8014 from Retriman/MasSpells 
Core/Misc:
 2012-10-07 22:43:44 -07: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
Nay
0fe1c10484 Merge pull request #8000 from gigatotem/master 
Spells/Hunter: Readiness
 2012-10-07 17:55:21 -07:00
Subv
00373eee90 Merge pull request #8015 from Retriman/masspellsTIII 
Core/Spells:
 2012-10-07 17:52:14 -07:00
trickerer
0f166336ca Core/Entities: Do not create the model twice for a GameObject. 
Should fix #5218 (Still need to check)
 2012-10-07 19:42:06 -05: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
Retriman
3c2a523980 Core/Spells:Ranged spells cant be parried or dodged. 2012-10-07 14:46:29 -04:00
Retriman
76d19ede4f Core/Misc: Shapeshift druid flying now displays an animation of falling. 2012-10-07 14:36:53 -04:00
Retriman
0aa6398865 Core/Misc: Not produce the error "can not do that while moving" to dismount. 2012-10-07 11:51:56 -04:00
zxbiohazardzx
608ed2cf1d DB/Loot: increase dropchance for Plump Buzzard Wing 
Closes #7989
 2012-10-07 17:43:13 +02:00
tibbi
9835f4098f correcting SotA demolisher spawn, adding preparation buff to 2nd round too, lowering start height for attackers 2012-10-07 16:06:40 +01:00
Nay
972b418103 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
 2012-10-07 14:51:21 +01:00
tibbi
d49c2a5e4d correct reputation converting at faction change 2012-10-07 13:55:04 +01:00
tibbi
ef4f89b405 Make Rune of Cinderglacier not proc off dots 2012-10-07 13:44:30 +01:00
w1sht0l1v3
1a89de87c1 Fixup a guid issue in 2012_10_06_04_world_misc_spawns.sql 2012-10-07 15:01:16 +03:00
Nay
99175e066c Core/Utils: Add asserts to irand, urand and frand 
max should always be higher or equal than min
notice that SFMT was already covering these cases and it would return 0, -1 or min
 2012-10-07 12:55:51 +01:00
Gigatotem
2b1a8004ba Spells/Hunter: Readiness 
Fixes Readiness resetting the cooldown of Gift of the Naaru. Needs testing
 2012-10-07 13:44:05 +02:00
w1sht0l1v3
26b998d94c Core/Scripts: Typo fix. 2012-10-07 14:28:39 +03:00
kaelima
8c013955ac Core/Misc: Fix some possible issues detected by static code analysis 2012-10-07 01:31:43 +02:00
kaelima
bb08d429a3 Fix non-pch build 2012-10-07 00:53:37 +02:00
kaelima
5273949315 Fixed compile and renamed one sql files 2012-10-07 00:08:04 +02:00
Kaelima
6b56acaa28 Merge pull request #7913 from Warpten/theRubySanctum 
Scripts/Ruby Sanctum: Halion, the Twilight Destroyer.
 2012-10-06 14:27:59 -07:00
Warpten
c971447855 Scripts/Ruby Sanctum: Halion, the Twilight Destroyer. 2012-10-06 22:47:52 +02:00
Nay
d641775a1f Core/Traps: Remove hardcoded cooldown value of 1 and use startDelay instead, as per Kaelima suggestion 
startDelay is 1 for all hunter traps

Fix non PCH build (boss_elder_madox.cpp)
Remove a double parentheses in LFGGroupScript
 2012-10-06 17:01:29 +01:00
Nay
d27a3955f0 Core/Misc: Tabs to spaces and whitespace cleanup 2012-10-06 16:55:01 +01:00
Nay
6497bea601 Merge pull request #7987 from CeIa/master 
Core/Script: Iron assemby encounter
 2012-10-06 08:46:45 -07:00
Nay
e369742dc7 SQL: Rename SQLs from 65c6b89d01 2012-10-06 16:44:35 +01:00
Nay
65c6b89d01 Merge pull request #7970 from Retriman/DungeonsSII 
Core/Script: Dungeon Ahnkahet Boss Elder Nadox.
 2012-10-06 08:42:32 -07:00
Nay
0edd7f4459 Merge pull request #7981 from Retriman/SpellTi 
Core/Spell: Traps Hunter.
 2012-10-06 08:41:13 -07:00
Nay
bf9fa12314 Merge pull request #7984 from Retriman/DungeonFinderTI 
Core/DF: Fix deserter in Dungeon Finder
 2012-10-06 08:40:37 -07:00
Shauren
ca55807eeb Compile fix 2012-10-05 23:31:16 +02:00
Retriman
e00e1e6f9d Core/DF: 
*Fix deserter in Dungeon Finder
 2012-10-05 16:19:40 -04:00
CeIa
f353ec1454 Fix encounter in progress on the iron assembly 2012-10-05 22:19:05 +02:00
Retriman
486cf48dd0 Core/Script: Dungeon Ahnkahet Boss Elder Nadox. 
Fix typo sorry.
 2012-10-05 15:19:59 -04:00