Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,102 Commits 4 Branches 146 Tags
08f6d3e9754da025f0cd3ed93cb5906d5dcb70dd
Commit Graph

18102 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
kaelima
08f6d3e975 Merge git://github.com/TrinityCore/TrinityCore into 4.3.4 2012-11-10 04:39:46 +01:00
Shocker
44729aa69f Core/Achievements: Sepparate ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_ITEM_QUALITY_MIN and ACHIEVEMENT_CRITERIA_ADDITIONAL_CONDITION_ITEM_QUALITY_EQUALS 2012-11-10 05:18:55 +02:00
Tuxity
2d0dddfcbe Core/Build: Update the G3DLite extra patch to compile under OS X with Clang 2012-11-09 16:56:10 +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
w1sht0l1v3
704a563fcd DB: Quest The Last Line Of Defense: 
Add missing spawns for Argent Cannons,their supports and template updates.

Notes: both cannon spells need targeting scripting.This is needed before adding the rest of the missing spawns.
 2012-11-07 21:55:28 +02: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
Subv
4e22731467 Merge pull request #8258 from ille/pointercheck 
Core/Scripts: tweak code in pyrewood_ambushAI::SummonCreatureWithRandomT...
 2012-11-05 10:10:33 -08:00
ille
dd2e02f157 Core/Scripts: tweak code in pyrewood_ambushAI::SummonCreatureWithRandomTarget() 2012-11-05 12:44:45 +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
Kaelima
c5fdb02305 Merge pull request #8246 from ille/fishing 
fishing: set respawntime to now when cant loot, for correct despawn of b...
 2012-11-04 05:47:29 -08:00
Kaelima
6b2fd2c261 Merge pull request #8245 from ille/randomtypos02 
fix random typos (f.i. blocked activation autocast petspells from spellb...
 2012-11-04 05:46:07 -08:00
Kaelima
69aa94f8ee Merge pull request #8249 from MrSmite/Pet_Facing 
Pets should face same direction as owner after follow.
 2012-11-04 05:45:08 -08:00
MrSmite
69377bc1d2 Pets should face same direction as owner after follow. 
Fixes #8248
 2012-11-04 04:32:25 -05:00
Shocker
c6ce7bc9fd Core/Misc: Define CR_MASTERY combat rating 2012-11-03 21:27:00 +02:00
ille
573cd7dde2 fix random typos (f.i. blocked activation autocast petspells from spellbook) 2012-11-03 16:01:46 +01:00
ille
2450f4ea56 fishing: set respawntime to now when cant loot, for correct despawn of bobber 
removegameobject from player instead cancel spell, for correct remove of fishing aura
 2012-11-03 15:31:14 +01:00
click
e587d8c1af Core. Fix non-PCH building (again)... 2012-11-03 15:04:30 +01:00
ZxBiohazardZx
a5a9503bbe DB/Loot: readd loot to stinky from clean 49 (removed by accident) 
Closes #8222
 2012-11-03 10:09:41 +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
kaelima
3ee840a9be Core/Spline: Change recently added error output to print DB GUID for creatures 2012-11-02 20:33:59 +01:00
kaelima
cedf0855e8 Core/Handlers: Fixed CharFactionOrRaceChange for goblins/worgens after merge 2012-11-02 00:18:44 +01:00
kaelima
b28499ac77 Core/Protocol: Enabled a couple of (confirmed) opcodes. 
Removed SMSG_SETUP_RESEARCH_HISTORY, as it is redundant to SMSG_RESEARCH_SETUP_HISTORY.
 2012-11-02 00:17:59 +01:00
leak
6bf9cb56a9 Core/Chat: Prevent client crashes with invalid chat language and message type combinations 
Fixes #8083
 2012-11-01 20:04:35 +01:00
Kaelima
76bdeb5c44 Merge pull request #8230 from krofna/dead_code 
Remove some dead code
 2012-10-31 15:52:15 -07:00
Mislav Blazevic
4af0809155 Prevent warnings 2012-10-31 22:26:40 +01:00
Mislav Blazevic
ecf2fa0514 Remove some dead code 2012-10-31 18:41:15 +01:00
Shocker
c94e11e514 Fix build 2012-10-31 18:41:25 +02:00
Shocker
cd55d64364 Core/Spline: Improve error output for SpineInitArgs check 
by Schmoozerd
 2012-10-31 18:39:05 +02:00
kaelima
9d81c763fe Core/Player: Fix crash in Player::CanUseBattlegroundObject when called from certain spells 2012-10-30 22:30:24 +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
ZxBiohazardZx
cd8e9dfb52 DB/Conditions: update ItemEquipped Condition2/3 values to 0 2012-10-29 23:41:10 +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
Shocker
59a828b49e Core/Arena: Fix arena team existing name checking on team create 2012-10-29 00:37:08 +02:00
Shocker
b2cb0d62ba Core/Misc: Improve structure for SMSG_RAID_INSTANCE_INFO 2012-10-28 21:17:10 +02:00
Spp
1925027aec Core/Logging: Add new log type for SOAP. 
Closes #8201
 2012-10-28 13:03:50 +01:00
Shocker
02c182a1ce Core/Spells: Remove unneeded hack for Focus Magic proc 2012-10-28 04:19:37 +02:00
Shocker
eed7c46f4e Core/Spells: Remove hack for Glyph of Barkskin 2012-10-28 00:38:11 +03:00
Shocker
08868574c7 Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4 2012-10-28 00:37:34 +03:00