Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
18,120 Commits 2 Branches 1 Tag
16d9d1e56db68c40eec023d55e7c61874cdb7bc7
Commit Graph
23 Commits
Author SHA1 Message Date
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 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 013fb1f4d9 Core/Misc: reduced amount of string memory allocations (Step I) 2012-10-24 15:34:48 +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 8c5f011e79 Core/Achievements: Force all calls to AchievementMgr be done through Player functions (Remove GetAchievementMgr) 
Note: No real use in 3.3.5 but will be used in 4.3.4
 2012-09-18 14:29:53 +02:00
Nay b075d8cca7 Core/Loot: Re-fix structure of SMSG_LOOT_MONEY_NOTIFY 2012-09-11 01:40:58 +01:00
Nay f236db6b26 Fix build, thanks Vincent 2012-09-11 01:31:55 +01:00
Nay 6a1f4f1da0 Resolve merge issues and cleanup whitespace 2012-09-11 01:19:11 +01:00
Subv dd9d7e6870 Core/Spells: Fixed SPELL_AURA_DEPOSIT_BONUS_MONEY_IN_GUILD_BANK_ON_LOOT 2012-09-10 18:43:06 -05:00
Shauren 9c3c3cd9ec Core/Items: Updated InventoryResult enum 2012-08-20 15:54:55 +02:00
Subv 488fdadbed Core/PacketIO: Enabled more opcodes 2012-08-07 07:44:16 -05:00
Subv 1928964443 Core/Items: Implemented SOCKET_COLOR_COGWHEEL. 
Codestyle/Misc: Renamed recv_data to recvData
 2012-08-05 19:40:30 -05:00
Shauren a9d3940738 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-07-14 19:03:03 +02:00
Shauren 06a4ade88a Core/Achievements: Implemented guild achievements 2012-07-09 11:08:33 +02:00
Kandera 481e874811 Core/Loot: fix possible crash from having a bad item 2012-07-06 10:26:37 -04:00
Kandera 5395c4f6c6 Core/Loot: fix master looting quest items with the custom flag. 2012-07-06 10:23:27 -04:00
Kandera 869ea34987 Core/Loot: fix the way quest items are handled. so far ive only found 3 quest items that should be able to be masterlooted. added a new flag to item_template.flagsCustom to allow for making a quest item always follow loot rules. a bonus may be the fix of the handlelootmasteropcode crash! 2012-07-05 12:59:42 -04:00
kaelima 933fad5183 Core/Loot: Correct some values sent for roll packets 2012-06-05 13:14:15 +02:00
leak 2a5caef4a6 Revert "Core: more more cleanup" - Build test anyone? 
This reverts commit 20cd4c71ee.
 2012-03-14 18:51:51 +01:00
thomas33 20cd4c71ee Core: more more cleanup 2012-03-14 17:51:11 +01:00
Spp f495e0efe4 Warning fixes and some random cleanup here and there 2012-03-07 14:09:18 +01:00
Spp d38bc3a178 Core: Rename GetCreatureInfo to GetCreatureTemplate and minor cleanup here and there 2012-02-27 14:58:47 +01:00
Spp c9762b0e38 Core: Change Handlers location 2012-01-26 10:54:53 +01:00