Shauren
5daf3d3606
Merge branch 'master' into 4.3.4
2014-07-18 21:21:17 +02:00
Warpten
dd64f77dcc
Core/Spells: Since patch 4.0.1, an hunter can track multiple creature types at once.
2014-07-18 06:42:21 -04:00
Warpten
4dd436f93c
Core/Opcodes: Updated SMSG_SUPERCEDED_SPELL's structure to 4.3.4
2014-07-17 12:38:59 -04:00
Warpten
3be239ca41
Conflicts fix after cherry pick of previous commit from master branch.
2014-07-17 12:35:38 -04:00
Shauren
3249986ba8
Buildsystem/GCC: Fixed release linking errors
2014-07-16 13:09:56 +02:00
Vincent-Michael
524cc6c2d9
Core/Battleground: Fix typo and small cleanup (again thx @joschiwald)
2014-07-14 21:31:16 +02:00
Vincent-Michael
06d9d33de3
Core/Battleground: Fix merge fail (thx @joschiwald)
2014-07-14 21:16:19 +02:00
Vincent-Michael
13ff07f121
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlegrounds/ArenaScore.h
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/Battleground.h
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/scripts/Commands/cs_wp.cpp
2014-07-14 21:01:55 +02:00
joschiwald
14bbe3e2e9
Core/Battleground: fixed typo
...
* and fixed some warnings
2014-07-14 20:12:39 +02:00
joschiwald
1088c27562
Core/Battleground: moved some arena related code into a generic arena class
...
* fixed typo in random bg selection, that causes no bg is created if only one bg is enabled
* fixed swapped worldstates in Ring of Valor
2014-07-14 18:31:16 +02:00
joschiwald
8e88a42420
Core/Battlefield: move complex methods from BattlefieldWG.h to BattlefieldWG.cpp
2014-07-14 17:59:22 +02:00
Vincent-Michael
f03617cd0f
Core/Creature: Fix problems with neutral innkeepers
2014-07-14 14:13:45 +02:00
Vincent-Michael
6dba04c0cc
Scripts/Commands: Fix warnings vs2014 ctp (no support)
2014-07-14 10:53:49 +02:00
Vincent-Michael
9506fd77fc
Core: Fix warnings vs2014 ctp (no support)
2014-07-14 01:07:54 +02:00
jackpoz
5a84448ed7
Core/InstanceScript: Fix possible crash
...
Store Boss doors/minions as GUID instead of GameObject*/Creature* to avoid accessing pointers to free'd memory.
2014-07-13 22:47:22 +02:00
Vincent-Michael
c88c1c6848
Core: Fix warning
2014-07-13 17:26:43 +02:00
Vincent-Michael
d920463fe5
Core/AreaTrigger: Remove useful check
2014-07-13 04:13:22 +02:00
Vincent-Michael
ec263868af
Core/Aura: Update InvisibilityType for 4.3.4
2014-07-13 00:08:15 +02:00
Vincent-Michael
0f5c481cd4
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Handlers/SkillHandler.cpp
2014-07-12 18:08:30 +02:00
Shauren
6d8dbb5c4a
Core/Misc: Renamed a few spell and skill line related methods to follow tc coding standards
2014-07-12 17:28:35 +02:00
Shauren
d91964912e
Core/Skills: Fixed spells automatically learned from skill lines adding more skill lines
2014-07-12 17:27:26 +02:00
Trisjdc
4a197ba22a
Core/PathGenerator: Split raycast paths into more points for better path z normalization. Solves many of the 'falling underground with charge' issues
2014-07-12 13:13:38 +01:00
Vincent-Michael
3f0ce25d5d
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-07-12 05:09:46 +02:00
Vincent-Michael
2f03e04b87
Core/Player:
...
- Fix merge fail
- Fix SkillRaceClassInfo structure
2014-07-12 04:52:26 +02:00
Shauren
de82146df8
Core/Commands: Fixed crashes caused by using .account lock ip and .account lock country commands from console - these commands apply to currently logged account so they cannot be used from console
2014-07-12 01:17:46 +02:00
Vincent-Michael
9a47c17889
Core/Player: Improve error log
2014-07-12 00:52:52 +02:00
Vincent-Michael
1bc482d3d6
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/scripts/Spells/spell_paladin.cpp
2014-07-12 00:24:23 +02:00
Vincent-Michael
12e44a36c1
Core/LFG: Fix build for gcc
2014-07-12 00:20:57 +02:00
Vincent-Michael
00a8a9ebb4
Core: Fix warnings with other way
2014-07-11 21:50:49 +02:00
Vincent-Michael
c8e75073bf
Scripts/Misc: Fix some warnings vs2014 ctp (no support)
2014-07-11 20:24:55 +02:00
Vincent-Michael
29e0538624
Core: Fix some warnings vs2014 ctp (no support)
2014-07-11 20:08:35 +02:00
Vincent-Michael
b62ee5eea2
Scripts/BlackTemplate: Fix warnings vs2014 ctp (no support)
2014-07-11 19:42:20 +02:00
Vincent-Michael
6797d78c1b
Scripts/Misc: Added missing break in 495ca8c2dc (thx to @ccrs)
2014-07-11 17:36:52 +02:00
Vincent-Michael
4f619eb937
Core/LFG: Fix warning with vs2014 ctp (no support)
2014-07-11 17:04:01 +02:00
Vincent-Michael
495ca8c2dc
Scripts/Misc: Fix some warnings with vs2014 ctp (no support)
2014-07-11 16:39:44 +02:00
Golrag
46fa704965
Core/BattlegroundIC: Fixed LoS on gates.
2014-07-11 11:11:15 +02:00
Vincent-Michael
04c2f6ca14
Core/LFG: Move 2 logs in trace
2014-07-11 10:22:27 +02:00
Vincent-Michael
cbcfa73e65
Core/Creature: Implement CREATURE_FLAG_EXTRA_IGNORE_PATHFINDING
2014-07-11 03:08:20 +02:00
Vincent-Michael
f185077fbf
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-07-10 23:10:22 +02:00
Vincent-Michael
1ffb986d59
Core: Fix non pch build
2014-07-10 23:09:13 +02:00
Vincent-Michael
bb7233baa3
Core/LFG: Added support for display of required item level. for player / group member
2014-07-10 21:45:11 +02:00
Subv
b44f38ab5d
Revert "Core/Quests: Changed QUEST_FLAGS_AUTO_ACCEPT to reflect what it actually does in 4.3.4."
...
This reverts commit 9c339d9eeb .
2014-07-10 13:22:40 -05:00
Subv
664e0a4523
Revert "Core/Build: Fixed the build"
...
This reverts commit 83f3d6ec2b .
2014-07-10 13:22:15 -05:00
Subv
83f3d6ec2b
Core/Build: Fixed the build
2014-07-10 09:34:12 -05:00
Subv
9c339d9eeb
Core/Quests: Changed QUEST_FLAGS_AUTO_ACCEPT to reflect what it actually does in 4.3.4.
...
Fixed Quest::IsAutoAccept.
2014-07-09 19:17:25 -05:00
Vincent-Michael
79062dd5ae
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
src/server/game/Battlegrounds/Battleground.h
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/World/World.cpp
2014-07-09 21:09:47 +02:00
Vincent-Michael
c8eb69df10
Core/Player: Added support cast spell for some class spells (Warlock / Hunter pet, "Battle Stance" and "Frost Presence") on first login...
2014-07-09 20:34:39 +02:00
joschiwald
7a67d816d9
Core/Battleground:
...
* added a possibility to reload battleground templates
* cleaned up the template structure
* use mapids from BattlemasterList.dbc to calculate random bg
2014-07-09 16:43:56 +02:00
Shauren
6664b7ecd4
Core/Instances: Enable automatic changing dungeon difficulty to a lower one when currently selected difficulty does not exist for entered instance
2014-07-09 13:57:38 +02:00
Vincent-Michael
6a6403a54e
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
src/server/scripts/EasternKingdoms/CMakeLists.txt
2014-07-09 10:23:14 +02:00