Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-02-12 04:59:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
23,776 Commits 4 Branches 147 Tags
2452cfb98ecdc18bd64a118410d2a6dc9505f0c4
Commit Graph

23776 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shauren
2452cfb98e Part 2: Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-07-19 15:26:06 +02:00
Shauren
3e56a4b8d7 Part 1: Merge branch 'master' into 4.3.4 2014-07-19 13:40:14 +02:00
Shauren
99dd35da14 Buildsystem/MSVC: Disable C4512 warning 2014-07-19 13:31:17 +02:00
Shauren
57cf08f86e Core/Logging: Changed format of packet log file from .bin to .pkt and restored packet logging - PacketLogFile extension must now be .pkt to allow WowPacketParser to use it 2014-07-19 13:30:51 +02:00
tyraela
7f287b6d50 DB/Creature: Remove wrong aura on Monstrous Kaliri 
Close #12563
 2014-07-19 13:09:33 +02:00
Aokromes
8b48aad6ad Update 2014_07_19_00_world_spell_custom_attr.sql 2014-07-19 04:55:18 +02:00
Shauren
909acdbac3 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.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/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	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/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist
 2014-07-19 03:51:11 +02:00
Vincent-Michael
fbccc58f4a Core/Spells: "Black Magic" can no longer remove after dead 2014-07-19 03:18:05 +02:00
Vincent-Michael
9a2d86f6ae Core/Spells: Fix Quest "The Emissary" 2014-07-19 02:43:15 +02:00
Aokromes
1866d8cc06 DB/Quest: Inoculation and Spare Parts 
By Crysicle, closes #12505
 2014-07-18 22:35:47 +02:00
Aokromes
ca6323ca59 DB/Quest: Remove pre-requisite for Volatile Mutations 10302 
By Crysicle, closes #12503
From wowwiki: Note: Prior to patch 3.3.2,  [2] Botanist Taerix was a prerequisite to this quest chain.
 2014-07-18 22:18:13 +02:00
Shauren
5daf3d3606 Merge branch 'master' into 4.3.4 2014-07-18 21:21:17 +02:00
Aokromes
d07e1f8aea DB/Creature: Topper McNabb 
By dr-j,closes #12556
 2014-07-18 20:57:00 +02:00
Aokromes
2080ea7dd9 DB/Creature Force Display model for 17734 
Closes #12551
 2014-07-18 20:18:12 +02:00
Aokromes
696308f0fc DB/Quest: Tainted Memorandum 
By Crysicle, closes #12550
 2014-07-18 20:08:45 +02:00
Aokromes
2982af2d16 DB/Creature: Fix Stormwind Marine faction 
Closes #12555
 2014-07-18 19:55:41 +02:00
Aokromes
0a58e50a7e DB/Creature: Delete double spawns training dummies 
By Magnifikator, closes #12548
 2014-07-18 16:28:52 +02:00
Warpten
dd64f77dcc Core/Spells: Since patch 4.0.1, an hunter can track multiple creature types at once. 2014-07-18 06:42:21 -04:00
Subv
5544ce146e Core/Codestyle: Do not use a pointer to a shared_ptr in Player::ModifyArenaPoints and Player::ModifyHonorPoints 2014-07-17 20:24:39 -05:00
Duarte Duarte
99a4ea3362 Core/Players: Fix possible crash in ModifyArenaPoints and ModifyHonorPoints 2014-07-18 00:20:28 +01:00
leak
25c68cc2d3 Restored character creation that was broken due to some logic errors cause by shared_ptr refactoring 2014-07-17 23:16:14 +02:00
jackpoz
fe1289ed1a Core/Misc: Fix abort() on shutdown on *nix 
Wait for cliThead to exit before deleting it to about std::abort() triggered on *nix systems.
 2014-07-17 20:54:32 +02:00
