Commit Graph
396 Commits
Author SHA1 Message Date
Shauren 4449434d62 Core/Items: Corrected armor calculations, thanks Flemzard
Closes #8530
2012-12-02 01:04:19 +01:00
Spp 1ecc55272e Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/AI/CoreAI/GameObjectAI.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Pet/Pet.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
2012-11-20 16:01:31 +01:00
Shauren 70d44f97dc Core/ObjectMgr: Fixed crash on shutdown
Closes #8362
2012-11-20 12:48:00 +01:00
Spp b5c9ab8802 Core/Misc: Reduction of header dependencies - Step II 2012-11-20 12:30:30 +01:00
Spp 7f061fc57f Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Player/Player.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/MailHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_northrend_beasts.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
2012-11-19 10:09:58 +01:00
Spp e60d26f36b Another crash fix after b99c347 2012-11-18 13:50:14 +01:00
Spp db4a69f773 Crash Fix after b99c347 2012-11-17 14:34:25 +01:00
Spp b99c347747 Core: Remove Player.h dependency from all the possible headers 2012-11-17 05:18:37 +01:00
Spp 49c250f3c5 Core: Removed passing of integer types by const reference where possible 2012-11-12 15:27:01 +01:00
Spp 9659f0335f Core/Guilds: Multiple changes
- Fix Delete Rank
- Fix Rank order after Rank is deleted
- Send correct event after Guild Tab purchase
- Better debug msgs
- Move news to Event Logs (internal struct is like Event Logs and Bank Event Logs). Max news configurable
2012-11-07 23:21:19 +01:00
Spp c97fc99e16 Merge branch 'master' into 4.3.4
Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Guilds/GuildMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
2012-10-30 10:30:05 +01:00
Spp 9fbc4c0ae2 Core/Misc: reduced amount of string memory allocations (Step II) 2012-10-24 15:34:48 +02:00
Spp 2e55abcde4 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
2012-10-19 14:24:11 +02:00
Spp d0334bf948 Core/Dungeon Finder: Some optimizations.
- Store teleport coordinates to avoid recalculations each time someone has to be teleported
- Correct teleport error msg when player is charming or using vehicle
- Internal changes in storage types
- Proper code for missing achievement lock type
- Better debug msgs
- Trying to get rid of "Player*" and "Group*" inside LFGMgr as much as possible (Step 1)
2012-10-18 09:15:10 +02:00
Spp 14dab1f893 Fix compile without pch 2012-10-16 09:35:15 +02:00
Naios 61dce1a02e Core/PhaseMgr: Implemented Phase Definitions, Terrainswap and multiphasing
* fixes cataclysm aura effect SPELL_AURA_PHASE without phasemasks defined in miscValueA
* implements CONDITION_SOURCE_TYPE_PHASE_DEFINITION

Thanks to:
 - Cyberbrest: For the hard research work about multiphasing.
 - Venugh: He helped me with a lot of strange compile Errors.
 - Shauren: For the 4.3.4 phaseshift packet.
 - Booksize: He showed me how terrainswap works

