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-
b20c9ae283
Corpses update: cd27fd38b93884797c094a82dc7beb0498e2f124
2016-01-11 01:50:49 -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
pete318
6d04b6ecc6
Improved Auction house deposit handling.
...
Including the weird quirks.
Changes:
* Deposit caculated according to same rule as client. (detailed below). Should always match client deposit now
* Deposit for multiple auctions now only collected once. Deferred calculation of deposit until all auctions listed.
Deposit calculation is as follows:
Base deposit calculation = MSV x 15/75% (depending on AH). However this is not rounded. Case to int is used (so always round down)
The remainder is held in a float.
The base is then multiplied by number of items, and the time multiplier (x2 for 24 hour, x4 for 48 hour)
The nearest (no of items or lower) no of items when multiplied by the remainder that creates a whole number is then multiplied by the time multiplier (x1/x2/x4) and then added to deposit.
Example:
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 1 = 36c. Remainder = 0.75 (n) Min = 1s. Deposit 1s
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 2 = 72c. Remainder = 1.50 (n) Min = 1s. Deposit 1s
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 3 = 108c. Remainder = 2.25 (n) Min = 1s. Deposit 1s08c
Item sell price 1s25. Deposit 18.75c (15% of 1s25). So base deposit = 18, remainder 0.75. Time 24h (x2) Item count 4 = 144c. Remainder = 3.00 (n) Min = 1s. Deposit 1s50c (144c + (3c * 2))
Horrible kludge, to re-create a very weird deposit method.
Closes #15674 (PR)
Closes #15643 (Issue)
(cherry picked from commit 0ac442f19f )
Conflicts:
src/server/game/AuctionHouse/AuctionHouseMgr.h
2016-01-11 01:50:38 -03:00
Aokromes
03dc96b4c4
Core/Misc: Fix build
2015-11-01 20:02:41 +01:00
Aokromes
c58f540348
Core/Conditions: Phase condition changes
...
* SourceGroup defines which phase should the condition affect
* SourceEntry limits the area of the phase (alternatively 0 means all areas)
2015-11-01 19:11:52 +01:00
Aokromes
a6077b31ec
Core/Gameobject: Fix a crash when enter Hor
2015-09-15 21:20:17 +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
treeston
d42a498063
Allow mounting while under transformations that can be cast while mounted.
...
Closes #12042 .
Credit to @SeTM for base code used.
2015-09-07 19:04:44 +02:00
jackpoz
166e66cc06
Core/Spells: Fix crash happening when using items to cast spells
...
Fix a crash happening when using items casting spells like Item ID 37198
Fix #14900
2015-09-05 22:45:15 +02:00
StormBytePP
4ada913d02
Core/Unit: Prevent AoE damage to have effect in some cases when faction is unfriendly but they don't attack you and you don't have at war enabled (Example, Sporaggar faction)
...
Fixes #15374
2015-08-29 02:35:58 +02:00
StormBytePP
70f029fd0a
Core/Unit: Do not remove aura with interrupt flag AURA_INTERRUPT_FLAG_NOT_UNDERWATER when already flying
2015-08-24 16:00:38 +02:00
David Carlos Manuelda
603f49a551
Merge pull request #15327 from Trisjdc/fix_rest_state
...
Core/Players: Improve rest state handling, allow several rest states to be active
2015-08-23 20:32:54 +02:00
joschiwald
df21162fe4
Scripts/VioletHold: rewrote the whole instance
...
thanks @MitchesD for help
2015-08-23 14:43:11 +02:00
Trisjdc
c14b66c24c
Core/Players: Improve rest state handling, allow several rest states to be active
...
Fixes https://github.com/TrinityCore/TrinityCore/issues/15325
2015-08-23 10:47:16 +01:00
StormBytePP
424576e098
Core/Misc: Added checks for procSpell nullptr cases
...
Fixes Coverity Defect ID: 1023036
2015-08-20 16:29:36 +02:00
StormBytePP
0cc3d883e1
Core/Build: Renamed Revision.h to GitRevision.h to avoid compile failure when old revision.h file is present
2015-08-16 23:08:01 +02:00
StormBytePP
94f69fb1bc
Core/Build: Removed obsolete SystemConfig.h and made genrev be part of shared library, which allows cache hits to happen more likely
2015-08-16 17:15:38 +02:00
DDuarte
e1b534e40f
Core/Object: Add changes to ObjectGuid from 6.x
...
copy and move cctor
assignment and assig move operators
Ref 81abfe93bb96e5a769dc855f06fdc7578b352b39 and 89a8a7e1a4bdc22d2da17b1a3bf34fd52bf87e85
2015-08-15 18:09:12 +01:00
Incorrect
071b2c68e8
Core/Misc: Add a few consts to methods
2015-08-12 22:49:21 +03:00
Carbenium
99ab531e76
Merge branch '3.3.5' into 4.3.4
...
Conflicts:
sql/updates/world/2015_07_29_00_world.sql
sql/updates/world/2015_07_29_01_world.sql
sql/updates/world/2015_08_01_00_world.sql
src/server/game/AuctionHouseBot/AuctionHouseBotBuyer.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Server/Protocol/Opcodes.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/game/Spells/SpellMgr.cpp
src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp
src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
src/server/scripts/Spells/spell_hunter.cpp
src/server/scripts/Spells/spell_pet.cpp
2015-08-12 21:05:39 +02:00
jackpoz
ea4d9c0d9e
Core/Misc: Remove unneeded ToCreature() casts
...
Remove some ToCreature() casts not needed anymore after 1ee90e1022 changes that moved IsPet(), IsTotem(), IsSummon(), IsGuardian(), IsHunterPet() and IsVehicle() from Creature to Unit
2015-08-12 14:05:14 +02:00
jackpoz
d243630acf
Core/Misc: Remove unneeded ToCreature() casts
...
Remove some ToCreature() casts not needed anymore after 1ee90e1022 changes that moved IsPet() from Creature to Unit
2015-08-12 12:48:33 +02:00
Aokromes
5ceb04ed47
Core/Misc: 3.3.5a fixes
2015-08-11 12:59:11 +02:00
Rochet2
12931f4762
Core/RestState: Check area trigger radius instead of 1.0f distance
...
Closes #15016
Closes #15052
Signed-off-by: jackpoz <giacomopoz@gmail.com >
2015-08-10 18:12:22 +02:00
Aokromes
1b57196b4e
Core/Misc: 3.3.5a fixes
2015-08-09 10:50:16 +02:00
jackpoz
3f3ff8b36b
Merge pull request #15119 from robinsch/grounding
...
Core/Spells: Grounding totem fix
Fixes #15108
2015-08-08 21:11:55 +02:00
jackpoz
a8ceb18cdf
Core/Gameobjects: Move a log from FATAL to DEBUG
...
The log is triggered when a mage creates a portal to another map, uses it and then the portal despawns.
2015-08-08 19:23:10 +02:00
Aokromes
deac934b80
Core/Misc: Misc 3.3.5a fixes
2015-08-08 16:45:38 +02:00
jackpoz
143026ed19
Core/Spells: Fix damage done by SPELL_EFFECT_NORMALIZED_WEAPON_DMG
...
Fix a rare case that would cause SPELL_EFFECT_NORMALIZED_WEAPON_DMG to do 4 billions damage or to trigger an assertion in Unit::CalculateDamage() depending by Unit base damage.
To reproduce the issue cast spell 25816 on a level 1-14 warrior, then make the warrior cast spell 694 on a Creature.
2015-08-05 19:58:19 +02:00
Aokromes
18251392b9
Core/Misc: Fix warning
2015-08-01 12:15:10 +02:00
Aokromes
efccc136b5
Core/Misc: Fix warning
...
By MitchesD
2015-07-29 11:14:24 +02:00
Aokromes
2cff3ae7ba
Core/Misc: 3.3.5a core fixes
2015-07-28 22:55:37 +02:00
Aokromes
413d6621c3
Core/Misc: More warning fixes
2015-07-27 10:57:03 +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
Jameyboor
b85b0c221b
Fix UpdateMovementFlags ignoring DynamicTree height.
2015-07-26 15:08:33 +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
Shauren
130878c1a5
Core/Collision: Removed direct GameObject references from collision project
...
(cherry picked from commit a029f97c8231f7be188663d63f95f34dd1b4f9e1)
Conflicts:
src/server/collision/Models/GameObjectModel.cpp
2015-07-25 16:22:33 +01:00
Carbenium
24c19fe8b4
Core/ObjectGuid: revert some changes from merge
2015-07-25 02:04:48 +02:00
DDuarte
d12fec67f2
Core/Misc: Add a few consts to methods
...
(cherry picked from commit 7d9843c380cf00f38ad0c5bc75fd387e50ee11da)
Conflicts:
src/server/bnetserver/Packets/ConnectionPackets.h
src/server/game/AI/SmartScripts/SmartAI.h
src/server/game/Battlefield/Battlefield.h
src/server/game/Battlegrounds/Battleground.h
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.h
src/server/game/Instances/InstanceSaveMgr.h
src/server/game/Support/SupportMgr.h
2015-07-24 12:02:57 +01:00
Shauren
b4adf3f5dd
Core/Misc: Fixing warnings detected by Visual Studio 2015 compiler
...
(cherry picked from commit a22e4e121a1e54b2f4154d59623ee4a94a449176)
Conflicts:
cmake/compiler/msvc/settings.cmake
src/server/game/DataStores/DBCStores.cpp
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/Object/Object.cpp
src/server/game/Entities/Object/Object.h
src/server/game/Entities/Pet/Pet.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Garrison/Garrison.cpp
src/server/game/Garrison/GarrisonMgr.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Globals/ObjectMgr.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Server/Packets/ChannelPackets.h
src/server/game/Server/Packets/PartyPackets.cpp
src/server/game/Server/WorldSession.h
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/game/Spells/SpellScript.cpp
src/server/scripts/Commands/cs_list.cpp
2015-07-24 11:51:48 +01:00
Carbenium
aaf3f090ea
Fix build
2015-07-24 01:49:34 +02: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
Carbenium
86c34de614
Merge commit '718c238524e5d9bc4d43c56c4870c78af794f520' into 4.3.4
...
Conflicts:
dep/PackageList.txt
dep/libmpq/AUTHORS
dep/libmpq/FAQ
dep/libmpq/README
dep/libmpq/THANKS
dep/libmpq/bindings/d/mpq.d
dep/libmpq/bindings/python/mpq.py
dep/libmpq/configure.ac
dep/libmpq/debian/control
dep/libmpq/debian/copyright
dep/libmpq/doc/man1/libmpq-config.1
dep/libmpq/doc/man3/Makefile.am
dep/libmpq/doc/man3/libmpq.3
dep/libmpq/doc/man3/libmpq__archive_close.3
dep/libmpq/doc/man3/libmpq__archive_files.3
dep/libmpq/doc/man3/libmpq__archive_offset.3
dep/libmpq/doc/man3/libmpq__archive_open.3
dep/libmpq/doc/man3/libmpq__archive_size_packed.3
dep/libmpq/doc/man3/libmpq__archive_size_unpacked.3
dep/libmpq/doc/man3/libmpq__archive_version.3
dep/libmpq/doc/man3/libmpq__block_close_offset.3
dep/libmpq/doc/man3/libmpq__block_open_offset.3
dep/libmpq/doc/man3/libmpq__block_read.3
dep/libmpq/doc/man3/libmpq__block_size_unpacked.3
dep/libmpq/doc/man3/libmpq__file_blocks.3
dep/libmpq/doc/man3/libmpq__file_compressed.3
dep/libmpq/doc/man3/libmpq__file_encrypted.3
dep/libmpq/doc/man3/libmpq__file_imploded.3
dep/libmpq/doc/man3/libmpq__file_number.3
dep/libmpq/doc/man3/libmpq__file_offset.3
dep/libmpq/doc/man3/libmpq__file_read.3
dep/libmpq/doc/man3/libmpq__file_size_packed.3
dep/libmpq/doc/man3/libmpq__file_size_unpacked.3
dep/libmpq/doc/man3/libmpq__strerror.3
dep/libmpq/doc/man3/libmpq__version.3
dep/libmpq/libmpq/Makefile.am
dep/libmpq/libmpq/common.c
dep/libmpq/libmpq/common.h
dep/libmpq/libmpq/explode.c
dep/libmpq/libmpq/explode.h
dep/libmpq/libmpq/extract.c
dep/libmpq/libmpq/extract.h
dep/libmpq/libmpq/huffman.c
dep/libmpq/libmpq/huffman.h
dep/libmpq/libmpq/mpq-internal.h
dep/libmpq/libmpq/mpq.c
dep/libmpq/libmpq/mpq.h
dep/libmpq/libmpq/pack_begin.h
dep/libmpq/libmpq/pack_end.h
dep/libmpq/libmpq/platform.h
dep/libmpq/libmpq/wave.c
dep/libmpq/libmpq/wave.h
dep/libmpq/tools/crypt_buf_gen.c
src/tools/map_extractor/mpq_libmpq.cpp
src/tools/map_extractor/mpq_libmpq04.h
src/tools/vmap4_extractor/mpq_libmpq.cpp
src/tools/vmap4_extractor/mpq_libmpq04.h
2015-07-22 02:13:10 +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
82ea8da720
Merge commit '44959aeedddb552c50bf9ff06a2685d216844f24' into 4.3.4
...
Conflicts:
.travis.yml
README.md
sql/updates/world/2015_04_18_00_world.sql
sql/updates/world/2015_04_18_05_world_335.sql
sql/updates/world/2015_04_26_03_world_335.sql
sql/updates/world/2015_05_09_00_world_335.sql
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/GameObject/GameObject.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/Spells/SpellInfo.cpp
2015-07-22 01:33:48 +02:00
Carbenium
153818e24e
Fix merge
2015-07-22 01:30:23 +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
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