Commit Graph

13855 Commits

Author SHA1 Message Date
Nay
dfa2fdc2cb Merge branch 'master' into 4.x 2011-11-24 00:10:09 +00:00
Nay
af086931e5 Forgot to delete files after copying them to 'sql/old'
Fail count is high tonight...
2011-11-23 23:48:59 +00:00
Nay
9447478630 DB: TDB 43: Move SQL updates to the old directory TDB335.11.44 2011-11-23 22:31:44 +00:00
Rat
5d39e09d89 Merge branch 'master' of github.com:TrinityCore/TrinityCore 2011-11-23 20:23:26 +01:00
Rat
47d0a7f3af Merge branch 'master' of github.com:TrinityCore/TrinityCore
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Server/Protocol/Opcodes.cpp
2011-11-23 20:23:04 +01:00
Shauren
afb2289d02 Core/DisableMgr: Fixed possible crashes at startup 2011-11-23 19:55:05 +01:00
megamage
f116960b2a Remove a check which always returns true. Correct me if I am wrong. 2011-11-23 13:21:10 -05:00
Shauren
358b33239a Core: Fixed remaining C6246: Local declaration of 'x' hides declaration of the same name in outer scope. from previous commit 2011-11-23 19:17:33 +01:00
megamage
f091360940 Do not allow base map be accessed from outside if map is instanceable. 2011-11-23 13:14:59 -05:00
megamage
0eb193f2b4 Revert 2f83db28f2. Note that here we only want to check baseMap->canEnter, but not instanceMap->canEnter.
Thanks to SignFinder.
2011-11-23 12:55:00 -05:00
megamage
5a0ffefecc Remove unnecessary const_cast<Map*>. 2011-11-23 12:51:20 -05:00
megamage
98be413ce0 Clean up very some confusing MapManager functions (create/find map/base map). 2011-11-23 12:45:59 -05:00
megamage
b3fef1e280 Fix build. 2011-11-23 12:42:11 -05:00
Shauren
638693e78f Core: Fixed more warnings (C6246: Local declaration of 'x' hides declaration of the same name in outer scope.) 2011-11-23 17:55:16 +01:00
Shauren
44693cfa99 Core: Fixed a few warnings and silly typos in scripts 2011-11-23 16:57:08 +01:00
megamage
298c162c86 Do not allow an instance map to be created twice if it already exists. Fix #4018. 2011-11-23 09:34:08 -05:00
Shocker
1b3017472b Scripts/Naxxramas: Patchwerk's Hateful Strike's timer should be 1s.
Closes #4036
2011-11-23 14:22:50 +02:00
Rat
47e28a7576 removed no more needed mixed dbc files 2011-11-23 13:18:35 +01:00
Rat
8c4d145178 fixed dbc local handling 2011-11-23 13:17:40 +01:00
Rat
dd80a880dc updated all remaining dbc structures 2011-11-23 13:16:45 +01:00
Shocker
e9cd4c6e80 Merge pull request #3988 from kandera/tempbranch2
Core/Mechanic: Resurrection (fixed the issue with players ressing in pla...
2011-11-23 04:03:47 -08:00
Shauren
fffe60b0d9 Scripts/Icecrown Citadel: Corrected an overlooked frenzy spam by Shambling Horrors on heroic mode (does not change anything in the fight) 2011-11-23 09:44:34 +01:00
Machiavelli
8444532746 Core/Units: Second part of SMSG_MOVE_SET_COLLISION_HGT implementation: compute proper collision height according to client formulae and send this to the client when mounting up. 2011-11-22 20:28:10 +01:00
Rat
34f0792f75 fixed startup crash while loading instance_encounters 2011-11-22 16:50:00 +01:00
Rat
a12df963b9 -updated all DBC formats, except spell* ones
-added dbc.zip (all 4.2.2 files + 3.3.5 spells)
-hardcoded map 0's entry for mapdifficulty (dbc has no data for it)
2011-11-22 13:32:11 +01:00
Spp
99ad58233b Core/Opcodes: Change status of CMSG_MOVE_SET_COLLISION_HGT_ACK to Unhandled to kill spam log 2011-11-22 13:26:54 +01:00
Machiavelli
367122dd62 Core/Packets: Allow CMSG_MOVE_SET_COLLISION_HGT_ACK to be received from the client (currently unhandled) 2011-11-22 06:02:53 +01:00
Nay
10444a1423 DB/Event/Pilgrim: Partially fix food tables 2011-11-21 23:54:33 +00:00
Nay
fc24f4959f DB/Event/Pilgrim: Template updates, vendor tables and other misc. stuff (A) 2011-11-21 22:55:31 +00:00
megamage
23186b24e2 Merge pull request #3421 from Chipsi/master
Core/Items: Added case for Darkmoon Card: Madness trinket
2011-11-21 14:12:46 -08:00
megamage
811d1f85a5 Merge pull request #3990 from kandera/lfgfix
Core/LFG: Fix being unable to enter an instance to retrieve body when yo...
2011-11-21 13:58:23 -08:00
megamage
0992f27cad Fix the correct exit from the dungeon finder queue.
By Giuseppe Montesanto

Conflicts:

	src/server/game/DungeonFinding/LFGScripts.cpp
2011-11-21 16:56:39 -05:00
Machiavelli
a14cbcaa3e Core/Units: Partial implementation of SMSG_MOVE_SET_COLLISION_HGT - send proper character collision height on dismount.
Fixes #2642

NOTE: Still have to properly implement collision height calculation for mounting up.
2011-11-21 22:54:25 +01:00
Nay
7c8f4358ea DB/Event/Pilgrim: Template updates, vendor tables and other misc. stuff (H) 2011-11-21 19:24:12 +00:00
Nay
0c343970d1 DB/Event/Pilgrim: Fix achievement "Turkey Lurkey". By Vincent-Michael
Closes #3994
2011-11-21 16:34:51 +00:00
Nay
4e683214da DB/Event/Pilgrim: Add item and mail reward to the "Pilgrim" achievement (A/H) 2011-11-21 16:16:10 +00:00
Nay
ad2b6964c9 DB: Fix DB startup errors
*slaps someone*
Closes #4016
2011-11-21 15:36:45 +00:00
Rat
154612f279 -started updating DBC formats for 14545
-added new dbc files for dev usage
2011-11-21 14:27:26 +01:00
Rat
d2a97e0d26 modified base sql to use 14545 as default game version 2011-11-21 14:25:25 +01:00
Rat
7f8193abf1 Merge branch 'master' of github.com:TrinityCore/TrinityCore 2011-11-20 18:39:20 +01:00
Rat
27afb1acd4 Added temperory dbc / db2 files
currently 3.3.5 dbc files are used, except for CurrencyTypes.dbc (was needed to get items working)

overwrite/add files in your build/data/dbc directory with these to get server running
2011-11-20 18:38:33 +01:00
Rat
d1affc4340 Initial Commit for client version change to 4.2.2 (14545)
- added known opcodes (handlers are commented till not updated)
- added bitstream support to bytebuffer
- updated realm auth for 14545
- updated world auth
- fixed char_enum,create,delete handlers
- added DB2 reader
- added opcode logging to debuglogmask (ignores loglevel)
- fixed compile in win64, others not yet tested
- using db2 values for item models at char_enum to prevent client crash

Lots of Thanks to All SingularityCore Members
2011-11-20 18:28:18 +01:00
Discover
eb190eb0bc DB/Quest: adding SAI for quests: Cleansing of the Orb of Orahil, Mana Surges
fixes #3670
2011-11-20 17:04:11 +01:00
zxbiohazardzx
85c44aa1d5 DB/Commit: Revert 2011_11_20_11_world_sai.sql 2011-11-20 16:55:43 +01:00
Discover
7d1bfb5dbd DB/Quest: adding SAI for quest Elixir of Pain
fixes #3668
2011-11-20 16:49:58 +01:00
Discover
f40994922f DB/Quests: adding SAI for quest Rivenwood Captives (11296)
fixes #3648
2011-11-20 16:46:37 +01:00
Discover
7bb02390fa Db/Quest: added SAI to quest A Carver and a Croaker (11476)
fixes #3649
2011-11-20 16:41:54 +01:00
Discover
bd4b6f38f2 DB/Quests: adding SAI for quest: The Kettis Offensive
fixes #3669
2011-11-20 16:38:06 +01:00
zxbiohazardzx
701a304480 Commit: fix bad date on filenames 2011-11-20 16:17:46 +01:00
Machiavelli
32bcee40bf Core/Spells: Fix crash in Glyph of Rake 2011-11-20 16:05:41 +01:00