Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,160 Commits 4 Branches 146 Tags
978fc4b7b9c8de757d41dca0c61f1bda5a4e4e6c
Commit Graph

18160 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Spp
978fc4b7b9 Fix compile 2012-11-16 09:09:27 +01:00
Spp
a0c8193ee7 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Handlers/BattleGroundHandler.cpp
 2012-11-16 08:51:15 +01:00
Spp
f13e57d9ed Core/Player: Added skill step 525 2012-11-16 08:33:38 +01:00
Subv
d13ca54ecc Core/Log: Added more information to the log in MoveSplineInitArgs::Validate 2012-11-15 08:27:23 -05:00
Spp
d10ba397b6 Core/Warden: Remove warning 2012-11-15 14:13:58 +01:00
Spp
58c60c70cc Core: Move a couple of log messages to debug 2012-11-15 13:42:24 +01:00
Spp
01a745d279 Core/Battleground: Crash fix after ba20aa809f 2012-11-15 13:38:12 +01:00
Shocker
7a7e273e46 Revert "Core/Maps: Set correct phase flag from DBC when using phases." 
This reverts commit 7bee7d3a9a.

Phase.dbc already implemented
 2012-11-15 07:37:03 +02: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
Shocker
792e636a32 Core/Config: Implement CONFIG_MAX_JUSTICE_POINTS and CONFIG_START_JUSTICE_POINTS options 2012-11-14 23:41:32 +02:00
Shocker
967068d81a Core/Currency: Use define for currency precision 2012-11-14 22:39:11 +02:00
Spp
ba20aa809f Core/Battleground: Fix arena battlemaster gossip (reverts 028b6e7) 
Closes #8046
 2012-11-14 19:33:56 +01: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
vlad852
a8ef3013f0 Core/SAI: Fix SMART_ACTION_SIMPLE_TALK for players. 2012-11-14 09:15:31 -05:00
ZxBiohazardZx
5951947753 DB/Misc: Various fixes from the Issue Tracker 
Closes #1959
Closes #2297
Closes #2399
Closes #3038
Closes #3131
Closes #3225
Closes #3351
Closes #3432
Closes #3548
 2012-11-14 10:32:44 +01:00
kaelima
c9801e83c6 Script/Emerald Dragons: Fixed a couple of issues with emerald dragon world bosses and some cleanup. 
Renamed one sql from yesterday
 2012-11-14 09:02:17 +01:00
Vincent-Michael
29e20d4c41 SQL: Rename SQL merged in PR 2012-11-14 00:21:37 +01:00
kaelima
3c3d4f4c99 Script/Commands: Reimplemented ".lookup map" command. 2012-11-13 15:56:15 +01:00
Malcrom
3e43bf5917 DB/Quest Relations: Fix Pilgrims Bounty quest during Hallows End for human commoners. 
Cloases #8227
 2012-11-13 11:06:37 -03:30
Malcrom
b5a696ca2a DB/GameEvent: Fix start time for Pilgrams Bounty. 
Closes #8261
 2012-11-13 10:48:03 -03:30
Malcrom
11d8ab260c Merge pull request #8197 from tibbi/factionchange_item 
add a missing item at player_factionchange_items
 2012-11-13 05:52:35 -08:00
Malcrom
267099d807 DB/Creature: Fix for Quest: Meet at the Grave 
Closes #5875
 2012-11-13 10:13:58 -03:30
Malcrom
ab8d99d573 DB/Misc: Various fixes for Grizzly Hills 
Cloase #8303
 2012-11-13 09:52:40 -03:30
Malcrom
e6c4ce1dda DB/Battleground: Add missing end of line. 2012-11-13 09:35:22 -03:30
Malcrom
b1eee7cf8e DB/waypoints: Fix last commit 2012-11-13 09:18:24 -03:30
Malcrom
310d188b9c DB/waypoints: Pathing for Ol' Sooty 
Closes #7917
 2012-11-13 09:15:41 -03:30
Vincent-Michael
8a889e37c1 Fix typos (thx joschiwald & Geodar) 2012-11-13 09:47:35 +01:00
Pitcrawler
027f7fc922 DB/Misc: Various improvements to Borean Tundra and others from Pitcrawler 
Closes #8271
Closes #8257
Closes #8256
Closes #8255
Closes #8252
Closes #8251
Closes #8250
 2012-11-12 22:38:59 +01:00
ZxBiohazardZx
b2efb060a3 Db/Misc: oneline fixes merged, thx Nelgano & Gecko32 for parts of it 
Closes #8021
Closes #8019
Closes #7361
Closes #7184
 2012-11-12 22:06:50 +01:00
ZxBiohazardZx
ebd2c12f99 DB/Quest: add questrequirements for Doomguard Minion Questline 
Closes #7124
 2012-11-12 21:30:38 +01:00
Spp
49c250f3c5 Core: Removed passing of integer types by const reference where possible 2012-11-12 15:27:01 +01:00
Spp
16d9d1e56d Core/Achievements: multiple changes 
- Fix crash when updating criteria with no reference player
- Update progress counter to uint64
- Remove hack introduced for achievement 318 (conditions are already checked in additionalConditions)
- Add extra parameter miscValue3 (needed for type "LOOT_TYPE" with additionalConditions "ITEM_SUBCLASS")
- Correct definition for Additional conditions: 11 (HAS_AURA_TYPE), 17 (SOURCE_AREA_OR_ZONE), 18 (TARGET_AREA_OR_ZONE), 41 (TARGET_ZONE)
 2012-11-12 14:25:51 +01:00
Spp
5c6af8d1f3 Core: Added some attribute definitions 2012-11-12 12:07:16 +01:00
Spp
a3a667460a Core/Achievement: Do not expose AchivementCriteriaData to ScriptMgr 2012-11-12 10:37:27 +01:00
Spp
f53a04add0 Core/Scripts: Added Worgen and Goblin races to .pinfo command. 2012-11-12 10:31:56 +01:00
Spp
5fd7d01bde Core/Build: Remove some more unneeded code for OS X from cmake files 
Core: Minor changes here and there
 2012-11-12 10:29:52 +01:00
Shauren
85f5a189de Core/Warden: Add minimal verification of OS used by client for warden module loading 2012-11-12 00:31:08 +01:00
Tuxity
6f6b0643ee Core/Pets: Fix crash with Shadowfiend. Closes #7803 2012-11-11 19:15:10 +01:00
Tuxity
516c6d31ec Merge branch 'master' into 4.3.4 2012-11-11 18:53:01 +01:00
Tuxity
e9cabbe000 Core/Spells: Fix opcode SMSG_CLEAR_COOLDOWN and SMSG_CLEAR_COOLDOWNS. Closes #7783 2012-11-11 18:28:41 +01:00
Tuxity
d3b12738a7 Core/Player: Reset emote state when player stop attacking 2012-11-11 18:21:53 +01:00
Shauren
63076ae58b Merge pull request #8260 from Warpten/cleanup 
Core/Scripts: Cleanup alterac_valley.cpp.
 2012-11-11 06:20:19 -08:00
ZxBiohazardZx
7bdd596e6d DB/Gossip: Add gossip menus for Midsummer 
Closes #6886
 2012-11-11 12:50:03 +01:00
Malcrom
8b4b1cdbc2 DB/Gossip: Add gossip menus for Midsummer partial for issue #6886 2012-11-11 12:36:53 +01:00
Exodius
6264d91cd0 DB/Quest: fix a wrong text 
Closes #6403
 2012-11-11 12:31:48 +01:00