leak
784676859b Readd G3D-v8.0_hotfix9.diff that slipped through thanks to .gitignore 2014-07-17 20:13:32 +02:00
Warpten
7977a06fe5 Compile fix for previous commit. vim edition over ssh is a bad idea. 2014-07-17 12:41:23 -04:00
Warpten
4dd436f93c Core/Opcodes: Updated SMSG_SUPERCEDED_SPELL's structure to 4.3.4 2014-07-17 12:38:59 -04:00
Warpten
3be239ca41 Conflicts fix after cherry pick of previous commit from master branch. 2014-07-17 12:35:38 -04:00
Warpten
5e561d6cc0 Core/Spells: SMSG_SUPERCEDED_SPELL is now sent by an unique function. 2014-07-17 12:22:50 -04:00
Shauren
0a3d1a35cd Buildsystem: Removed debugging message from cmake output 2014-07-17 15:43:39 +02:00
Shauren
7532864264 Buildsystem/MSVC: Warning fixes 
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
 2014-07-17 15:42:57 +02:00
Vincent-Michael
345bed25d2 DB/Conditions: Fix typo in conditions "Sealed Chest" 2014-07-17 02:12:16 +02:00
leak
8c10ffa62d GCC compile fixes 2014-07-16 19:27:15 +02:00
leak
e2fed64550 Update related files to lowered Boost version requirement 2014-07-16 18:42:17 +02:00
leak
aedb824e99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost 2014-07-16 17:53:33 +02:00
Shauren
3249986ba8 Buildsystem/GCC: Fixed release linking errors 2014-07-16 13:09:56 +02:00
Aokromes
b5cb3da857 DB/Misc: Adition to 9f0ec86 
By dr-j
 2014-07-16 11:53:54 +02:00
Aokromes
a61cea1e54 DB/Misc: Fix Gossip on Kor'kron overseer 
By dr-j, closes #12514
 2014-07-16 08:37:35 +02:00
Aokromes
e373f75ceb DB/Quest: Fix Banishing Portal 
By dr-j, closes #12510
 2014-07-16 00:18:01 +02:00
Aokromes
9f0ec867c4 DB/Quest: Sarkoth 
By dr-j, closes #12511
 2014-07-16 00:11:40 +02:00
Chaplain
68398a559e [Auth\Worldserver] Use boost to load console arguments. (Added a few style changes and cmake fix) 
Conflicts:
	src/server/worldserver/Main.cpp
 2014-07-15 18:15:55 +02:00
Aokromes
7be070359b DB/SAI: Adition to 70c82a3 
By dr-j
 2014-07-15 12:44:54 +02:00
Aokromes
d4e8eae705 DB/Creature: Stinker 
By dr-j, closes #12502
 2014-07-15 07:14:02 +02:00
Dr-J
3629c4128f DB/Misc: Fix Frogger (Naxxramas) 
Closes #12434
 2014-07-15 00:26:02 +02:00
leak
ecde28d1c1 Replacing ACE based multi threading with PCQ 2014-07-14 22:51:13 +02:00
jackpoz
fe5d38ae7d Fix mmaps_generator build 
Remove old unneeded file breaking mmaps_generator build.
 2014-07-14 22:25:05 +02:00
Vincent-Michael
524cc6c2d9 Core/Battleground: Fix typo and small cleanup (again thx @joschiwald) 2014-07-14 21:31:16 +02:00
Vincent-Michael
06d9d33de3 Core/Battleground: Fix merge fail (thx @joschiwald) 2014-07-14 21:16:19 +02:00
Vincent-Michael
13ff07f121 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/scripts/Commands/cs_wp.cpp
 2014-07-14 21:01:55 +02:00
leak
a70fb4c306 Corrected order of inclusion in Define.h 2014-07-14 20:54:55 +02:00
joschiwald
14bbe3e2e9 Core/Battleground: fixed typo 
* and fixed some warnings
 2014-07-14 20:12:39 +02:00
Aokromes
70c82a385f DB/Creature: Script a lot of creatures 
By dr-j, closes #12498
 2014-07-14 19:07:47 +02:00