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
2251d1bfae
Core/Misc: Set mode 0644 for files
2012-11-27 13:03:12 +01:00
click
8ef48ecc99
Core/Buildsystem: Clean up compileflags when compiling with warnings fully enabled.
...
-Wwrite-strings is default enabled when -Wall is set in clang/gcc, hence removed.
-Woverloaded-virtual is now enabled for C++-code only, this removes the useless warnings when dabbling with C-only code.
2012-11-27 00:43:38 +01:00
cyberbrest
f205bc9b4f
Core/Currency: Add support of Conquest points cap for arena and bg
...
Remove obselete code for arena points distribution
Thanks to @Zakamurite
2012-11-21 18:25:23 +01:00
Shocker
792e636a32
Core/Config: Implement CONFIG_MAX_JUSTICE_POINTS and CONFIG_START_JUSTICE_POINTS options
2012-11-14 23:41:32 +02: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
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
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
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
1925027aec
Core/Logging: Add new log type for SOAP.
...
Closes #8201
2012-10-28 13:03:50 +01:00
Spp
60d4343d8e
Merge branch 'master' into 4.3.4
...
Conflicts:
src/server/game/Spells/Spell.cpp
src/server/shared/Logging/Appender.h
2012-10-23 14:16:05 +02:00
Spp
1be638e731
Core/Dungeon Finder: Add debugging commands
2012-10-23 11:44:02 +02:00
Spp
1e50a08604
Core/Logging: Fix PlayerDump logging
2012-10-22 10:37:39 +02:00
Nay
6568b0624d
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Achievements/AchievementMgr.cpp
src/server/game/Entities/Object/Updates/UpdateFields.h
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Spells/spell_druid.cpp
2012-09-17 23:49:13 +01:00
Subv
4f21324762
Merge pull request #7793 from Elron103/pull-requests
...
Core/Calendar: Add TwoSide Interaction configuration option for Calendar...
2012-09-16 17:31:13 -07:00
hexa-
6df92dad61
Core/Calendar: Add TwoSide Interaction configuration option for Calendar Invites
2012-09-17 02:13:36 +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
Shauren
6ca7a7b78d
Core/Guilds: Implemented basic guild leveling (no player statistics/reputation)
2012-09-07 14:39:19 +02:00
Nay
cc28161670
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Unit/Unit.cpp
src/server/scripts/Commands/cs_reload.cpp
2012-09-05 20:09:48 +01:00
Vincent-Michael
0f21634eab
Config: Cosmetic changes
2012-09-05 16:01:05 +02:00
Nay
2e1de60593
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Entities/Player/Player.cpp
src/server/scripts/Commands/cs_misc.cpp
src/server/worldserver/worldserver.conf.dist
2012-09-01 22:19:13 +01:00
Spp
a7dd289b04
Core/Config: Change default log level of "Chat Log" to fit old log system
2012-09-01 22:13:12 +02:00
Spp
b127610510
Config: Cosmetic changes to fit config guidelines
2012-09-01 21:24:09 +02: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
5f1977cb1d
Core: Fix many "errors"/warnings and coding style (1)
...
Extractors, worldserver, authserver, shared and collision affected
Errors were found using Cppcheck, open-source static analysis tool
2012-08-30 19:07:59 +01:00
Nay
872c239dbe
Merge remote-tracking branch 'origin/master' into 4.3.4
2012-08-29 22:29:06 +01:00
Nay
b89b8ff277
Core/Loading: Change info/error messages to printf when config is not loaded
2012-08-29 20:02:55 +01:00
Nay
e09591b8a7
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
2012-08-27 22:43:07 +01:00
Nay
9a11dc5ea6
Config/worldserver: Rename references to the old realmd database to auth
2012-08-27 20:42:56 +01:00
Shauren
07e645d024
Core/Guilds: Save guild achievements to database periodically and when a member logs out.
2012-08-25 15:36:45 +02:00
Nay
e3ea3b28bd
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/game/Groups/Group.cpp
src/server/game/Handlers/BattleGroundHandler.cpp
src/server/game/Handlers/MailHandler.cpp
src/server/game/Handlers/MiscHandler.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/worldserver/worldserver.conf.dist
2012-08-21 23:40:38 +01:00
Spp
13ba61ab69
Core/Logging: Disable all LOG_FILTER_OPCODES related messages by default
2012-08-21 23:13:05 +02:00
Spp
984493108b
Core/Logging: Fix incorrect error level for some warden messages
...
Core/Logging: Fix incorrect filter type for many network messages
Core/Logging: Use OPCODE filter type for network messages related to wrong packets
2012-08-21 22:12:55 +02:00
Vincent-Michael
9f8ea0da1e
Core/Battlefield:
...
* Update Logs filter
* Fix typo in worldserver config (thx filo)
* Fix some code style
2012-08-21 19:40:21 +02:00
Shauren
7dc26c7ff7
Core/Misc: Warning fixes
2012-08-21 18:20:42 +02:00
Vincent-Michael
d22c82332b
Core/Misc:
...
* Add missing script loader for bf commandscript (thx Geodar)
* Add missing Wintergrasp worldserver config
2012-08-21 16:56:01 +02: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
Spp
13aa00d5f2
Core/Logging: Restore dumping packets in binary format
2012-08-17 10:36:48 +02:00
Spp
77b7933ed3
Core/Logging: Restore proper Log Filter to some arena messages
2012-08-17 10:31:09 +02: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
Spp
a566e3e58b
Core/Logging: Move more log messages to LOG_FILTER_SERVER_LOADING
2012-08-16 11:02:46 +02:00
Spp
50a271b81f
Core/Logging: Remove recently added "outOpCode" with outInfo(LOG_FILTER_OPCODE... (There is no need to create new function)
...
Also, set config options to behave like old log system by default
2012-08-16 01:26:47 +02:00
Spp
3c42401d66
Core/Logging: Set config options to behave like old log system.
2012-08-16 00:56:58 +02: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
Nay
9fcaeda097
Merge remote-tracking branch 'origin/master' into 4.3.4
...
Conflicts:
src/server/shared/Logging/Appender.h
src/server/worldserver/worldserver.conf.dist
2012-08-15 21:14:21 +01:00