Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 07:30:42 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,003 Commits 4 Branches 146 Tags
e07d3ebe4e6d2d797cb77ba65fb52efbef3462d9
Commit Graph

25003 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
DDuarte
e07d3ebe4e SQL: Rename file added in PR 2014-10-18 20:58:07 +01:00
Duarte Duarte
670d12722c Merge pull request #13245 from Mihapro/4.3.4 
DB/Quests: Fear No Evil changes
 2014-10-18 18:59:31 +01:00
Shauren
4a0be2bffc Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Spells/SpellMgr.cpp
 2014-10-18 16:00:20 +02:00
Warpten
8308f4a234 Merge pull request #13334 from Exodius/master 
Core/Spells: Fix Ebon Plague and Wandering Plague
 2014-10-18 15:54:49 +02: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
Shauren
1d1b3269c1 Buildsystem/CMake: Fixed FindZMQ macro on x86 Windows 2014-10-18 14:57:49 +02:00
Shauren
55e7879aec Buildsystem/CMake: Fixed FindZMQ macro on x86 Windows 2014-10-18 14:05:55 +02:00
Shauren
130bceac9d CI/Travis: Use a different ZeroMQ package for travis only 2014-10-18 12:04:22 +02:00
Shauren
552b64f1cb CI/Travis: Added libzmq-dev to install list 2014-10-18 11:58:21 +02:00
Shauren
d2973fce98 Merge pull request #13352 from ShinDarth/4.3.4 
Core/LootMgr:  Restore Build
 2014-10-18 11:56:25 +02:00
ShinDarth
4940f8c37e Core/LootMgr: restore build 2014-10-18 11:27:36 +02:00
DDuarte
fc4f3fbc95 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Loot/LootMgr.cpp
 2014-10-18 01:53:53 +01:00
Duarte Duarte
2523b47619 Merge pull request #13313 from ShinDarth/335_fix 
Improve logs of missing *_loot_templates
 2014-10-17 23:38:23 +01:00
Vincent-Michael
89fae5d172 Core: Fix merge fail 2014-10-18 00:37:24 +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
Shauren
69a17346d4 More build fixes, everyone loves pch 2014-10-18 00:26:41 +02:00
Shauren
863eac9c1a Fixed nopch build 2014-10-18 00:01:00 +02:00
Shauren
efcde65cf2 Dep/zmqpp: Build fix for ZMQ version 2.2.0 2014-10-17 23:40:17 +02:00
jackpoz
a147770702 Core/Player: Additional fixes related to ee5eaab598 
Fix whispers to players on loading screen and few other cases.
 2014-10-17 22:59:53 +02:00
Shauren
f773a9e053 Core: Implemented IPC (Inter-process communication) between worldserver and bnetserver using ZeroMQ library. 
* Implemented ToonReady and ToonLoggedOut battle.net packets
 2014-10-17 22:48:06 +02:00
jackpoz
ee5eaab598 Core/Players: Fix players not being notified if on loading screen 
Fix packets not being sent to players on loading screen even if the system supports these packets to be queued and sent till the player is in world.
There might be additional cases where this applies, please report back if you find any.

Fixes #11339
 2014-10-17 22:35:28 +02:00
Aokromes
c5ef82cc48 DB/Creature: More SAI update to CmC 
By Malcrom, master of fixes.


bye master.
 2014-10-17 01:21:20 +02:00
Dr-J
5d50e43063 DB/Misc: Add some missing emote texts 2014-10-16 15:41:35 +01:00
ShinDarth
993e072813 Core/LootMgr: improved logs of missing *_loot_templates 2014-10-16 15:04:16 +02:00
jackpoz
40cff79b25 Merge pull request https://github.com/TrinityCore/TrinityCore/pull/12779 from PortgasDAce/8 
Core/Spells: Fixed Range Weapon durability loss
 2014-10-15 21:07:42 +02:00