Signed-off-by: Naios <naios-dev@live.de>
2012-10-15 20:31:41 +02:00
Subv c757f811f2 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/Commands/cs_modify.cpp
2012-10-15 11:15:25 -05:00
tibbi 4a332082f9 renaming GetBaseReputation used for offline players 2012-10-12 13:47:57 +01:00
Subv a8fa67c53c Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
2012-10-10 10:29:18 -05:00
tibbi 5896da6689 some optimization + adding level to CharacterNameData 2012-10-08 17:21:09 +01:00
Nay 44c2edee51 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Spells/SpellMgr.cpp
2012-10-07 14:57:18 +01:00
tibbi d49c2a5e4d correct reputation converting at faction change 2012-10-07 13:55:04 +01:00
kaelima 8c013955ac Core/Misc: Fix some possible issues detected by static code analysis 2012-10-07 01:31:43 +02:00
Spp f570383fba Merge branch 'master' into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
2012-10-04 13:33:04 +02:00
Spp f8846cdeaf Core/Utilities: Do not expose internal store structure in Tokens and rename it to Tokenizer 2012-10-02 11:54:41 +02:00
Nay 94c8c7ec4e Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
2012-09-30 15:46:00 +01:00
tibbi 404a036fa9 adding Title converter to faction converter, original author Silinoron 2012-09-27 22:38:19 +01:00
Faq 90cb5f29ee Core/misc: forgotten Unk0. thnx Elron103 for noticing 2012-09-14 09:43:26 +03:00
Nay 528b9d4f7d Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/Entities/Item/ItemPrototype.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/shared/Packets/ByteBuffer.h
2012-09-13 17:24:37 +01:00
kaelima f746c2d975 Core/ItemTemplate:
Rename unk0 column.
Weapons have special sounds on impact. This column is used to override these sounds by specifying another subclass. For example an item with misc subclass can sound like a stave on impact by overriding the subclass here.
2012-09-13 11:38:50 +02:00
Tuxity 045682006a Core/Stats:
- Defense skill doesn't exist since 4.0.X
- Weapon skill doesn't increase during player's level anymore, it's set to the max value for level on each levelup.
2012-09-11 23:14:41 +02:00
Nay 68e0ef8039 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.h
	src/server/game/Instances/InstanceScript.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/OutdoorPvP/OutdoorPvP.h
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellInfo.h
2012-09-11 01:11:14 +01:00
Spp 358c6a26d6 Core: Warning fixes (Also some -pedantic under game folder) 2012-09-10 13:04:31 +02:00
Nay 7c4e7a9ebc Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
2012-09-09 02:18:58 +01:00
Kiddie 9a962f86c9 Core\Characters: Consecutive letters validation for CheckPlayerName
Closes #7694
2012-09-08 17:29:27 +01:00
Nay 5ab5cbcd2c Core/Loading: Fix a typo when loading creature_template 2012-08-31 17:48:05 +01:00
Nay d61f3131fb Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
	src/server/scripts/Kalimdor/silithus.cpp
	src/server/shared/DataStores/DBCFileLoader.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/wdtfile.cpp
2012-08-30 23:06:19 +01:00
Nay e3d9768a50 Core: Fix many "errors"/warnings and coding style (3)
Game

Errors were found using Cppcheck, open-source static analysis tool
2012-08-30 22:44:33 +01:00
kaelima bdfae83898 Core/Creature: Added DB support for UNIT_FIELD_FLAGS_2. Thanks cyberbrest
- Added more flags to UnitFlags2 enum (Thanks wpp)
2012-08-30 04:52:56 +02:00
Nay 6c14a51fe4 Core/Quests: Split Flags and SpecialFlags 2012-08-18 21:08:21 +01:00
Nay 4e46f7ced6 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/worldserver/worldserver.conf.dist
2012-08-18 17:13:46 +01:00
Nay aa5949ff1a Core/Loading: Do not validate fields QuestGiverPortrait nor QuestTurnInPortrait
These fields do not have to exist server-side
2012-08-18 15:18:57 +01:00
Spp 8da0bbdbb3 Core: Fix compile (Thanks to Sovak for reporting). Remove many warnings and Fix possible out of bounds access to Void storage 2012-08-17 10:25:29 +02:00
Nay 69c74bb3c5 Core/Logging: Change a few more logging messages to LOG_FILTER_SERVER_LOADING
consistency!
2012-08-16 21:37:46 +01:00
Nay 21fb427ffc Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/worldserver/worldserver.conf.dist
2012-08-16 20:17:29 +01:00
Shauren 69469d5295 Core/Items: Fixed disenchanting 2012-08-16 16:36:23 +02:00
Spp a566e3e58b Core/Logging: Move more log messages to LOG_FILTER_SERVER_LOADING 2012-08-16 11:02:46 +02:00
Nay b651b352ed Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/worldserver/worldserver.conf.dist
2012-08-16 00:36:50 +01:00
Spp 8a1e7dd070 Core/Loading: Re-enable Server loading log 2012-08-16 00:23:44 +02:00
Nay ca879e96b0 Core/Loading: Fix a field type when loading reputation_spillover_template
Also whitespace cleanup
2012-08-15 21:22:29 +01:00