Rat
e90ef4fa24
Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x
2014-11-10 20:01:22 +01:00
Rat
8fbba546a4
Core/DataStores: updated some dbc format strings
2014-11-10 20:00:33 +01:00
Bernd Lörwald
481b21584b
Spells/SpellInfo: fix: add missing include for MAX_SPELL_REAGENTS
2014-11-10 18:30:33 +01:00
Rat
7901e341bf
Core/DataStores: updated some dbc format strings
2014-11-10 18:10:05 +01:00
Bernd Lörwald
53d2476156
Guild: fix: don't use std::set<>::emplace for gcc 4.7
2014-11-10 17:50:18 +01:00
Rat
e8d6f46309
Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x
2014-11-10 17:03:57 +01:00
Rat
f2e4a43754
Core/DataBase: Updated spell_proc and spell_proc_event tables
2014-11-10 17:03:33 +01:00
Bernd Lörwald
b7a23e6d37
Server/Protocol: fix: add missing include for ConnectionType
2014-11-10 16:30:36 +01:00
Rat
9a45e0b411
Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x
...
Conflicts:
src/server/shared/Utilities/Util.h
2014-11-10 16:25:17 +01:00
Rat
38de79a07b
fixed build
2014-11-10 16:22:10 +01:00
Bernd Lörwald
ef499c2839
Utilities/flag128: fix: HasFlag(): s/&&/||/
2014-11-10 16:07:13 +01:00
Rat
ef9bc5b17b
Merge branch 'Intel-dbc' into 6.x
2014-11-10 15:18:42 +01:00
Rat
ac0ff1fc9b
Merge branch 'dbc' of https://github.com/Intel/TrinityCore into Intel-dbc
...
Conflicts:
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCStructure.h
src/server/game/Events/GameEventMgr.cpp
2014-11-10 15:18:01 +01:00
Rat
d268b81044
Revert "Core/DataStores: Implemented loading of SpellMisc.db2, SpellClassOptions.db2, SpellPower.db2, SpellAuraRestrictions.db2, OverrideSpellData.db2 files"
...
This reverts commit b4a9f47123 .
2014-11-10 15:11:42 +01:00
Rat
b4a9f47123
Core/DataStores: Implemented loading of SpellMisc.db2, SpellClassOptions.db2, SpellPower.db2, SpellAuraRestrictions.db2, OverrideSpellData.db2 files
...
- Note: you will need the above files from 6.x
- Implemented flag128 class, used for spellfamilymasks
2014-11-10 11:28:34 +01:00
Rat
ae132dbf11
Core/Tools: Added WorldSafeLocs.dbc to extractable files' list
2014-11-10 11:25:08 +01:00
Shauren
e52357eb45
Warning fixes
2014-11-10 09:26:01 +01:00
DDuarte
78a3d21e38
Fix build
2014-11-10 07:46:15 +00:00
DDuarte
ec60d64498
Core/Packets: SMSG_NAME_QUERY_RESPONSE (PlayerNameResponse) handler
2014-11-10 06:44:43 +00:00
DDuarte
ec7923c2e6
Core/Packets: CMSG_NAME_QUERY (QueryPlayerName) handler
2014-11-10 05:53:05 +00:00
DDuarte
4b0a97af92
Core/Packets: CMSG_LOAD_SCREEN (LoadingScreenNotify) handler
2014-11-10 05:30:39 +00:00
DDuarte
ab6cde7fde
Core/Packets: CMSG_VIOLENCE_LEVEL handler
2014-11-10 05:14:35 +00:00
DDuarte
4552e6a672
Core/Packets: CMSG_CANCEL_TRADE handler
2014-11-10 05:08:29 +00:00
DDuarte
6586cae13c
Core/Packets: Add a constructor to ClientPacket with expected opcode (asserted)
...
Also move all trivial packet constructors from .cpp to .h
2014-11-10 04:39:20 +00:00
DDuarte
ac71c26e1c
Core/AccountMgr: Fix two typos when checking length of password
...
No real change, both MAX_ACCOUNT_STR and MAX_PASS_STR are currently 16
2014-11-10 03:36:18 +00:00
DDuarte
d36af78c7f
DB/World: Update faction and unit_class to default values
2014-11-10 02:35:25 +00:00
DDuarte
ad2cc63569
SQL: Update auth_database.sql
...
It was missing an update to realmlist.gamebuild
2014-11-10 02:34:33 +00:00
Intel
43d5fb5eae
Core/DataStores: Updating spells dbc part 2
2014-11-10 02:51:55 +02:00
DDuarte
4081d7d92f
Build fix
2014-11-10 00:49:42 +00:00
Shauren
0c27ffaa49
Core/Commands: Battle.net account command changes
...
* All commands renamed from "battlenetaccount" to "bnetaccount"
* bnetaccount create now also creates and links initial game account
* Added new commands bnetaccount link/unlink to manage relations between existing accounts
2014-11-10 01:19:24 +01:00
Intel
f847f55385
Core/DataStores: Updating spells dbc part 1
2014-11-09 23:53:48 +02:00
Shauren
2545804288
Build fix
2014-11-09 22:27:15 +01:00
Shauren
f59a701e29
Core/PacketIO: Updated and enabled logout opcodes
2014-11-09 21:36:06 +01:00
jackpoz
3881c5c3db
Core/LFG: Allow group bound to LFG instance to re-queue if someone leaves the party
...
(cherry picked from commit 064b47eccf )
2014-11-09 20:55:51 +01:00
Shauren
31730d52b6
Core/Logging: Added connection index to packetlog
2014-11-09 20:48:13 +01:00
Kinzcool
0ea4069b98
SQL: Updated the base build with changes in 2d74ee9141
2014-11-09 13:23:48 -05:00
Kinzcool
2d74ee9141
DB/Realmlist: Updated the required build to the actual base build
2014-11-09 13:20:05 -05:00
Shauren
ddc549518f
Core/Battle.net: Added more logs to auth process
2014-11-09 19:18:54 +01:00
Duarte Duarte
60eaa06d20
Merge pull request #13521 from TrinityCore/connection_patcher/fix_osx__document__fix_nonexistant_file_exception
...
Connection patcher: fix osx, document, fix nonexistant file exception
2014-11-09 16:52:49 +00:00
Shauren
543bea32e1
Core/DBLayer: Fixed a few mismatched types and possible invalid memory access with aggregate fields in queries
2014-11-09 16:57:56 +01:00
Shauren
18cce601b9
Core/Misc: Use opcode definitions instead of magic values for known opcodes in IsInstanceOnlyOpcode
2014-11-09 15:04:40 +01:00
joschiwald
2fee7d195b
Core/NetworkIO: updated SMSG_UPDATE_WORLD_STATE, added SMSG_PVP_SEASON and added packet class for SMSG_INIT_WORLD_STATES
2014-11-09 04:25:09 +01:00
Intel
2a4f56107f
Core/DataStores: Even more converted dbcs
2014-11-09 02:51:35 +02:00
Shauren
e8576e5d71
Core/Battle.net: Fixed a copypaste mistake in packet name logging
2014-11-09 00:38:58 +01:00
Shauren
bacc90b6ba
Core/NetworkIO: Added second connection to WorldSession, handle AuthContinuedSession and enabled ConnectTo and ResumeComms
2014-11-09 00:37:33 +01:00
Intel
d666e77ae8
Core/DataStores: More converted dbcs
2014-11-09 01:27:59 +02:00
jackpoz
6c1ca104ed
Core/LFG: Fix being unable to re-queue after leaving queue
...
(cherry picked from commit c2a69e748e )
2014-11-08 22:59:23 +01:00
MitchesD
6a2fc7c043
DB/SAI: Added SAI for some mobs in Icecrown Citadel
2014-11-08 22:25:59 +01:00
Bernd Lörwald
fbfb294888
Core: Fix non-pch build
2014-11-08 20:47:20 +00:00
Intel
b0f898ea8e
Core/DataStores: Updated item dbcs
2014-11-08 21:58:26 +02:00