Spp
d5faec2c0e
Core/Account: Move AccountMgr back to singleton
2013-01-17 14:58:15 +01:00
Spp
7d6634e363
Fix merge problem
2013-01-17 08:48:04 +01:00
Spp
0e8011657d
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
2013-01-16 15:29:41 +01:00
Spp
927062f61f
Core/Misc: Some changes to reduce differences with 4.3.4 branch + some cosmetic changes
2013-01-16 11:17:14 +01:00
Spp
526bdc0764
Core/Logging: Add config option to enable/disable asyncronous logging (disabled by default)
2013-01-16 09:52:49 +01:00
Spp
be3826825e
Core/Logging: Use correct realmId when logging to DB
2013-01-16 08:59:56 +01:00
Spp
0d5cb6af75
Core/Misc: Apply codestyle to multiple files (II)
2013-01-14 11:12:58 +01:00
Spp
d75222feca
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Battlegrounds/Battleground.cpp
src/server/game/Battlegrounds/BattlegroundMgr.cpp
src/server/game/Battlegrounds/BattlegroundMgr.h
src/server/game/Battlegrounds/BattlegroundQueue.cpp
src/server/game/DataStores/DBCfmt.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/BattlefieldHandler.cpp
src/server/game/Handlers/GuildHandler.cpp
src/server/game/Movement/Spline/MoveSplineInit.cpp
src/server/game/Movement/Spline/MovementPacketBuilder.cpp
src/server/game/Movement/Spline/MovementUtil.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Spells/Auras/SpellAuras.cpp
src/server/game/Spells/Spell.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_venoxis.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/Kalimdor/zone_feralas.cpp
src/server/scripts/Spells/spell_druid.cpp
src/server/scripts/Spells/spell_mage.cpp
src/server/scripts/Spells/spell_paladin.cpp
src/server/scripts/Spells/spell_rogue.cpp
src/server/scripts/Spells/spell_shaman.cpp
src/server/scripts/Spells/spell_warlock.cpp
src/server/scripts/Spells/spell_warrior.cpp
src/server/shared/Packets/ByteBuffer.h
2013-01-14 11:04:03 +01:00
Spp
7540cfedfc
Core/Misc: Minor cosmetic change to avoid some merge conflicts
2013-01-14 10:02:06 +01:00
Spp
802657250c
Core/Misc: Apply codestyle to multiple files
2013-01-14 09:50:59 +01:00
Spp
4c247f5d2d
Core/Dungeon finder: Fix teleport out after dungeon is finished
...
Closes 8914
2013-01-13 16:22:41 +01:00
Spp
25d35bacf9
Fix incorrect sql name
2013-01-09 16:39:57 +01:00
Spp
677ed18080
Core/Dungeon Finder: Fix group (5) unable to do new dungeon after finished last dungeon
...
- Some optimizations here and there
- Drop unused columns related to dungeon rewards
- Simplify Group reward. All people inside the dungeon should get the reward, no matter how far it's from the boss
2013-01-09 15:15:42 +01:00
Spp
d35d33aa86
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/Entities/Object/ObjectDefines.h
src/server/scripts/EasternKingdoms/CMakeLists.txt
src/server/scripts/Kalimdor/CMakeLists.txt
2013-01-03 09:17:53 +01:00
Spp
27b1e457e6
Core/Misc: More corrections to guid handling change ( 2292025)
2013-01-03 08:06:53 +01:00
Spp
786f27b74c
Core/Misc: Missing changes from 8968dbc (Partial revert of 2292025)
...
Closes #8843
2013-01-02 21:23:54 +01:00
Spp
8968dbc5a9
Core/Misc: Partial revert of 2292025 (Core/Misc: Replaced some macro definitions with inline functions)
...
- That code is 4.3.4 and wasn't supposed to be pushed to master
2013-01-02 15:20:38 +01:00
Spp
601fcc5612
Core/Misc: Removed odd code from CreatureAIImpl.h, it does not belong here
...
- Also some minor corrections from previous commit
2013-01-02 14:20:20 +01:00
Spp
6b668c8337
Core/Misc: Update headers to 2013
2013-01-02 13:31:19 +01:00
Spp
aed36a8375
Merge branch 'master' into 4.3.4
...
Conflicts:
dep/libmpq/CMakeLists.txt
src/server/game/AI/EventAI/CreatureEventAI.cpp
src/server/game/AI/EventAI/CreatureEventAI.h
src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
src/server/game/AI/EventAI/CreatureEventAIMgr.h
src/server/game/Entities/Creature/Creature.h
src/server/game/Entities/Item/ItemPrototype.h
src/server/game/Entities/Object/ObjectDefines.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/ReferAFriendHandler.cpp
src/server/game/Movement/Spline/MoveSplineInit.h
src/server/game/World/World.h
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
src/server/scripts/EasternKingdoms/boss_kruul.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
src/server/shared/Database/Implementation/WorldDatabase.cpp
2013-01-02 13:30:51 +01:00
Spp
ebd14b4f01
Core/Mysql: Multiple changes
...
- added support for setting NULL column values to MySQL wrapper in core
- replaced nonstandard strdup function and manual memory management with std::string
- fixed bug in MySQLPreparedStatement::getQueryString method, it failed when string parameter contained embedded '?' symbols
- fixed memory leak in MySQLPreparedStatement::setString method
2013-01-02 12:22:50 +01:00
Spp
5280a77fe1
Core/Misc: Some minor changes here and there
2013-01-02 11:00:16 +01:00
Spp
d36c4a91ba
Core/Misc: Use equal_range instead of lower_bound/upper_bound calls where possible.
2013-01-02 09:53:43 +01:00
Spp
2292025bf9
Core/Misc: Replaced some macro definitions with inline functions
2013-01-02 09:07:52 +01:00
Spp
c85dc26584
Core/Misc: EventMap will no longer inherit from std::map
2013-01-02 08:34:11 +01:00
Spp
80b1b6c494
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Globals/ObjectMgr.cpp
src/server/game/World/World.h
src/server/scripts/Kalimdor/moonglade.cpp
2012-12-19 08:23:34 +01:00
Spp
a227a34947
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/AI/CoreAI/PetAI.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/stormwind_city.cpp
2012-12-17 12:13:51 +01:00
Spp
fb2e5c3c58
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Quests/QuestDef.cpp
src/server/game/Quests/QuestDef.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/World/World.h
src/server/scripts/Kalimdor/azshara.cpp
src/server/scripts/Kalimdor/azuremyst_isle.cpp
src/server/scripts/Kalimdor/darkshore.cpp
src/server/scripts/Kalimdor/durotar.cpp
src/server/scripts/Kalimdor/dustwallow_marsh.cpp
src/server/scripts/Kalimdor/feralas.cpp
src/server/scripts/Kalimdor/moonglade.cpp
src/server/scripts/Kalimdor/silithus.cpp
src/server/scripts/Kalimdor/stonetalon_mountains.cpp
src/server/scripts/Kalimdor/tanaris.cpp
src/server/scripts/Kalimdor/the_barrens.cpp
src/server/scripts/Kalimdor/thousand_needles.cpp
src/server/scripts/Spells/spell_generic.cpp
2012-12-07 09:22:43 +01:00
Spp-
e150393c95
Core/SAI: Fix SMART_EVENT_PASSENGER_REMOVED event
2012-12-02 18:07:57 +01:00
Spp
d6aee08621
Core/Misc: Include character level in log when a character is being deleted
2012-11-30 13:59:01 +01:00
Spp
a7d8a65bd0
Core/Dungeon Finder: Partial revert of ad6b5fb419
2012-11-28 08:29:39 +01:00
Spp
aab59442a4
Fix merge error
2012-11-27 15:06:40 +01:00
Spp
404129963c
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Achievements/AchievementMgr.h
src/server/game/AuctionHouse/AuctionHouseMgr.cpp
src/server/game/AuctionHouse/AuctionHouseMgr.h
src/server/game/Battlegrounds/BattlegroundMgr.h
src/server/game/Chat/ChatLink.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/DataStores/DBCStructure.h
src/server/game/DataStores/DBCfmt.h
src/server/game/Entities/Corpse/Corpse.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Entities/Vehicle/Vehicle.cpp
src/server/game/Groups/Group.cpp
src/server/game/Groups/Group.h
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/ArenaTeamHandler.cpp
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattlefieldHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Miscellaneous/SharedDefines.h
src/server/game/Movement/Spline/MoveSpline.cpp
src/server/game/Movement/Spline/MoveSplineFlag.h
src/server/game/Movement/Spline/MovementUtil.cpp
src/server/game/Reputation/ReputationMgr.cpp
src/server/game/Spells/Auras/SpellAuraDefines.h
src/server/game/Spells/Auras/SpellAuraEffects.cpp
src/server/game/Spells/SpellInfo.cpp
src/server/scripts/Commands/cs_disable.cpp
src/server/scripts/EasternKingdoms/Karazhan/karazhan.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
src/server/scripts/EasternKingdoms/redridge_mountains.cpp
src/server/scripts/EasternKingdoms/stormwind_city.cpp
src/server/scripts/EasternKingdoms/tirisfal_glades.cpp
src/server/scripts/Kalimdor/boss_azuregos.cpp
src/server/scripts/Kalimdor/ungoro_crater.cpp
src/server/shared/Packets/ByteBuffer.h
src/tools/map_extractor/dbcfile.h
2012-11-27 14:15:12 +01:00
Spp
e954498560
Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch
2012-11-27 13:03:12 +01:00
Spp
2251d1bfae
Core/Misc: Set mode 0644 for files
2012-11-27 13:03:12 +01:00
Spp
99e050fb27
Core/Misc: Tab2spaces, remove trailing whitespaces and remove dupe code after merge
2012-11-27 11:56:23 +01:00
Spp
611ffbb189
Core/Units: make SetHover virtual
2012-11-27 07:45:08 +01:00
Spp
ad6b5fb419
Core/Dungeon Finder: Fix reward for last member of each group being disbanded to join new lfg group
...
- Move some messages to Trace
- Add some cases where internal data wasn't updated with new state
- Reverts 441712fbb and ae507e5 (Old State should only store those states you can Restore from a Rolecheck/Proposal)
Closes #8339
Closes #8420
Closes #8421
2012-11-26 20:20:47 +01:00
Spp
8ae0f2332c
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Battlefield/Zones/BattlefieldWG.cpp
src/server/game/Conditions/ConditionMgr.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Server/WorldSession.cpp
src/server/game/Server/WorldSocket.cpp
src/server/game/Spells/SpellEffects.cpp
src/server/scripts/EasternKingdoms/stormwind_city.cpp
src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp
src/server/scripts/Kalimdor/azshara.cpp
2012-11-26 08:43:29 +01:00
Spp
f09d8b3c71
Addition to last commit... "Fix logic error in 81606e5 (Fixes orange ooze in Professor putricide)"
2012-11-23 15:24:17 +01:00
Spp
86594d4b7a
Fix logic error in 81606e5 (Fixes orange ooze in Professor putricide)
...
Closes #8418
2012-11-23 15:13:00 +01:00
Spp
a79065b12e
Typo Fix :D
2012-11-23 12:54:44 +01:00
Spp
3dea2af399
Core/Achievements: Minor correction in Log msg
...
Closes #8396
2012-11-23 12:44:35 +01:00
Spp
0c4e8c8dc2
Core/Network: Enable trace loggers for packet send and receive (just account + opcodeName, opcodeId)
2012-11-23 12:36:18 +01:00
Spp
26006551e2
Fix wrong replacement in 32c259b1ce (Fixes a minor error msg)
2012-11-23 12:30:11 +01:00
Spp
b1ec4b61ac
Fix error in 32c259b1ce (broken chat)
2012-11-23 01:03:46 +01:00
Spp
3cf7eb23f9
Missing change from merge
2012-11-22 15:08:28 +01:00
Spp
b9b57c2d62
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Chat/ChatLink.cpp
src/server/game/Entities/Player/Player.cpp
src/server/game/Handlers/ChannelHandler.cpp
src/server/scripts/EasternKingdoms/hinterlands.cpp
2012-11-22 15:04:59 +01:00
Spp
32c259b1ce
Core/Channels: Remove unnecessary calls to FindPlayer wherever is possible
...
- Add better opcode debug messages
- Move isValidChatMessage debug messages to trace
2012-11-22 12:11:35 +01:00
Spp
d3c902915b
Core/Dungeon Finder: Properly update Lfg Status (shouldn't lose 'eye' when changing maps or reconnect after disconnection)
...
- Also fixes removing Player data when it shouldn't... should solve some problems with players not getting reward in some cases
2012-11-21 19:56:48 +01:00
Spp
1d7adbfc7f
Core/AI: Fix crash in SmartScript
...
Closes 8340
2012-11-21 12:36:00 +01:00
Spp
cd2b79f8d4
Fix compile under windows
2012-11-20 20:45:10 +01:00
Spp
08b7439f48
Typo Fix after 81606e5 (Thanks to vlad852 for noticing)
2012-11-20 19:02:58 +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
Spp
7bef4ce401
Core/Misc: Reduce header dependencies - Step III
2012-11-20 15:03:56 +01:00
Spp
b5c9ab8802
Core/Misc: Reduction of header dependencies - Step II
2012-11-20 12:30:30 +01:00
Spp
81606e5d1e
Core/Misc: Define some methods const
2012-11-20 09:29:52 +01:00
Spp
fff684ec78
Remove duplicate code after some old merge
2012-11-19 12:03:45 +01:00
Spp
bf8b642a47
Fix compile without PCH (Also added some minor changes to minimize differences with 4.3.4)
2012-11-19 12:02:33 +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
339d2b1257
Fix compile
2012-11-17 03:18:37 +01:00
Spp
279b7f4c10
Core/Misc: Minor changes here and there
2012-11-16 09:51:44 +01:00
Spp
306d4d3ab1
Core/Battleground: Send bracket levels in SMSG_BATTLEFIELD_LIST
2012-11-16 09:47:36 +01:00
Spp
978fc4b7b9
Fix compile
2012-11-16 09:09:27 +01:00
Spp
a0c8193ee7
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Handlers/BattleGroundHandler.cpp
2012-11-16 08:51:15 +01:00
Spp
f13e57d9ed
Core/Player: Added skill step 525
2012-11-16 08:33:38 +01:00
Spp
d10ba397b6
Core/Warden: Remove warning
2012-11-15 14:13:58 +01:00
Spp
58c60c70cc
Core: Move a couple of log messages to debug
2012-11-15 13:42:24 +01:00
Spp
01a745d279
Core/Battleground: Crash fix after ba20aa809f
2012-11-15 13:38:12 +01:00
Spp
ba20aa809f
Core/Battleground: Fix arena battlemaster gossip (reverts 028b6e7)
...
Closes #8046
2012-11-14 19:33:56 +01:00
Spp
49c250f3c5
Core: Removed passing of integer types by const reference where possible
2012-11-12 15:27:01 +01:00
Spp
16d9d1e56d
Core/Achievements: multiple changes
...
- Fix crash when updating criteria with no reference player
- Update progress counter to uint64
- Remove hack introduced for achievement 318 (conditions are already checked in additionalConditions)
- Add extra parameter miscValue3 (needed for type "LOOT_TYPE" with additionalConditions "ITEM_SUBCLASS")
- Correct definition for Additional conditions: 11 (HAS_AURA_TYPE), 17 (SOURCE_AREA_OR_ZONE), 18 (TARGET_AREA_OR_ZONE), 41 (TARGET_ZONE)
2012-11-12 14:25:51 +01:00
Spp
5c6af8d1f3
Core: Added some attribute definitions
2012-11-12 12:07:16 +01:00
Spp
a3a667460a
Core/Achievement: Do not expose AchivementCriteriaData to ScriptMgr
2012-11-12 10:37:27 +01:00
Spp
f53a04add0
Core/Scripts: Added Worgen and Goblin races to .pinfo command.
2012-11-12 10:31:56 +01:00
Spp
5fd7d01bde
Core/Build: Remove some more unneeded code for OS X from cmake files
...
Core: Minor changes here and there
2012-11-12 10:29:52 +01:00
Spp
6bd90626ea
Core/Build: Fix compile using mysqllite included with core
...
Closes #8283
2012-11-10 14:49:28 +01:00
Spp
a91d59f37c
Core/Build: Restore FindOpenSSL, even when it's provided by cmake, this file also provides newbie-check (warns if you trying to use wrong libs)
...
- Also, apply the hack needed to make g3dlite compile in OS X
2012-11-10 13:15:09 +01:00
Spp
a57254d769
Core/Build: Fix problem with acelite
2012-11-09 16:09:27 +01:00
Spp
c51380690f
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/DataStores/DBCEnums.h
src/server/game/Handlers/PetHandler.cpp
src/server/game/Server/WorldSession.h
2012-11-09 14:26:27 +01:00
Spp
333b8e5159
Core/Build: Enable Clang PCH support and OS X specific features
...
Core: Fix warnings here and there
2012-11-09 13:13:45 +01:00
Spp
ccf593c673
Fix merge conflic and typos in worldserver config file and characters.sql
2012-11-09 09:03:29 +01:00
Spp
90c95806a7
Core/Guilds: Use correct variable type when saving guild bank tab rigths to DB
2012-11-09 08:22:03 +01:00
Spp
35d63a9799
Merge branch 'master' into 4.3.4
...
Conflicts:
sql/base/characters_database.sql
src/server/game/Guilds/Guild.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/scripts/EasternKingdoms/silverpine_forest.cpp
2012-11-08 11:25:38 +01:00
Spp
fcc524d598
Core/Guilds: Send correct opcode when purchasing a new tab and fix data not being saved in db after purchasing the new tab
2012-11-08 11:13:46 +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
bde6b76b2d
Core/Guild: Fix transaction not being properly closed and improve error message when fixing missing bank tabs
2012-11-07 09:49:31 +01:00
Spp
7bd86b6b83
Update characters_database.sql (Missing changes from 58ec4e5319)
2012-11-07 09:49:31 +01:00
Spp
06eff94506
Merge branch 'master' into 4.3.4
...
Note: Will need extra Guild-Related commit to make it work again (Added some extra data beside the merge)
Conflicts:
src/server/game/Battlefield/BattlefieldHandler.cpp
src/server/game/Entities/Player/Player.h
src/server/game/Guilds/Guild.cpp
src/server/game/Guilds/Guild.h
src/server/game/Guilds/GuildMgr.cpp
src/server/game/Guilds/GuildMgr.h
src/server/game/Handlers/AuctionHouseHandler.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/GuildHandler.cpp
src/server/game/Handlers/ItemHandler.cpp
src/server/game/Handlers/LootHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MovementHandler.cpp
src/server/game/Handlers/NPCHandler.cpp
src/server/game/Handlers/PetHandler.cpp
src/server/game/Handlers/PetitionsHandler.cpp
src/server/game/Handlers/QueryHandler.cpp
src/server/game/Handlers/QuestHandler.cpp
src/server/game/Handlers/SkillHandler.cpp
src/server/game/Handlers/SpellHandler.cpp
src/server/game/Handlers/TaxiHandler.cpp
src/server/game/Handlers/VehicleHandler.cpp
src/server/game/Server/WorldSession.h
src/server/shared/Database/Implementation/CharacterDatabase.cpp
src/server/shared/Database/Implementation/CharacterDatabase.h
2012-11-04 20:17:37 +01:00
Spp
58ec4e5319
Core/Guild: Code Refactor
...
- Send correct events when modifiying Ranks (Add, modify, delete)
- Store money/slots withdraw, not remaining slots. This will update remaining slots/money properly.
- Reset daily slots/money withdraw for all members at same time, configurable
- Better debug messages
2012-11-02 22:26:10 +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
5ff16046b6
Core/Dungeon Finder: Remove lfg player data when a group is disbanded
...
Core/Dungeon Finder: Some codestyle changes
Note: Real change is in LFGMgr::RemoveGroupData, all other are cosmetic changes
2012-10-29 20:56:37 +01:00
Spp
9074c11a90
Core/Dungeon Finder: Update "Current group roles" according to people in queue.
...
Core/Dungeon Finder: Properly update internal lfg group structure at server load
2012-10-29 20:13:42 +01:00
Spp
14027262ee
Core/Dungeon Finder: Add some more debug msgs and restore LFG group structure at server load.
2012-10-29 13:58:48 +01:00
Spp
d2ba73d97f
Core/Misc: Proper fix for previous commit ( c5c8e38 - check race change before perfoming faction-change actions)
...
Core/Misc: tab to spaces and remove trailing whitespaces
2012-10-29 12:28:12 +01:00
Spp
c5c8e38789
Core/Misc: Check if race is changed before performing faction-change actions. (By tibbi)
2012-10-29 11:27:00 +01:00
Spp
1925027aec
Core/Logging: Add new log type for SOAP.
...
Closes #8201
2012-10-28 13:03:50 +01:00