Commit Graph
100 Commits
Author SHA1 Message Date
kaelima 774f3cdc9b Fixed some merging errors, there could be more, but at least it compiles. 2012-05-30 09:22:56 +02:00
kaelima f40e0d0a9a Merge branch '4.x' of github.com:TrinityCore/TrinityCore into 4.x
Conflicts:
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Instances/InstanceScript.h
2012-05-30 08:03:08 +02:00
kaelima 3d14384c32 Merge git://github.com/TrinityCore/TrinityCore into 4.x
Conflicts:
	dep/PackageList.txt
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Chat/Commands/Level1.cpp
	src/server/game/Chat/Commands/Level3.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.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/GameObject/GameObject.cpp
	src/server/game/Entities/Item/Item.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	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/Spell.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Commands/cs_gps.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Logging/Log.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_extractor/CMakeLists.txt
2012-05-30 08:01:02 +02:00
kaelima 34442e83b0 Core/Protocol: 4 opcodez 2012-04-04 04:27:18 +02:00
kaelima fc673fce92 Core/Protocol: Missing changes from ac81411db4 2012-03-30 15:13:54 +02:00
kaelima ac81411db4 Core/Protocol:
- 5 new opcodes
- Some spell research and fixed MSG_CHANNEL_START
- Fixed SMSG_UPDATE_INSTANCE_ENCOUNTER_UNIT for 4.2.2, and removed SMSG_GAMEOBJECT_SPAWN_ANIM_OBSOLETE (which does not exist)
2012-03-30 02:43:17 +02:00
kaelima c15f7bfc19 Core/Pet: Fixed possible crash after swapping pet with stable master. Closes #5177 2012-02-21 16:50:45 +01:00
kaelima 7ce7853606 Core/Spells: Revert part of 65d269f6de. Solves some recent instant spell casting issues. 2012-02-16 20:38:48 +01:00
kaelima d336c9efc5 Core/Movement: Fix a crash when a player logout in a hostile area. The honorless spell should and is already casted after recieving CMSG_MOVE_SPLINE_DONE.
Closes #5245

