ariel-
f404226fb1
Channel Followup: avoid setting an invisible gm as Channel owner ( #17597 )
...
* Core/Chat: avoid setting an invisible gm (as in .gm visible off) as channel owner, giving it away to other players.
- This can now only happen if the channel is empty or every other member is an invisible gm, too.
Fixes #17424
* Feedback based changes
2016-08-25 15:00:55 +02:00
Aokromes
6a9c753029
Build fix, this time yes
2016-08-12 07:51:26 +02:00
Aokromes
7ab4915b13
compile fix
2016-08-11 05:05:33 +02:00
Aokromes
dfb6ab0eb9
restore code
2016-08-11 04:55:40 +02:00
Aokromes
7d9c4e1421
another missing change
2016-08-11 04:48:25 +02:00
Aokromes
f2cea8c9f4
missing change
2016-08-11 03:58:20 +02:00
Aokromes
64a693a4ae
Core/Chat: general cleanup and revamping: ( #17576 )
...
- Remove duplicate ObjectGuid in Channel (both as key and value member)
- Add const-ness to Channel methods
- NULL->nullptr
- const type* -> type const*
- Removed all instances of std::map::operator[] except where it is actually INTENDED to insert an element
- Use Trinity::StringFormat instead of snprintf
2016-08-11 03:56:10 +02:00
Naios
e23d063f5a
Core/Game: Rewrote the ScriptMgr to support script reloading.
...
* Finally this commit enables dynamic script hotswapping
and finished the PR #15671 .
* Split the storage layout to use optimized storages
for database bound and unbound scripts.
* Add several unload workers to reload scripts correctly
-> Requires further investigation.
* Fixes memory leaks in ScriptMgr when dropping invalid scripts.
* Fixes VehicleScripts
* Makes OutdoorPvP scripts reloadable
* Makes InstanceMapScripts reloadable
* Makes CommandScripts reloadable
2016-08-10 08:40:44 +02:00
Aokromes
5302d9112b
Core/Game: Converted the game library to a shared library.
...
* There is still the possibility to static link against game.
2016-08-08 20:11:29 +02:00
ariel-
65aec5f8f7
Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
...
Note: additional hand-picked ports from 6.x to fix build
Conflicts:
sql/updates/world/2016_02_22_00_world.sql
sql/updates/world/2016_02_22_01_world.sql
sql/updates/world/2016_02_22_02_world.sql
sql/updates/world/2016_03_07_00_world.sql
src/server/authserver/Realms/RealmList.cpp
src/server/authserver/Realms/RealmList.h
src/server/authserver/Server/AuthSession.cpp
src/server/game/Accounts/AccountMgr.cpp
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
src/server/game/Chat/Chat.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Scripting/ScriptLoader.cpp
src/server/game/Scripting/ScriptLoader.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/World/World.cpp
src/server/game/World/World.h
src/server/scripts/CMakeLists.txt
src/server/scripts/Commands/cs_gm.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_rbac.cpp
src/server/scripts/Commands/cs_ticket.cpp
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/CMakeLists.txt
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/Kalimdor/CMakeLists.txt
src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/OutdoorPvP/CMakeLists.txt
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/shared/CMakeLists.txt
src/server/worldserver/CMakeLists.txt
src/server/worldserver/Main.cpp
src/tools/mmaps_generator/CMakeLists.txt
2016-03-11 18:32:07 -03:00
DDuarte
2ea31027e5
Core: Backport 6.x realm changes
...
Make acessible all the info about current realm (e.g name) anywhere, not only realm id
Reduce the number of differences between the two branches
Original changes by Shauren
Partial port of bacc90b6baa34e6a194c93e5a7860d4041f08af7 and 63def8aa3291d0a6e5f83b289ad12c4c8a3cebd9
2016-03-06 19:46:59 +00:00
ariel-
8bc477a2de
Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
...
Conflicts:
sql/base/characters_database.sql
sql/updates/world/2016_01_26_00_world.sql
sql/updates/world/2016_01_31_00_world.sql
sql/updates/world/2016_02_07_00_world.sql
src/server/authserver/Server/AuthSession.cpp
src/server/database/Database/Implementation/LoginDatabase.cpp
src/server/database/Database/Implementation/LoginDatabase.h
src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
src/server/game/AI/ScriptedAI/ScriptedCreature.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Chat/Chat.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/Spells/spell_generic.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/shared/Networking/AsyncAcceptor.h
src/tools/map_extractor/CMakeLists.txt
src/tools/map_extractor/System.cpp
src/tools/map_extractor/adt.h
src/tools/mmaps_generator/MapBuilder.cpp
2016-02-21 07:02:53 -03:00
tkrokli
9e4cc26312
[3.3.5] Core/Logs: English text corrections
...
This is an attempt to proofread standard error messages and system messages
from both core and DB. The corrections span typos, grammar and punctuation.
Because some of these messages can have multiple meanings depending on context,
this PR will stay in "WIP" status until the corrections have been validated and approved.
You are welcome to suggest improvements and files not yet included in this list.
Thanks to @Kinzcool for suggesting this line of work. :)
2016-02-20 10:05:04 +01:00
Shauren
aa432db36d
Core/Maps: Changed the way area data is stored in maps, it now uses ID field from AreaTable.dbc instead AreaBit used for exploration marker (and is not unique anymore on top of simply being stupidly confusing)
...
Note: Extracting maps is required
(cherry picked from commit db0b8bf24e2b8eb87e6aed7b031ebe138717403d)
# Conflicts:
# src/server/game/Achievements/AchievementMgr.cpp
# src/server/game/Chat/Chat.cpp
# src/server/game/Conditions/ConditionMgr.cpp
# src/server/game/DataStores/DBCStores.cpp
# src/server/game/DataStores/DBCStores.h
# src/server/game/DataStores/DBCfmt.h
# src/server/game/Entities/Player/Player.cpp
# src/server/game/Globals/ObjectMgr.cpp
# src/server/game/Handlers/BattleGroundHandler.cpp
# src/server/game/Handlers/MiscHandler.cpp
# src/server/game/Maps/Map.cpp
# src/server/game/Spells/Spell.cpp
# src/server/game/Spells/SpellEffects.cpp
# src/server/scripts/Commands/cs_go.cpp
# src/server/scripts/Commands/cs_group.cpp
# src/server/scripts/Commands/cs_lookup.cpp
# src/server/scripts/Commands/cs_misc.cpp
# src/tools/map_extractor/System.cpp
# src/tools/mmaps_generator/TerrainBuilder.cpp
2016-02-09 18:19:28 +01:00
ariel-
e34e3f379f
Merge remote-tracking branch 'tc/3.3.5' into 4.3.4
...
Conflicts:
.travis.yml
CMakeLists.txt
README.md
dep/libmpq/CMakeLists.txt
doc/UnixInstall.txt
revision_data.h.in.cmake
sql/base/auth_database.sql
sql/base/characters_database.sql
sql/base/dev/world_database.sql
sql/old/3.3.5a/auth/59_2015_11_07/2015_08_21_00_auth.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_01_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_14_05_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_15_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_15_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_15_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_16_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_17_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_18_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_18_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_00_world_2015_07_18_04.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_19_05_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_20_02_world_2015_07_19_35.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_21_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_05_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_06_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_24_07_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_25_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_26_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_26_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_26_05_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_26_06_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_27_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_07_27_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_02_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_02_01_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_03_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_02_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_08_04_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_09_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_13_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_21_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_21_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_21_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_23_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_25_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_25_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_26_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_26_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_27_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_29_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_29_03_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_08_29_04_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_01_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_02_02_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_02_03_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_03_05_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_05_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_05_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_05_02_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_06_00_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_08_01_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_08_02_world.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_10_00_world_335.sql
sql/old/3.3.5a/world/59_2015_11_07/2015_09_10_01_world_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_14_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_14_03_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_14_04_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_14_05_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_15_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_15_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_15_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_16_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_03_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_17_04_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_18_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_18_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_03_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_04_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_19_05_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_21_00_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_00_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_01_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_02_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_03_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_04_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_06_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_24_07_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_01_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_02_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_03_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_25_04_world_from_335.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_26_04_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_26_05_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_27_00_world.sql
sql/old/4.3.4/TDB09_to_TDB10_updates/world/2015_07_27_01_world.sql
sql/updates/world/2015_07_14_02_world.sql
sql/updates/world/2015_07_14_03_world.sql
sql/updates/world/2015_07_14_04_world.sql
sql/updates/world/2015_07_14_05_world.sql
sql/updates/world/2015_07_15_00_world.sql
sql/updates/world/2015_07_15_01_world.sql
sql/updates/world/2015_07_15_02_world.sql
sql/updates/world/2015_07_16_00_world.sql
sql/updates/world/2015_07_17_00_world.sql
sql/updates/world/2015_07_17_01_world.sql
sql/updates/world/2015_07_17_02_world.sql
sql/updates/world/2015_07_17_03_world.sql
sql/updates/world/2015_07_17_04_world.sql
sql/updates/world/2015_07_18_00_world.sql
sql/updates/world/2015_07_18_01_world.sql
sql/updates/world/2015_07_19_01_world.sql
sql/updates/world/2015_07_19_02_world.sql
sql/updates/world/2015_07_19_03_world.sql
sql/updates/world/2015_07_19_04_world.sql
sql/updates/world/2015_07_19_05_world.sql
sql/updates/world/2015_07_21_00_world.sql
sql/updates/world/2015_07_24_00_world.sql
sql/updates/world/2015_07_24_01_world.sql
sql/updates/world/2015_07_24_02_world.sql
sql/updates/world/2015_07_24_03_world.sql
sql/updates/world/2015_07_24_04_world.sql
sql/updates/world/2015_07_24_06_world.sql
sql/updates/world/2015_07_24_07_world.sql
sql/updates/world/2015_07_25_00_world.sql
sql/updates/world/2015_07_25_01_world.sql
sql/updates/world/2015_07_25_02_world.sql
sql/updates/world/2015_07_25_03_world.sql
sql/updates/world/2015_07_25_04_world.sql
sql/updates/world/2015_07_26_00_world.sql
sql/updates/world/2015_07_26_04_world.sql
sql/updates/world/2015_07_26_05_world.sql
sql/updates/world/2015_07_26_06_world.sql
sql/updates/world/2015_07_27_00_world.sql
sql/updates/world/2015_07_27_01_world.sql
sql/updates/world/2015_07_28_02_world.sql
sql/updates/world/2015_07_28_03_world.sql
sql/updates/world/2015_08_13_00_world.sql
sql/updates/world/2015_08_13_01_world.sql
sql/updates/world/2015_08_13_02_world.sql
sql/updates/world/2015_08_13_03_world.sql
sql/updates/world/2015_08_13_04_world.sql
sql/updates/world/2015_08_21_00_world.sql
sql/updates/world/2015_08_21_01_world.sql
sql/updates/world/2015_08_21_02_world.sql
sql/updates/world/2015_08_23_00_world.sql
sql/updates/world/2015_08_25_00_world.sql
sql/updates/world/2015_08_25_01_world.sql
sql/updates/world/2015_08_26_00_world.sql
sql/updates/world/2015_08_26_01_world.sql
sql/updates/world/2015_08_27_00_world.sql
sql/updates/world/2015_08_29_02_world.sql
sql/updates/world/2015_08_29_03_world.sql
sql/updates/world/2015_08_29_04_world.sql
sql/updates/world/2015_09_01_00_world_335.sql
sql/updates/world/2015_09_05_00_world.sql
sql/updates/world/2015_09_05_01_world.sql
sql/updates/world/2015_09_06_00_world.sql
sql/updates/world/2015_09_08_01_world.sql
sql/updates/world/2015_09_08_02_world.sql
sql/updates/world/2015_09_11_00_world_from_335.sql
sql/updates/world/2015_09_11_01_world_from_335.sql
sql/updates/world/2015_09_11_02_world_from_335.sql
sql/updates/world/2015_09_11_03_world_from_335.sql
sql/updates/world/2015_09_11_04_world_from_335.sql
sql/updates/world/2015_09_11_05_world_from_335.sql
sql/updates/world/2015_09_11_06_world_from_335.sql
sql/updates/world/2015_09_11_07_world_from_335.sql
sql/updates/world/2015_09_11_08_world_from_335.sql
sql/updates/world/2015_09_11_09_world_from_335.sql
sql/updates/world/2015_09_11_10_world_from_335.sql
sql/updates/world/2015_09_11_11_world_from_335.sql
sql/updates/world/2015_09_11_12_world_from_335.sql
sql/updates/world/2015_09_11_13_world_from_335.sql
sql/updates/world/2015_09_11_16_world_from_335.sql
sql/updates/world/2015_09_11_17_world_from_335.sql
sql/updates/world/2015_09_11_18_world_from_335.sql
sql/updates/world/2015_09_11_21_world_from_335.sql
sql/updates/world/2015_09_11_40_world_from_335.sql
sql/updates/world/2015_09_11_41_world_from_335.sql
sql/updates/world/2015_09_11_43_world_from_335.sql
sql/updates/world/2015_09_11_51_world_from_335.sql
sql/updates/world/2015_09_11_52_world_from_335.sql
sql/updates/world/2015_12_14_00_world.sql
sql/updates/world/2016_01_01_00_world.sql
sql/updates/world/2016_01_01_01_world.sql
src/common/Common.h
src/common/Cryptography/Authentication/AuthCrypt.cpp
src/common/Cryptography/Authentication/AuthCrypt.h
src/common/Cryptography/HMACSHA1.cpp
src/common/Cryptography/HMACSHA1.h
src/server/database/Database/Implementation/CharacterDatabase.cpp
src/server/database/Database/Implementation/CharacterDatabase.h
src/server/database/Database/Implementation/LoginDatabase.cpp
src/server/game/AI/SmartScripts/SmartScript.cpp
src/server/game/AI/SmartScripts/SmartScript.h
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Battlefield/Battlefield.cpp
src/server/game/Battlegrounds/ArenaTeam.cpp
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundQueue.cpp
src/server/game/Battlegrounds/Zones/BattlegroundAB.cpp
src/server/game/Battlegrounds/Zones/BattlegroundAV.cpp
src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
src/server/game/Battlegrounds/Zones/BattlegroundIC.cpp
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
src/server/game/Battlegrounds/Zones/BattlegroundWS.cpp
src/server/game/Chat/Chat.cpp
src/server/game/Chat/Chat.h
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/DynamicObject/DynamicObject.cpp
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/ObjectGuid.cpp
src/server/game/Entities/Object/ObjectGuid.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Pet/Pet.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Transport/Transport.cpp
src/server/game/Entities/Transport/Transport.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Events/GameEventMgr.cpp
src/server/game/Globals/ObjectAccessor.cpp
src/server/game/Globals/ObjectAccessor.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Grids/GridDefines.h
src/server/game/Grids/ObjectGridLoader.cpp
src/server/game/Groups/Group.cpp
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Guilds/GuildMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/ReferAFriendHandler.cpp
src/server/game/Handlers/TaxiHandler.cpp
src/server/game/Handlers/TradeHandler.cpp
src/server/game/Instances/InstanceScript.cpp
src/server/game/Maps/Map.cpp
src/server/game/Maps/Map.h
src/server/game/Maps/MapInstanced.cpp
src/server/game/Maps/MapManager.h
src/server/game/Maps/TransportMgr.cpp
src/server/game/Maps/TransportMgr.h
src/server/game/Miscellaneous/Language.h
src/server/game/Movement/Waypoints/Path.h
src/server/game/OutdoorPvP/OutdoorPvP.cpp
src/server/game/OutdoorPvP/OutdoorPvP.h
src/server/game/Pools/PoolMgr.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Scripting/MapScripts.cpp
src/server/game/Scripting/ScriptMgr.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSession.h
src/server/game/Server/WorldSocket.cpp
src/server/game/Server/WorldSocket.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellHistory.cpp
src/server/game/Spells/SpellHistory.h
src/server/game/Spells/SpellInfo.cpp
src/server/game/Spells/SpellInfo.h
src/server/game/Spells/SpellMgr.cpp
src/server/game/Tickets/TicketMgr.cpp
src/server/game/Tools/PlayerDump.cpp
src/server/game/Tools/PlayerDump.h
src/server/game/World/World.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_gobject.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_mmaps.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Commands/cs_npc.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/scripts/Commands/cs_ticket.cpp
src/server/scripts/Commands/cs_wp.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_anubshiah.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_gorosh_the_dervish.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_grizzle.cpp
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_felwood.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.cpp
src/server/scripts/Northrend/Ulduar/Ulduar/boss_flame_leviathan.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
src/server/scripts/OutdoorPvP/OutdoorPvPNA.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPZM.cpp
src/server/scripts/Spells/spell_dk.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/World/duel_reset.cpp
src/server/scripts/World/npc_taxi.cpp
src/server/shared/Containers.h
src/server/shared/Dynamic/TypeContainer.h
src/server/shared/Dynamic/TypeContainerFunctions.h
src/server/shared/Dynamic/TypeList.h
src/server/shared/Packets/WorldPacket.h
src/tools/map_extractor/CMakeLists.txt
src/tools/map_extractor/System.cpp
src/tools/map_extractor/loadlib.cpp
src/tools/map_extractor/loadlib/loadlib.h
src/tools/map_extractor/mpq_libmpq.cpp
src/tools/map_extractor/mpq_libmpq04.h
src/tools/vmap4_extractor/adtfile.cpp
src/tools/vmap4_extractor/loadlib/loadlib.h
src/tools/vmap4_extractor/mpq_libmpq.cpp
src/tools/vmap4_extractor/mpq_libmpq04.h
src/tools/vmap4_extractor/vmapexport.cpp
src/tools/vmap4_extractor/wdtfile.cpp
src/tools/vmap4_extractor/wdtfile.h
src/tools/vmap4_extractor/wmo.cpp
2016-01-15 00:15:35 -03:00
ariel-
d04d14e34d
Update copyright note for 2016
2016-01-11 23:27:45 -03:00
Shauren
af41a70fe8
Core/Commands: Refactored chat command script hook, fixes a crash when building with gcc 5
...
Closes #15616
Closes #15740
(cherry picked from commit 2d942ddcc528cc9fe718ebbd5903318fcbdab817)
Conflicts:
src/server/game/Chat/Chat.cpp
src/server/scripts/Commands/cs_battlenet_account.cpp
src/server/scripts/Commands/cs_cast.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/Commands/cs_go.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_mmaps.cpp
src/server/scripts/Commands/cs_npc.cpp
src/server/scripts/Commands/cs_reload.cpp
src/server/scripts/Commands/cs_ticket.cpp
2016-01-11 01:51:52 -03:00
jackpoz
1a5b0067a3
Core/Commands: Fix NULL dereference crash
...
Closes #15833
(cherry picked from commit abd4e2e0f1 )
Conflicts:
src/server/game/Chat/Chat.cpp
2016-01-11 01:51:49 -03:00
pete318
6664a3acc3
Change many uint32 to ObjectGuid::LowType in line with 6.x changes.
...
(cherry picked from commit b1032ed620 )
Conflicts:
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/DynamicObject/DynamicObject.cpp
src/server/game/Entities/DynamicObject/DynamicObject.h
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/GameObject/GameObject.h
src/server/game/Entities/Object/ObjectGuid.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Pet/Pet.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Transport/Transport.h
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Guilds/GuildMgr.h
src/server/game/Mails/Mail.h
src/server/game/Maps/Map.cpp
src/server/game/Maps/TransportMgr.cpp
src/server/game/Maps/TransportMgr.h
src/server/game/OutdoorPvP/OutdoorPvP.h
2016-01-11 01:50:53 -03:00
ariel-
b3ea9fbbe5
Map local guids 6.x -> 4.3.4
...
Ported the following commits:
https://github.com/TrinityCore/TrinityCore/commit/ca83e14f8b141fab0a13e08f48fca6c1ace0c4c7
https://github.com/TrinityCore/TrinityCore/commit/ee1c1b97be4492ecabe8b15ea6323fc37e4eaa8c
https://github.com/TrinityCore/TrinityCore/commit/18e4ab6911468b829b0fc768e532a770263c3717
https://github.com/TrinityCore/TrinityCore/commit/bf37446b3c2ed73b4d3aa9e227d3eff5c53b378b
https://github.com/TrinityCore/TrinityCore/commit/cb854a2b7bb7bd96cf9c4d1daf3789f797bf4db8
2016-01-11 01:50:45 -03:00
Rushor
923a368ac7
Update copyright note for 2016
2016-01-01 12:02:33 +01:00
jackpoz
abd4e2e0f1
Core/Commands: Fix NULL dereference crash
...
Closes #15833
2015-11-10 21:14:18 +01:00
Shauren
d6c52ba28c
Core/Commands: Added assertion checking if command name is not null
...
(cherry picked from commit 56959697257aba3537af2273d9d30114bfd6bd5c)
2015-11-05 21:30:29 +01:00
joschiwald
df88c7f278
Core/Misc: removed some useless map checks
...
(cherry picked from commit cf1e80e3d09067ca4d0078a8113a09227a9f91ae)
2015-10-31 19:11:41 +01:00
Shauren
c92faf6277
Core/Commands: Refactored chat command script hook, fixes a crash when building with gcc 5
...
Closes #15616
Closes #15740
(cherry picked from commit 2d942ddcc528cc9fe718ebbd5903318fcbdab817)
# Conflicts:
# src/server/scripts/Commands/cs_battlenet_account.cpp
# src/server/scripts/Commands/cs_cast.cpp
# src/server/scripts/Commands/cs_debug.cpp
# src/server/scripts/Commands/cs_go.cpp
# src/server/scripts/Commands/cs_misc.cpp
# src/server/scripts/Commands/cs_mmaps.cpp
# src/server/scripts/Commands/cs_modify.cpp
# src/server/scripts/Commands/cs_npc.cpp
# src/server/scripts/Commands/cs_reload.cpp
# src/server/scripts/Commands/cs_ticket.cpp
2015-10-22 22:34:16 +02:00
pete318
b1032ed620
Change many uint32 to ObjectGuid::LowType in line with 6.x changes.
2015-10-12 23:10:41 +02:00
pete318
dcb7082277
Map local guids 6.x -> 3.3.35:
...
Implemented:
https://github.com/TrinityCore/TrinityCore/commit/ca83e14f8b141fab0a13e08f48fca6c1ace0c4c7
https://github.com/TrinityCore/TrinityCore/commit/ee1c1b97be4492ecabe8b15ea6323fc37e4eaa8c
https://github.com/TrinityCore/TrinityCore/commit/18e4ab6911468b829b0fc768e532a770263c3717
https://github.com/TrinityCore/TrinityCore/commit/bf37446b3c2ed73b4d3aa9e227d3eff5c53b378b
https://github.com/TrinityCore/TrinityCore/commit/cb854a2b7bb7bd96cf9c4d1daf3789f797bf4db8
* This adds separate (per map) guid sequences depending on object type
* Ported map object container from cmangos/mangos-wotlk@a2d396e
* Added type container visitor for TypeUnorderedMapContainer
* Implemented helper function to erase unique pairs from multimap containers
* Moved object storage of all objects except players and transports to map level
* Added containers linking database spawn id with creature/gameobject in world
* Renamed DBTableGuid to spawnId
* Added a separate spawn id sequence generator for creatures and gameobjects - this will be used in db tables
* Moved building SMSG_UPDATE_OBJECT - updatefields changes broadcast to map update
* Added new function to return but not increment guid
* Adjusted .debug loadcells to show low guid in map before/after load
* Added debug messages for creature spawn/destroy, for map guid debugging
* Store all Gameobjects and Creatures added to OutdoorPvP, so the callback script can be removed when OutdoorPvP instance is destroyed.
2015-09-22 21:33:57 +02:00
Carbenium
221f1405b6
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
sql/updates/world/2015_08_29_00_world.sql
sql/updates/world/2015_08_29_01_world.sql
sql/updates/world/2015_08_30_00_world.sql
sql/updates/world/2015_08_31_01_world.sql
sql/updates/world/2015_09_02_00_world.sql
sql/updates/world/2015_09_02_01_world.sql
sql/updates/world/2015_09_02_04_world.sql
sql/updates/world/2015_09_03_00_world.sql
sql/updates/world/2015_09_03_01_world.sql
sql/updates/world/2015_09_03_02_world.sql
sql/updates/world/2015_09_03_03_world.sql
sql/updates/world/2015_09_03_04_world.sql
sql/updates/world/2015_09_03_06_world.sql
sql/updates/world/2015_09_03_07_world.sql
sql/updates/world/2015_09_03_08_world.sql
sql/updates/world/2015_09_03_09_world.sql
sql/updates/world/2015_09_03_10_world.sql
sql/updates/world/2015_09_03_11_world.sql
sql/updates/world/2015_09_04_00_world.sql
sql/updates/world/2015_09_04_01_world.sql
sql/updates/world/2015_09_04_02_world.sql
sql/updates/world/2015_09_04_03_world.sql
sql/updates/world/2015_09_07_00_world.sql
sql/updates/world/2015_09_07_01_world.sql
sql/updates/world/2015_09_07_02_world.sql
sql/updates/world/2015_09_07_03_world.sql
sql/updates/world/2015_09_07_04_world.sql
sql/updates/world/2015_09_07_05_world.sql
sql/updates/world/2015_09_08_00_world.sql
src/common/Collision/Management/MMapManager.cpp
src/common/Cryptography/Authentication/AuthCrypt.cpp
src/common/Cryptography/Authentication/AuthCrypt.h
src/common/Cryptography/HMACSHA1.cpp
src/common/Cryptography/HMACSHA1.h
src/server/CMakeLists.txt
src/server/collision/CMakeLists.txt
src/server/game/CMakeLists.txt
src/server/game/Entities/Object/ObjectGuid.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/World/World.cpp
src/server/scripts/CMakeLists.txt
src/server/scripts/Commands/cs_cheat.cpp
src/server/scripts/Commands/cs_debug.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/worldserver/CMakeLists.txt
src/server/worldserver/Main.cpp
2015-09-15 20:42:34 +02:00
jackpoz
7c91984a64
Core/Chat: Allow to sanitize | characters when sending messages to clients
...
Add an optional parameter "escapeCharacters" to ChatHandler::SendSysMessage() to properly escape | character, otherwise it might freeze the client.
2015-09-05 13:54:44 +02:00
Carbenium
86eb651757
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
sql/base/dev/world_database.sql
sql/updates/world/2015_07_14_00_world.sql
sql/updates/world/2015_07_14_01_world_335.sql
sql/updates/world/2015_07_19_00_world_2015_07_18_04.sql
sql/updates/world/2015_07_19_05_world.sql
sql/updates/world/2015_07_21_00_world.sql
sql/updates/world/2015_07_24_00_world.sql
sql/updates/world/2015_07_24_01_world.sql
sql/updates/world/2015_07_24_02_world.sql
sql/updates/world/2015_07_24_03_world.sql
sql/updates/world/2015_07_24_04_world.sql
sql/updates/world/2015_07_24_05_world.sql
sql/updates/world/2015_07_25_03_world.sql
sql/updates/world/2015_07_25_04_world.sql
src/server/collision/Management/MMapManager.cpp
src/server/collision/Management/MMapManager.h
src/server/game/Battlefield/Battlefield.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.h
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/game/Weather/WeatherMgr.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/shared/Utilities/Util.cpp
2015-07-26 16:52:35 +02:00
Vincent-Michael
d2d4bc2668
Core: Header cleanup in game/*/*.cpp
...
(cherry picked from commit 2e586bc520e7eda2387e850c3c0049e6daa880de)
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
src/server/game/Battlegrounds/Zones/BattlegroundEY.cpp
src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
src/server/game/Chat/Chat.cpp
src/server/game/Combat/ThreatManager.cpp
src/server/game/DataStores/DB2Stores.cpp
src/server/game/DataStores/DBCStores.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/ObjectGuid.cpp
src/server/game/Entities/Object/Updates/UpdateData.cpp
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Globals/ObjectAccessor.cpp
src/server/game/Handlers/BankHandler.cpp
src/server/game/Handlers/CombatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/GuildHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/MiscHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Handlers/PetitionsHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Handlers/TokenHandler.cpp
src/server/game/Handlers/VoiceChatHandler.cpp
src/server/game/Maps/Map.cpp
src/server/game/Movement/Spline/MoveSplineInit.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Server/Packet.cpp
src/server/game/Server/Packets/SpellPackets.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellScript.cpp
src/server/game/Warden/Warden.cpp
src/server/game/Warden/WardenWin.cpp
src/server/game/Weather/WeatherMgr.cpp
2015-07-25 21:53:30 +01:00
Carbenium
293658fb13
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
.gitattributes
dep/PackageList.txt
sql/base/characters_database.sql
sql/updates/world/2015_06_26_01_world_2015_05_15_00.sql
sql/updates/world/2015_07_01_03_world_335.sql
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/game/Entities/GameObject/GameObject.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Miscellaneous/Language.h
src/server/game/Quests/QuestDef.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_rbac.cpp
src/server/scripts/Northrend/VioletHold/boss_zuramat.cpp
src/server/scripts/Spells/spell_quest.cpp
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/WorldDatabase.cpp
2015-07-22 02:26:46 +02:00
Naios
510194d6ba
Core/Database: Enable perfect forwarding for chat format calls.
...
(cherry picked from commit 4904318c43567277f2d32c758724e82874f29849)
2015-07-22 02:18:39 +02:00
Carbenium
6dfaec3d97
Merge commit 'dbaf88566be7083408fb8324d7886dc3e0a45cc0' into 4.3.4
...
Conflicts:
.gitattributes
CONTRIBUTING.md
sql/updates/world/2015_05_11_04_world.sql
sql/updates/world/2015_05_27_00_world.sql
sql/updates/world/2015_05_27_01_world.sql
sql/updates/world/2015_06_06_01_world_335.sql
src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
src/server/game/Entities/Creature/Creature.cpp
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Object/ObjectGuid.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Unit/Unit.h
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/Commands/cs_modify.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_item.cpp
src/server/scripts/Spells/spell_rogue.cpp
2015-07-22 02:09:32 +02:00
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
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
b82a072b25
Merge commit 'bba8555a29ea5cde018a73f92f1e6aa1a61351de' into 4.3.4
...
Conflicts:
dep/cppformat/CMakeLists.txt
dep/cppformat/ChangeLog.rst
dep/cppformat/format.cc
dep/cppformat/format.h
dep/cppformat/posix.cc
dep/cppformat/posix.h
sql/updates/world/2015_03_16_02_world.sql
sql/updates/world/2015_03_16_03_world.sql
sql/updates/world/2015_03_16_04_world.sql
sql/updates/world/2015_03_16_05_world.sql
sql/updates/world/2015_03_16_06_world.sql
sql/updates/world/2015_03_17_00_world.sql
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/worldserver/CMakeLists.txt
2015-07-21 23:46:56 +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
Aokromes
7680c90abd
Update (C) date
2015-07-19 13:37:44 +02:00
jackpoz
c6c09423fd
Scripts/Commands: Fix memory leak in ".reload command"
...
Free commandTableCache object before assigning it the result of malloc()
2015-06-20 22:42:30 +02:00
MitchesD
db8fdd94ed
Merge pull request #14782 from doctaweeks/fixes-for-6.x
...
Minor fixes for 6.x
(cherry picked from commit 0cf02097414ddf7a370bd2efef5b892616e8de93)
Conflicts:
src/server/bnetserver/Main.cpp
src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
src/server/game/Battlegrounds/Zones/BattlegroundTP.h
src/server/game/Chat/Channels/Channel.h
src/server/game/Entities/Player/Player.h
src/server/game/Quests/QuestDef.h
src/server/scripts/OutdoorPvP/OutdoorPvPNA.h
src/server/shared/Cryptography/SHA256.h
2015-06-01 00:39:56 +01:00
leak
7010671931
Core/Misc: Remove unused headers
2015-03-30 17:16:50 +02: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
Carbenium
03176662d1
Merge pull request #14317 from Naios/typesafelog
...
Type safe logging
(cherry picked from commit cc0c9add5a3f3a17e19029ddcaa7e711040f4fc5)
Conflicts:
src/server/bnetserver/CMakeLists.txt
src/server/game/Server/WorldSocketMgr.cpp
src/server/shared/Logging/AppenderDB.cpp
src/server/worldserver/CMakeLists.txt
2015-03-18 02:59:40 +01:00
Vincent-Michael
f3e86d3e68
Update copyright note for 2015
...
Happy new year
Conflicts:
src/server/bnetserver/Authentication/AuthCodes.h
src/server/bnetserver/Authentication/BattlenetPacketCrypt.cpp
src/server/bnetserver/Authentication/BattlenetPacketCrypt.h
src/server/bnetserver/Packets/AchievementPackets.h
src/server/bnetserver/Packets/AuthenticationPackets.cpp
src/server/bnetserver/Packets/AuthenticationPackets.h
src/server/bnetserver/Packets/BitStream.cpp
src/server/bnetserver/Packets/BitStream.h
src/server/bnetserver/Packets/CachePackets.cpp
src/server/bnetserver/Packets/CachePackets.h
src/server/bnetserver/Packets/ChatPackets.h
src/server/bnetserver/Packets/ConnectionPackets.cpp
src/server/bnetserver/Packets/ConnectionPackets.h
src/server/bnetserver/Packets/FriendsPackets.cpp
src/server/bnetserver/Packets/FriendsPackets.h
src/server/bnetserver/Packets/PacketManager.cpp
src/server/bnetserver/Packets/PacketManager.h
src/server/bnetserver/Packets/Packets.h
src/server/bnetserver/Packets/PacketsBase.cpp
src/server/bnetserver/Packets/PacketsBase.h
src/server/bnetserver/Packets/PresencePackets.cpp
src/server/bnetserver/Packets/PresencePackets.h
src/server/bnetserver/Packets/ProfilePackets.h
src/server/bnetserver/Packets/SupportPackets.h
src/server/bnetserver/Packets/WoWRealmPackets.cpp
src/server/bnetserver/Packets/WoWRealmPackets.h
src/server/bnetserver/Realms/RealmList.cpp
src/server/bnetserver/Realms/WorldListener.cpp
src/server/bnetserver/Realms/WorldListener.h
src/server/bnetserver/Server/ComponentManager.cpp
src/server/bnetserver/Server/ComponentManager.h
src/server/bnetserver/Server/ModuleManager.cpp
src/server/bnetserver/Server/ModuleManager.h
src/server/bnetserver/Server/Session.cpp
src/server/bnetserver/Server/Session.h
src/server/bnetserver/Server/SessionManager.cpp
src/server/bnetserver/Server/SessionManager.h
src/server/game/Accounts/BattlenetAccountMgr.cpp
src/server/game/Accounts/BattlenetAccountMgr.h
src/server/game/Battlegrounds/Zones/BattlegroundBFG.cpp
src/server/game/Battlegrounds/Zones/BattlegroundBFG.h
src/server/game/Battlegrounds/Zones/BattlegroundTP.cpp
src/server/game/Battlegrounds/Zones/BattlegroundTP.h
src/server/game/Entities/AreaTrigger/AreaTrigger.cpp
src/server/game/Entities/AreaTrigger/AreaTrigger.h
src/server/game/Entities/Item/ItemTemplate.cpp
src/server/game/Guilds/GuildFinderMgr.cpp
src/server/game/Guilds/GuildFinderMgr.h
src/server/game/Handlers/GuildFinderHandler.cpp
src/server/game/Handlers/VoidStorageHandler.cpp
src/server/game/Movement/MovementStructures.cpp
src/server/game/Movement/MovementStructures.h
src/server/game/Movement/PathGenerator.cpp
src/server/game/Server/BattlenetServerManager.cpp
src/server/game/Server/BattlenetServerManager.h
src/server/game/Server/Packet.cpp
src/server/game/Server/Packet.h
src/server/game/Server/Packets/AchievementPackets.cpp
src/server/game/Server/Packets/AchievementPackets.h
src/server/game/Server/Packets/AuctionHousePackets.cpp
src/server/game/Server/Packets/AuctionHousePackets.h
src/server/game/Server/Packets/AuthenticationPackets.cpp
src/server/game/Server/Packets/AuthenticationPackets.h
src/server/game/Server/Packets/BattlegroundPackets.cpp
src/server/game/Server/Packets/BattlegroundPackets.h
src/server/game/Server/Packets/ChannelPackets.cpp
src/server/game/Server/Packets/ChannelPackets.h
src/server/game/Server/Packets/CharacterPackets.cpp
src/server/game/Server/Packets/CharacterPackets.h
src/server/game/Server/Packets/ChatPackets.cpp
src/server/game/Server/Packets/ChatPackets.h
src/server/game/Server/Packets/ClientConfigPackets.cpp
src/server/game/Server/Packets/ClientConfigPackets.h
src/server/game/Server/Packets/CombatLogPackets.cpp
src/server/game/Server/Packets/CombatLogPackets.h
src/server/game/Server/Packets/CombatPackets.cpp
src/server/game/Server/Packets/CombatPackets.h
src/server/game/Server/Packets/EquipmentSetPackets.cpp
src/server/game/Server/Packets/EquipmentSetPackets.h
src/server/game/Server/Packets/GameObjectPackets.cpp
src/server/game/Server/Packets/GameObjectPackets.h
src/server/game/Server/Packets/GuildPackets.cpp
src/server/game/Server/Packets/GuildPackets.h
src/server/game/Server/Packets/ItemPackets.cpp
src/server/game/Server/Packets/ItemPackets.h
src/server/game/Server/Packets/LootPackets.h
src/server/game/Server/Packets/MiscPackets.cpp
src/server/game/Server/Packets/MiscPackets.h
src/server/game/Server/Packets/MovementPackets.cpp
src/server/game/Server/Packets/MovementPackets.h
src/server/game/Server/Packets/NPCPackets.cpp
src/server/game/Server/Packets/NPCPackets.h
src/server/game/Server/Packets/QueryPackets.cpp
src/server/game/Server/Packets/QueryPackets.h
src/server/game/Server/Packets/QuestPackets.cpp
src/server/game/Server/Packets/QuestPackets.h
src/server/game/Server/Packets/ReputationPackets.cpp
src/server/game/Server/Packets/ReputationPackets.h
src/server/game/Server/Packets/SpellPackets.cpp
src/server/game/Server/Packets/SpellPackets.h
src/server/game/Server/Packets/SystemPackets.cpp
src/server/game/Server/Packets/SystemPackets.h
src/server/game/Server/Packets/TalentPackets.cpp
src/server/game/Server/Packets/TalentPackets.h
src/server/game/Server/Packets/TradePackets.h
src/server/game/Server/Packets/WorldStatePackets.cpp
src/server/game/Server/Packets/WorldStatePackets.h
src/server/game/Server/WorldSocket.cpp
src/server/ipc/CMakeLists.txt
src/server/ipc/Commands.cpp
src/server/ipc/Commands.h
src/server/ipc/ZMQTask.cpp
src/server/ipc/ZMQTask.h
src/server/ipc/ZmqContext.cpp
src/server/ipc/ZmqContext.h
src/server/ipc/ZmqListener.cpp
src/server/ipc/ZmqListener.h
src/server/ipc/ZmqMux.cpp
src/server/ipc/ZmqMux.h
src/server/ipc/ZmqWorker.cpp
src/server/ipc/ZmqWorker.h
src/server/scripts/Commands/cs_battlenet_account.cpp
src/server/scripts/Commands/cs_mmaps.cpp
src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp
src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp
src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_daakara.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
src/server/scripts/EasternKingdoms/ZulAman/zulaman.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
src/server/scripts/EasternKingdoms/zone_ironforge.cpp
src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
src/server/scripts/Kalimdor/Firelands/boss_alysrazor.cpp
src/server/scripts/Kalimdor/Firelands/firelands.h
src/server/scripts/Kalimdor/Firelands/instance_firelands.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/boss_anraphet.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/boss_temple_guardian_anhuur.cpp
src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
src/server/scripts/Kalimdor/zone_azshara.cpp
src/server/scripts/Kalimdor/zone_darkshore.cpp
src/server/scripts/Kalimdor/zone_felwood.cpp
src/server/scripts/Kalimdor/zone_moonglade.cpp
src/server/scripts/Kalimdor/zone_orgrimmar.cpp
src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
src/server/scripts/Maelstrom/Stonecore/boss_high_priestess_azil.cpp
src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
src/server/scripts/Maelstrom/Stonecore/boss_slabhide.cpp
src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
src/server/scripts/Maelstrom/Stonecore/stonecore.cpp
src/server/scripts/Maelstrom/Stonecore/stonecore.h
src/server/shared/Cryptography/Authentication/AuthCrypt.h
src/server/shared/Cryptography/Authentication/PacketCrypt.cpp
src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
src/server/shared/Cryptography/HmacHash.cpp
src/server/shared/Cryptography/SHA256.cpp
src/server/shared/Cryptography/SHA256.h
src/server/shared/Database/Implementation/HotfixDatabase.cpp
src/server/shared/Database/Implementation/HotfixDatabase.h
src/server/shared/Realm/Realm.cpp
src/server/shared/Realm/Realm.h
src/tools/connection_patcher/CMakeLists.txt
src/tools/connection_patcher/Constants/BinaryTypes.hpp
src/tools/connection_patcher/Helper.cpp
src/tools/connection_patcher/Helper.hpp
src/tools/connection_patcher/Patcher.cpp
src/tools/connection_patcher/Patcher.hpp
src/tools/connection_patcher/Patches/Common.hpp
src/tools/connection_patcher/Patches/Mac.hpp
src/tools/connection_patcher/Patches/Windows.hpp
src/tools/connection_patcher/Patterns/Common.hpp
src/tools/connection_patcher/Patterns/Mac.hpp
src/tools/connection_patcher/Patterns/Windows.hpp
src/tools/connection_patcher/Program.cpp
src/tools/map_extractor/loadlib/DBFilesClientList.h
2015-01-01 00:32:50 +01:00
Nayd
24c173f387
Core: Use the correct function to convert strings to unsigned longs and unsigned long longs
...
Fixes wrong data being inserted into the database (i.e explored zones).
More info in #13493
Fixes #13493
Thanks to @jackpoz for finding the code issue and @Vavehl for an expectional bug report.
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/scripts/Commands/cs_modify.cpp
2014-11-26 02:21:50 +00:00
Shauren
c238e8faff
Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/ArenaTeamMgr.cpp
src/server/game/Handlers/GroupHandler.cpp
2014-10-18 15:54:30 +02:00
joschiwald
0de1603944
Core/ObjectAccessor: don't use singleton when calling static methods
2014-10-18 15:13:29 +02:00
Vincent-Michael
35bd935779
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Handlers/PetitionsHandler.cpp
2014-10-18 00:32:39 +02:00
jackpoz
a147770702
Core/Player: Additional fixes related to https://github.com/TrinityCore/TrinityCore/commit/ee5eaab598e445e3926edf6e12b1b2b4477c2594
...
Fix whispers to players on loading screen and few other cases.
2014-10-17 22:59:53 +02:00