Exodius
f6e4105306 Core/Spells: Fix Ebon Plague and Wandering Plague 
Ebon Plague fix by @Unholychick
Wandering Plague fix by @tobmaps
Thanks to @maxxx for Ebon Plague correction.
 2014-10-15 19:34:09 +02:00
Dr-J
4542773912 DB/Misc: Chill Nymph's Do Not Speak in Common 
Dont know why some of the texts used by 23678 (Chill Nymph) had language 7 when both in Broadcast text and in sniff these are language 0
 2014-10-15 01:43:19 +01:00
joschiwald
8fdc7a6286 Scripts/ToC: fixed typo introduced in cfc0c50b5e 
* also update anub arak position to sniffed values

Closes #13323
 2014-10-14 18:35:46 +02:00
jackpoz
c3276ed27c Merge pull request #13327 from Nyeriah/patch-3 
Scripts/ICC: Register Rotface's summons so they can be despawned later
 2014-10-14 17:52:56 +02:00
Shauren
cc27497ea7 Battle.net: Removed not implemented comment from stream items opcodes 2014-10-14 16:53:44 +02:00
Duarte Duarte
ef7d59964d Readme: Small restyle to Bountysource badge 
See http://www.trinitycore.org/f/topic/10564-bountysource-get-paid-for-fixes/
 2014-10-14 15:20:20 +01:00
Nyeriah
0fa1024dbd Scripts/Icecrown Citadel: Register Rotface's summons so they can be despawned later 2014-10-14 02:51:33 -03:00
jackpoz
86e3737d11 Core/Movement: Fix evade issue 
Fix evade issue happening when an evading creature assists another one, causing it to stay in evading state forever.
Fix #4943
 2014-10-13 22:38:59 +02:00
Kinzcool
dd0f79bd26 DB/Texts: Added missing creature texts to uncomplete fixes 2014-10-13 16:31:22 -04:00
Gacko
5dcdf8a0e6 DB/SAI: Prevent infinite loop 
Just another brick in the wall... thanks @cr4st
 2014-10-13 18:04:14 +02:00
Shauren
1ef31ba752 Battle.net: Implemented cache stream items 2014-10-13 17:22:24 +02:00
Vincent-Michael
42f5017261 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
 2014-10-12 21:46:40 +02:00
MitchesD
a96ff6043d Merge pull request #13321 from Kittnz/unit_state 
Core/Misc: Fix current player state when logging out
 2014-10-12 21:36:46 +02:00
Shauren
cf521de9cb Battle.net/Packets: Added packet name mapping for logging 2014-10-12 20:58:25 +02:00
Gacko
9922063021 DB/Loot: Xandivious (15623) - forgot item 12002 
Thanks @Aminxhm
 2014-10-12 20:09:24 +02:00
jackpoz
bb046ce4ed Core/Maps: Apply const-correctness to GridMap::loadData() 2014-10-12 20:01:27 +02:00
Gacko
7252f11add DB/Loot: Xandivious (15623) 2014-10-12 19:51:23 +02:00
Aokromes
2df0144714 Revert bfc6044 2014-10-12 19:38:56 +02:00
Gacko
882cb2b32b DB/SAI: Prevent endless loops with linked events 2014-10-12 19:31:00 +02:00
Kittnz
68293aa9b2 Core/Misc: Fix current player state when logging out 
Sit should only be apply'd when player is standing.
For example when sitting on a chair when logging out, player should stay on the chair until fully logged out and not sit on the floor.
 2014-10-12 19:23:40 +02:00
Aokromes
7449231ce1 Update README.md 2014-10-12 19:13:04 +02:00
Aokromes
bfc6044c66 DB/Spell: Do not let Ebon Plague stack from different casters 
Closes #12314
Updates #1818
By unholychick
 2014-10-12 19:07:27 +02:00
Aokromes
a9cd76f101 DB/Spell: Delete no longer needed hack 
By unholychick
 2014-10-12 19:02:22 +02:00
Shauren
5f2252e863 Core/Authserver: Removed battle.net authresult enum from authserver 2014-10-12 18:59:01 +02:00