- Also corrected an error message in auctionhousemgr.
2012-02-16 11:11:29 +01:00
kaelima 5684f39d58 Core/Protocol: Remove useless ResetInstances call inside WorldSession::HandleResetInstancesOpcode. 2012-02-10 12:52:30 +01:00
kaelima 03b2717931 Core/Map:
- Fixed crash when a player was disconnected during a transfer to another map.
- Only call OnPlayerLeaveMap if player is removed from map. (Ty QAston)
2012-02-10 12:43:13 +01:00
kaelima e7cd9f0b4c Core/Movement: Don't send heartbeat message only to self on movementflag update. Should solve some recent issues with vehicles. 2012-02-09 13:41:43 +01:00
kaelima b194070cd5 Script/Holiday: Cleanup and fix possible crash from 32b2fccf33 2012-02-08 16:06:37 +01:00
kaelima e602619912 Core/Player: Remove spell used to unlearn talents and replace with a direct packet send. Spell is not found casted in 3.3.5a sniffs. Thanks Malcrom for the hint. 2012-02-03 14:56:29 +01:00
kaelima 2030a14e8a Core/Protocol: Correct the struct for SMSG_FEATURE_SYSTEM_STATUS (4.2.2) 2012-01-31 16:48:09 +01:00
kaelima b62af27123 Core/Protocol: Enable SMSG_THREAT_UPDATE 2012-01-26 15:45:09 +01:00
kaelima 9d9dc50b13 Core/Protocol: Activate some SMSG opcodes 2012-01-26 15:43:42 +01:00
kaelima 6c1815db7f Core/Battleground: Remove useless and unused function 2012-01-26 14:48:05 +01:00
kaelima 99086ac8a8 Core/Protocol: Refix MSG_GUILD_PERMISSIONS after a misstake in my last commit 2012-01-18 19:01:22 +01:00
kaelima ba23b69a17 Core/Protocol: Fix SMSG_TRAINER_BUY_SUCCEEDED and SMSG_MAIL_LIST_RESULT. Thanks Nay 2012-01-18 18:26:15 +01:00
kaelima eae789c5c1 Core/Protocol: Fix and activate a handful of opcodes, also some cleanup / documentation 2012-01-18 18:13:57 +01:00
Kaelima afc0d72761 Merge pull request #4789 from drskull/master
Spirit Hunt
2012-01-17 21:41:47 -08:00
Kaelima 1760970417 Merge pull request #4822 from Fredi/auction_owner_not
Core/IO: Corrected SMSG_AUCTION_OWNER_NOTIFICATION packet structure
2012-01-17 21:41:27 -08:00
Kaelima ba0af6f3c2 Merge pull request #4859 from Gyx/4.x
Gyx 4.x update
2012-01-17 21:39:47 -08:00
kaelima 819da8af4d Core/Items: Attempt to fix crash in Player::SplitItem caused by 6a44399852.
And some random cleanup
2012-01-18 06:07:30 +01:00
kaelima f10e41ee41 Scripts/Trial of the Crusader: Fix crash in MovementInform for Frost Sphere in Anub'arak encounter.
Thanks Vincent-Michael!
Fixes #4834
2012-01-15 20:37:25 +01:00
kaelima f1cc8f532e Core/Opcodes: Corrected the opcode for CMSG_GAMEOBJ_USE and CMSG_GAMEOBJ_REPORT_USE 2012-01-15 14:52:57 +01:00
kaelima 7be86ac0a3 Core/Opcodes: Added some reversed opcodes (all verified) 2012-01-13 05:58:36 +01:00
Kaelima 4d82b0824a Merge pull request #4796 from Gyx/4.x
Gyx 4.x update
2012-01-12 20:43:57 -08:00
kaelima 233d891952 Scripts/Achievements:
- Move achievement Shocking! to appropriate boss script instead of instance script.
- Split the polarity spellscript into two and move to proper boss file
- Fixed a typo in Loatheb's spore achievement.
2012-01-11 17:21:03 +01:00
Kaelima d007780ab6 Merge pull request #4740 from drskull/master
Shaman T10 Enhancement 4P Bonus
2012-01-09 12:31:27 -08:00
kaelima 051faf9835 SQL: Add map difficulty limitation for the achievement added in f850baeb30
Thanks Vincent-Michael
2012-01-09 14:30:22 +01:00
kaelima f850baeb30 Script/Naxxramas: Fixed "A Spore Loser", texts and timers for Loatheb encounter.
Creds to Warpten, thanks.
2012-01-09 10:07:46 +01:00
Kaelima e457649170 Merge pull request #4714 from elecyb/mover
Core-Vehicles: Change player mover when add/remove passenger (thanks Sub...
2012-01-08 06:41:02 -08:00
Kaelima 70d51e53c3 Merge pull request #4684 from Subv/fix1
Fixed the behaviour of SmartAI::RemoveAuras
2012-01-06 18:26:19 -08:00
Kaelima a79ea3dcdf Merge pull request #4672 from Subv/fix004
Fixed gossip menu displaying for gameobjects with type GAMEOBJECT_TYPE_QUESTGIVER
2012-01-06 06:37:20 -08:00
kaelima 9817771973 DB:
- Corrected the name of one recently pushed sql file.
- Added some stuff to 728c07b888 (for The Etymidian)
2012-01-05 21:56:18 +01:00
Kaelima b75a42f761 Merge pull request #4608 from elecyb/farsight
Core/Spells: Some corrections after viewpoint visibility fix
2012-01-03 12:56:18 -08:00
kaelima 07c294b0c2 Core/Vehicle: Corrected the flag of VEHICLE_SEAT_FLAG_B_USABLE_FORCED_4 2011-12-23 14:32:32 +01:00
kaelima 398299084e Corrected some logic in my recent commits.
- ff2dbfc381 thanks LihO
- 6ccf95af4c thanks frostmourne
2011-12-22 18:48:06 +01:00
kaelima e9ee82daf7 Scripts/Forge of Souls: Fix a crash alert for entry 36535. (trying to change movementgenerator during the delete process) 2011-12-22 13:24:59 +01:00
kaelima ff2dbfc381 Core/Spells: Fix two signed / unsigned warnings from f8a13b401d 2011-12-22 13:22:18 +01:00
kaelima f8a13b401d Core/Spells:
- Fix channeling spells with infinite duration (-1)
- Allowed SPELL_FAILED_EQUIPPED_ITEM_CLASS_MAINHAND and SPELL_FAILED_EQUIPPED_ITEM_CLASS_OFFHAND in SendCastResult (more reasons todo)
2011-12-22 00:38:01 +01:00
kaelima e285fcffac Fix compile 2011-12-21 03:45:58 +01:00
kaelima 6b25c2c629 Core/Spells: Added more cases for SMSG_CAST_FAILED. Thanks Tomrus and Spp 2011-12-21 03:29:25 +01:00
kaelima 4ef82117d1 Server/Protocol:
- Added a bunch of opcodes (from wpp, ty Nay and Spp)
- Accepted handler for some confirmed structures
- Some updates in SMSG_UPDATE_OBJECT (although useless without splines)
2011-12-21 03:25:24 +01:00
kaelima b8eed5d127 Misc/Enum: Updated some enums to 4.2.2 2011-12-21 02:23:56 +01:00
kaelima 4b0acb7432 Core/Spells: Force Invisibility (mage) to leave combat. 2011-12-21 02:16:06 +01:00
kaelima 2f2b84f6e5 Core/Spells: Fix some possible crashes in HandleAuraDummy, caster can be null for auras. 2011-12-21 02:12:46 +01:00
kaelima 6ccf95af4c Scripts/Toc: Fix a possible crash with grand champions encounter. 2011-12-21 01:59:36 +01:00
kaelima 7a2f7b0e63 Commands/Npc: Add AIName/ScriptName to npc info
Thanks Aokromes for suggestion
2011-12-18 22:45:23 +01:00
kaelima c8d5f12901 DB: Kill some startup errors
Forgot to remove creature_addons for creatures removed in ubrs/lbrs
2011-12-18 03:42:47 +01:00
kaelima 2b1dd6071c Correct some waypoint_scripts guids from last commit. 2011-12-17 16:00:09 +01:00
kaelima 3bd80d2bdf Scripts/Winter Veil: Fix possible exploit when kissing Winter Reveler. Also fix the visual cast of the debuff. 2011-12-17 05:01:37 +01:00
kaelima d10b0b74bd Fix code style and compile from 7e1c556536 2011-12-16 17:19:05 +01:00
Kaelima 970878f677 Merge pull request #4355 from kandera/fix_master_poisoner
Core/Spells: Envenom (Fix buff duration from master poisoner. aura was b...
2011-12-16 08:16:40 -08:00
Kaelima 739715c761 Merge pull request #4351 from gigatotem/master
Deathbringer's Will and Deathbringer's Will HC.
2011-12-16 07:59:04 -08:00
kaelima 929ad95525 Core/Spells: Fixed Envenom damage
- The players AP should stack with combo points, not deadly poison stack.
+ some cleanup
Thanks @Cepox (and some others at google code issue tracker)

Closes #2929
2011-12-16 08:15:55 +01:00
kaelima e504fc88d6 Core/Commands: Fixed crash when closing ticket in console, introduced in db8c10c7bf 2011-12-15 00:09:27 +01:00
kaelima ef519bd313 Copy/paste error in f8cb2f528b 2011-12-13 13:58:52 +01:00
kaelima cd5704f372 Fix date for sql added in af32d0f616 2011-12-13 13:55:55 +01:00
kaelima 17771b20c1 Copy/paste error in f8cb2f528b 2011-12-12 21:05:51 +01:00
Kaelima e34eda37c7 Merge pull request #4257 from Warpten/bleed
Core/Spells: Rake's initial damage is a bleeding effect, it should thus ignore armor.
2011-12-12 11:21:00 -08:00
kaelima b85a5e9fa5 Fix date for sql added in af32d0f616 2011-12-12 12:13:02 +01:00
Kaelima a7a245b561 Merge pull request #4273 from elecyb/healtotem
Core/Spells: Fix for Healing Stream Totem bonus and Glyph of Healing Stream Totem
2011-12-12 03:09:19 -08:00
kaelima 39be215811 Core/Protocol: Add debug output when receiving auction house packets. 2011-12-10 16:26:04 +01:00
kaelima a85ca687eb Core/Spell: Fixed compile broken in 11fb0beaf0 and renamed _player to player. 2011-12-10 15:40:55 +01:00
kaelima 11fb0beaf0 Core/Misc: Fixed some duplicate checks for player typeid in Unit::Kill and Spell::EffectSummonDeadPet. Also some random cleanup 2011-12-10 13:48:41 +01:00
kaelima b10477a166 Core/SmartAI: Fixed crashes when using timed actionlist for gameobjects. 2011-12-10 13:44:06 +01:00
kaelima 100bcd6aec Core/Protocol: Fixed unprocessed tail data for opcodes CMSG_QUEST_POI_QUERY, CMSG_SHOWING_HELM, CMSG_SHOWING_CLOAK and CMSG_AUCTION_LIST_BIDDER_ITEMS. 2011-12-10 13:42:22 +01:00
kaelima b0d106944b Core/Misc:
- Add missing spell effects
- One missing area flag
- Added some fields to AreaTableEntry fields that now has previously been empty
(4.2.2)
2011-11-30 21:25:20 +01:00
kaelima 36a90f7098 Core/Definies: Updated SharedDefines header with 4.2.2 values
FYI:
BATTLEGROUND_TP = Twin Peaks
BATTLEGROUND_BFG = Battle For Gilneas
2011-11-29 02:27:17 +01:00
Kaelima aa96a4ca9c Merge pull request #4131 from Venugh/4.x
4.x
2011-11-28 09:04:54 -08:00
kaelima 359a21a553 Core/Protocol: Allow use of a bunch of opcodes
(all structs have been checked)
2011-11-27 23:31:46 +01:00
kaelima b84d82e569 Core/Protocol: Add some account data protocols.
Their struct have not changed since 3.3.5a.
2011-11-27 04:02:59 +01:00
kaelima 50f8881494 Core/Player: Store guild id inside protected integer instead of fetching from db. Still have method GetGuildIdFromGuid though if player is offline. 2011-11-27 03:40:03 +01:00
kaelima a2406e2ade Fix typo and compile 2011-11-26 21:36:15 +01:00
kaelima b096ffe981 Misc/Enums: Added more spell custom errors (cast result 172) from 4.2.2 2011-11-26 20:53:38 +01:00
kaelima 31533a342a Core/DB: Another typo in SaveToDB 2011-11-26 01:54:24 +01:00
kaelima a919265623 Core/DB: Fix character creation in Player::SaveToDB.
And some misc comments/whitespaces
2011-11-26 01:53:44 +01:00
kaelima aa215e5e80 Core/Misc: Fix compile and char creation
- Added very basic honor/conquest support, no idea if its works even a little since there's no possibility of testing yet
2011-11-26 01:46:41 +01:00
kaelima ec54bb4895 Core/Misc:
Clearing compile errors since UpdateFields were changed:
- Completely remove ammo (Cataclysm change)
- Revert some changes with power/maxpower and only store the 5 needed powers in db (the rest is useless)
- Remove GuildId from corpse
- Move PLAYER_GUILDID to character db (removed updatefield)

Note: Compile is still not working as we need to change currency handling
2011-11-25 18:54:59 +01:00
kaelima 9696d6ba7b Core/Mechanics:
- Add basic support for focus used by players (hunters)
- Drop all support for pet happieness (as it has been completely removed)
- Add new fields to characters db to store new power values
(Should now be able to create characters again)
2011-11-25 15:28:36 +01:00
kaelima cf0d5e4ec8 Core/Enum: Add missing race and powers from dbc 2011-11-25 13:33:11 +01:00
kaelima 23bd7bc0a3 Core/Object: Update UpdateFields to version 4.2.2 (14545) 2011-11-25 13:32:46 +01:00
Kaelima 316b461bd8 Merge pull request #4061 from Venugh/4.x
Fix some whitespaces in Datastore
2011-11-25 01:22:25 -08:00
kaelima 3ea366be0a Core/Protocols: Rename CMSG_WORLD_LOGIN to CMSG_LOAD_SCREEN and add simple structure (still unknown purpose). 2011-11-24 18:58:00 +01:00
kaelima b76b820e49 Core/Protocol: Fix struct of SMSG_AURA_UPDATE/SMSG_AURA_UPDATE_ALL 2011-11-24 18:22:04 +01:00
kaelima d171f41e01 Core/Protocol: Handle CMSG_CAST_SPELL. 2011-11-24 06:14:57 +01:00
kaelima 17e1f8a0d5 Core/SmartAI: Remove the requirement for only players to trigger SMART_ACTION_SOUND.
Closes #517
2011-11-13 06:40:14 +01:00
kaelima 163515341e Core/Spells: Fix Item - Hunter T9 4P Bonus 2011-11-13 05:00:26 +01:00
kaelima 9b7e9a1ee3 Core/Movement:
- Lower movement radius and speed when confused/disoriented.
- Force attackstop when confused or feared. Should fix issue with creatures "teleporting" after fear.

Close #2689
Close #466
Close #3743
2011-11-13 02:36:51 +01:00
kaelima 79903f31ce Core/Spells: Add own diminishing category for Dragon's Breath.
Will no longer share diminishing with Polymorph
Closes #3081
2011-11-13 00:51:33 +01:00
kaelima 8ba790ef35 Core/Creature: Prevent Spirit Guides (bg spirit healers) to be seen by alive players. 2011-11-07 18:18:59 +01:00
Kaelima c51f6e7fa0 Update sql/updates/world/2011_11_06_00_world_player_factionchange_items.sql 2011-11-07 17:39:32 +01:00
Kaelima d60dd92ea8 Merge pull request #3866 from Aokromes/master
Scripts/Misc: Capitalize lowercase directories
2011-11-07 05:34:24 -08:00
kaelima b5cb41b4ea Core/Player: Make chat tag (last byte in SMSG_MESSAGECHAT) a bitmask. 2011-11-07 07:16:31 +01:00
kaelima bfdceaf07e Core/SmartAI: Initialized player pointer before use
Should fix #3757
2011-10-31 13:35:06 +01:00
Kaelima e158a5e14e Core/Commands: Typo in d9406b0e59 Ty glkrlos 2011-10-31 09:17:45 +01:00
kaelima 3d4d147196 Core/SmartAI:
- Drop useless actions SMART_ACTION_ENTER_VEHICLE, SMART_ACTION_LEAVE_VEHICLE and SMART_ACTION_REMOVE_PASSENGERS.
(Vehicles are aura-driven, just remove or add the proper aura to achieve the same as these actions did)
- Fixed possible crash in SMART_ACTION_SEND_GOSSIP_MENU
- Areatriggers should not be triggered by dead players
2011-10-31 02:01:17 +01:00