Carbenium
224c7dc6ae
Merge commit '6c1e4bc20d68d9fb548eb4896bd8b84a4c3ec4ff' into 4.3.4
...
Conflicts:
README.md
sql/updates/world/2015_04_04_00_world.sql
sql/updates/world/2015_04_04_01_world.sql
sql/updates/world/2015_04_05_06_world_335.sql
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_account.cpp
src/tools/map_extractor/System.cpp
src/tools/vmap4_extractor/adtfile.cpp
2015-07-22 00:54:34 +02:00
Carbenium
963150dc8e
Merge commit 'c61fac843b86f584f913dd21c256a626668df756' into 4.3.4
...
Conflicts:
sql/base/dev/world_database.sql
sql/updates/world/2015_03_22_00_world.sql
sql/updates/world/2015_03_23_00_world.sql
sql/updates/world/2015_03_23_01_world.sql
sql/updates/world/2015_03_23_02_world.sql
sql/updates/world/2015_03_23_03_world.sql
sql/updates/world/2015_03_23_07_world.sql
sql/updates/world/2015_03_24_00_world.sql
sql/updates/world/2015_03_25_00_world.sql
sql/updates/world/2015_03_25_01_world.sql
sql/updates/world/2015_03_26_00_world.sql
sql/updates/world/2015_03_26_01_world.sql
sql/updates/world/2015_03_26_02_world.sql
sql/updates/world/2015_03_28_00_world.sql
sql/updates/world/2015_03_28_01_world.sql
2015-07-22 00:37:27 +02:00
Carbenium
fd0ef7bfab
Merge commit '4fd51ab3b94c5a61d009f57ad28fb728bd154fb8' into 4.3.4
...
Conflicts:
.travis.yml
cmake/macros/ConfigureBoost.cmake
sql/base/auth_database.sql
sql/base/characters_database.sql
sql/base/dev/world_database.sql
sql/updates/world/2015_03_21_00_world.sql
src/server/game/Miscellaneous/Language.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/Spells/spell_quest.cpp
src/server/worldserver/Main.cpp
2015-07-22 00:26:09 +02:00
Carbenium
f7f6eae247
Merge commit 'd3ad87b1cf48222aef5cbbc1f00cf2babadce111' into 4.3.4
...
Conflicts:
sql/updates/world/2015_03_16_00_world.sql
sql/updates/world/2015_03_16_01_world_335.sql
2015-07-21 23:35:43 +02:00
Carbenium
98328bb744
Fix merge
2015-07-21 23:34:13 +02:00
Carbenium
17bed260e3
Merge commit '7833d3414667af5e2c55280a060fa54f43d1e25f' into 4.3.4
...
Conflicts:
sql/updates/world/2015_03_14_00_world.sql
src/server/collision/Management/MMapManager.cpp
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Server/WorldSocket.cpp
2015-07-21 23:27:27 +02:00
Carbenium
67d616c195
Merge commit '999a5ffa642c27dc3566664cf0e5b44dffafb1b7' into 4.3.4
...
Conflicts:
sql/updates/world/2015_03_01_00_world.sql
src/server/game/Server/WorldSocket.cpp
src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp
2015-07-21 23:20:40 +02:00
Carbenium
2bdcce17f8
Merge commit '61ba5e4f34211c2f0f286e70d8ace37714ca3c56' into 4.3.4
...
Conflicts:
sql/updates/world/2015_02_23_00_world.sql
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
2015-07-21 22:47:41 +02:00
Carbenium
78da5d8e7e
Merge commit '2478bbcdb8f44c575714ae2f45aeef4a37556fc2' into 4.3.4
...
Conflicts:
sql/updates/world/2015_02_12_00_world.sql
sql/updates/world/2015_02_12_01_world.sql
sql/updates/world/2015_02_12_02_world.sql
sql/updates/world/2015_02_12_03_world.sql
sql/updates/world/2015_02_12_04_world.sql
sql/updates/world/2015_02_12_05_world.sql
sql/updates/world/2015_02_12_06_world.sql
sql/updates/world/2015_02_12_07_world.sql
sql/updates/world/2015_02_12_08_world.sql
sql/updates/world/2015_02_12_09_world.sql
sql/updates/world/2015_02_12_10_world.sql
sql/updates/world/2015_02_13_00_world.sql
sql/updates/world/2015_02_13_02_world.sql
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/Kalimdor/zone_mulgore.cpp
2015-07-21 22:07:47 +02:00
Carbenium
7d5d040948
Merge commit 'b69fd4ac682347b8b735ac7116ada25d79698933' into 4.3.4
...
Conflicts:
README.md
sql/updates/world/2015_02_06_13_world_335.sql
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Spells/SpellMgr.cpp
2015-07-21 21:45:04 +02:00
Carbenium
9fca7b8017
Merge commit '9ee820d83d2bc3a2fb7c88047874c6420b116799' into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
2015-07-21 21:36:54 +02:00
Carbenium
9d3b94f7f2
Merge commit 'ccdc100d10143285bc058d968f0472ea4d073120' into 4.3.4
...
Conflicts:
sql/updates/world/2015_01_09_01_world.sql
sql/updates/world/2015_01_18_00_world.sql
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_warlock.cpp
src/tools/CMakeLists.txt
2015-07-21 21:21:09 +02:00
Carbenium
b9c871fdb7
Merge commit '6390e6a4cc2d657e7fa49e80c5be32007df56ee1' into 4.3.4
...
Conflicts:
sql/updates/world/2014_12_30_00_world.sql
sql/updates/world/2014_12_30_01_world.sql
src/server/scripts/Northrend/Nexus/Nexus/boss_keristrasza.cpp
2015-07-21 20:45:16 +02:00
Carbenium
79eb80dcba
Merge commit '32d9a71a4219ea353950979a2491e7879b7fa79a' into 4.3.4
...
Conflicts:
README.md
sql/base/auth_database.sql
sql/updates/world/2014_12_27_01_world_335.sql
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Server/WorldSession.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
src/server/scripts/Spells/spell_hunter.cpp
2015-07-21 20:05:44 +02:00
Carbenium
c0ee4ceac4
Merge commit '251a347190485d57c8e2e9d821f66a5063270f5f' into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
src/server/game/Accounts/RBAC.h
src/server/scripts/Commands/cs_modify.cpp
2015-07-21 19:02:53 +02:00
Carbenium
fc13ce42df
Merge commit '40bb5743acc0d117db3a5b0e0b1919793d25c392' into 4.3.4
...
Conflicts:
sql/updates/world/2014_11_05_00_world.sql
2015-07-21 18:53:04 +02:00
Carbenium
9f1d71a53f
Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
2015-07-21 18:22:27 +02:00
Carbenium
38027226ff
Merge commit '1a075f0454fcfc1fb23432e6853af4a36730de98' into 4.3.4
...
Conflicts:
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSession.h
2015-07-21 18:04:43 +02:00
Carbenium
1350a08ee4
Merge commit '183a0c59e0b4ad63158b04dd62d76d20d8bfc24e' into 4.3.4
2015-07-21 17:54:19 +02:00
Aokromes
7680c90abd
Update (C) date
2015-07-19 13:37:44 +02:00
Your Name
dc9c3362ab
Core/Players: Fix being able to water walk after being revived
...
By IvanVojtko, closes #10950 , closes #11323
2015-07-19 10:19:23 +02:00
Northstrider
b5393d4b9b
Core/Creatures: remove virtual mounts from creatures on death
...
Closes https://github.com/TrinityCore/TrinityCore/pull/14396
2015-04-19 14:56:54 +02:00
click
6c1e4bc20d
Core/Spells: Reinstate helperfunction removed in commit 0e3607df (with a new functionname to make more sense out of it), and adjust the remaining code slightly to accomodate that.
2015-04-07 23:51:19 +02:00
click
0e3607df5b
Core/Spells: Allow non-skill-based flying mounts to be used in designated areas.
...
- Flying mounts that are not in the "SKILL_MOUNT"-tree and area-restricted can now be used properly (ex. 64749 - Loaned Gryphon).
- Remove isKnowHowFlyIn()-function (useless and deprecated since this is handled properly in the spellsystem).
Massive thanks to rat for extremely good help and support on fixing this (most of this is his work).
2015-04-07 21:26:23 +02:00
Carbenium
67238e2166
Rename variables to fix C++11 keyword collision
...
(cherry picked from commit 573cda7b524ee4d7d23cefd026b056181f451a8b)
2015-04-05 00:36:33 +02:00
Carbenium
bdc9beacbd
Merge pull request #13862 from ariel-/pr_tmp
...
Implement CharSections.dbc and Serverside Checks.
2015-04-05 00:09:03 +02:00
jackpoz
d23538ce56
Core/Misc: Fix issues reported by static analysis
...
Coverity defect IDs: 1227510, 1227434, 1023036, 1062426, 1062425, 1062424, 1062423, 1062422
2015-04-04 20:20:04 +02:00
jackpoz
76986880c9
Core/Misc: Fix issues reported by static analysis
...
Coverity defect IDs: 1267938, 1267937, 1267933, 1267932, 1267929
2015-04-04 16:40:01 +02:00
jackpoz
2dc97e3f3d
Core/Misc: Fix issues reported by static analysis
...
Coverity defect IDs: 1292769, 1292768, 1292765, 1292763, 1267939
2015-04-04 15:28:13 +02:00
jackpoz
25e86f75f8
Core/Misc: Fix issues reported by static analysis
...
Coverity defect IDs: 1292760, 1292761, 1292762, 1292771, 1292770
2015-04-04 12:44:56 +02:00
Rat
037fd1b1bb
Core/Phases: backported 6.x phase fixes
2015-04-02 20:32:09 +02:00
leak
7010671931
Core/Misc: Remove unused headers
2015-03-30 17:16:50 +02:00
click
50bbfeebb9
Core/Entities: Add player name and ID to GetXPrestBonus calculation-log
2015-03-30 02:06:07 +02:00
cr4st
81dcfa4077
Core/Creature: fixed trigger visibility of vehicles
...
(cherry picked from commit 5cee106524d8d7e0048270042be9fd02ce399a21)
2015-03-25 17:52:10 +01:00
tkrokli
d1221e3433
[Core/Quest] Update quest Objective status Client side
...
by @untaught; closes #12172
AreaExploredOrEventHappens does not update client side, only server side.
Before adding this fix, it is necessary to complete the required number of kills
to receive the "discovery" Quest Objective Credit in player's Quest Log and on screen.
2015-03-22 06:32:18 +01:00
Nayd
2ac40775a2
Core/Spells: Implement HasAttribute() helper for SpellInfo for easier readability
...
Original code by @Shocker (6.x branch)
2015-03-18 23:16:39 +00:00
AriDEV
f4a83fc08a
Server/Entities: Should Fix Compile Error Under GCC 4.8+
...
Signed-off-by: AriDEV <aridev666@gmail.com >
2015-03-15 21:08:27 +01:00
Nayd
0ebc15e6f4
Core/DBLayer: Remove references to table character_currency (6.x only)
...
Ref 170bc318b3
2015-03-15 15:50:05 +00:00
joschiwald
170bc318b3
Core/Player: fixed some leftovers in db after player delete
...
* character_arena_stats
* character_battleground_random
* character_cuf_profiles
* character_currency
* character_stats
* character_void_storage
(cherry picked from commit 2955a1f595be8ba510260e5a84b53663f2300fff)
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
2015-03-15 13:06:49 +00:00
jackpoz
f1ae2c7b73
Revert "*Do not allow players to use vehicles to go further than 1st boss in Ulduar."
...
This reverts commit a009e53049 .
Remove hackfix for Ulduar vehicles, it should be handled in Ulduar script
2015-03-13 21:48:42 +01:00
jackpoz
22403121fe
Core/Dungeon Finder: Fix Vote Kick breaking LFG queue
...
Fix Vote Kick started with party in queue breaking the whole LFG queue. The status of Vote Kick is now storing in a bool variable in LfgGroupData, separated from LfgState of the group/members.
If a Vote Kick started with party in queue, the members were not removed from queue correctly and would cause LFG matching system to match these "broken" players but not allowing to start a dungeon.
Closes #10191
2015-03-10 21:11:54 +01:00
click
f3101d20a9
Core: Change a few 'stupid' log-messages down to DEBUG-level
2015-03-08 12:01:33 +01:00
click
6f961ba138
Core: And yet more INFO->DEBUG logging
2015-03-08 06:16:46 +01:00
click
a31bc08e44
Core: Pet.cpp - INFO -> DEBUG level notifications...
2015-03-08 06:12:01 +01:00
click
64584e9e7a
Core: More INFO -> DEBUG (Unit.cpp this time)
2015-03-08 06:11:12 +01:00
click
6e509cf7c1
Core: INFO->DEBUG cleanups in Player.cpp
2015-03-08 06:06:03 +01:00
jackpoz
49ececf038
Core/Player: Optimize Player::HaveAtClient() performance
...
Change m_clientGUIDs from std::set to std::unordered_set to reduce by 2.7x times the cpu usage in Player::HaveAtClient()
2015-03-01 18:40:46 +01:00
Duarte Duarte
a324ee8a22
Typo
2015-02-22 06:06:58 +00:00
Shauren
6cc38ad7d2
Core/Spells: Restored totem category check
...
Revert "Core/Totems: In cata totem items are no longer needed"
This reverts commit 45e0cae7be
(cherry picked from commit ea9eccae8596d440c372b0d9709d4def4b46e648)
Conflicts:
src/server/game/Entities/Item/ItemPrototype.h
2015-02-22 06:06:34 +00:00
Duarte Duarte
a6505dd46a
Merge pull request #14103 from Epicurus4/6.x
...
Added a player searcher
(cherry picked from commit b7052d2ed735dca233b91c32f762b4156543aa97)
2015-02-22 05:51:26 +00:00