Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-16 23:50:44 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,160 Commits 4 Branches 146 Tags
978fc4b7b9c8de757d41dca0c61f1bda5a4e4e6c
Commit Graph

4684 Commits

Author SHA1 Message Date
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
ba20aa809f Core/Battleground: Fix arena battlemaster gossip (reverts 028b6e7) 
Closes #8046
 2012-11-14 19:33:56 +01:00
ZxBiohazardZx
5951947753 DB/Misc: Various fixes from the Issue Tracker 
Closes #1959
Closes #2297
Closes #2399
Closes #3038
Closes #3131
Closes #3225
Closes #3351
Closes #3432
Closes #3548
 2012-11-14 10:32:44 +01:00
kaelima
c9801e83c6 Script/Emerald Dragons: Fixed a couple of issues with emerald dragon world bosses and some cleanup. 
Renamed one sql from yesterday
 2012-11-14 09:02:17 +01:00
Vincent-Michael
29e20d4c41 SQL: Rename SQL merged in PR 2012-11-14 00:21:37 +01:00
kaelima
3c3d4f4c99 Script/Commands: Reimplemented ".lookup map" command. 2012-11-13 15:56:15 +01:00
Malcrom
3e43bf5917 DB/Quest Relations: Fix Pilgrims Bounty quest during Hallows End for human commoners. 
Cloases #8227
 2012-11-13 11:06:37 -03:30
Malcrom
b5a696ca2a DB/GameEvent: Fix start time for Pilgrams Bounty. 
Closes #8261
 2012-11-13 10:48:03 -03:30
Malcrom
11d8ab260c Merge pull request #8197 from tibbi/factionchange_item 
add a missing item at player_factionchange_items
 2012-11-13 05:52:35 -08:00
Malcrom
267099d807 DB/Creature: Fix for Quest: Meet at the Grave 
Closes #5875
 2012-11-13 10:13:58 -03:30
Malcrom
ab8d99d573 DB/Misc: Various fixes for Grizzly Hills 
Cloase #8303
 2012-11-13 09:52:40 -03:30
Malcrom
e6c4ce1dda DB/Battleground: Add missing end of line. 2012-11-13 09:35:22 -03:30
Malcrom
b1eee7cf8e DB/waypoints: Fix last commit 2012-11-13 09:18:24 -03:30
Malcrom
310d188b9c DB/waypoints: Pathing for Ol' Sooty 
Closes #7917
 2012-11-13 09:15:41 -03:30
Vincent-Michael
8a889e37c1 Fix typos (thx joschiwald & Geodar) 2012-11-13 09:47:35 +01:00
Pitcrawler
027f7fc922 DB/Misc: Various improvements to Borean Tundra and others from Pitcrawler 
Closes #8271
Closes #8257
Closes #8256
Closes #8255
Closes #8252
Closes #8251
Closes #8250
 2012-11-12 22:38:59 +01:00
ZxBiohazardZx
b2efb060a3 Db/Misc: oneline fixes merged, thx Nelgano & Gecko32 for parts of it 
Closes #8021
Closes #8019
Closes #7361
Closes #7184
 2012-11-12 22:06:50 +01:00
ZxBiohazardZx
ebd2c12f99 DB/Quest: add questrequirements for Doomguard Minion Questline 
Closes #7124
 2012-11-12 21:30:38 +01:00
Tuxity
516c6d31ec Merge branch 'master' into 4.3.4 2012-11-11 18:53:01 +01:00
ZxBiohazardZx
7bdd596e6d DB/Gossip: Add gossip menus for Midsummer 
Closes #6886
 2012-11-11 12:50:03 +01:00
Malcrom
8b4b1cdbc2 DB/Gossip: Add gossip menus for Midsummer partial for issue #6886 2012-11-11 12:36:53 +01:00
Exodius
6264d91cd0 DB/Quest: fix a wrong text 
Closes #6403
 2012-11-11 12:31:48 +01:00
Pitcrawler
660f7e72be DB/SAI: Fix some Howling Fjord gossips 
Closes #4973
 2012-11-11 12:28:31 +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
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
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
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
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
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
tibbi
b484f5d17e adding another item 2012-10-28 19:37:27 +01:00
tibbi
fc17c2b41e add a missing item at player_factionchange_items 2012-10-27 23:52:52 +01:00
ZxBiohazardZx
57f84c920b DB/Conditions: slightly modify the conditions for Sealed Chest: it only drops IF: you dont have it already AND you are wielding Shadowmourne AND you are on The Lich Kings Last Stand AND if you did not do Personal Property quest yet 
Closes #8167
 2012-10-27 10:44:49 +02:00
Pitcrawler
d180478596 DB/Creatures: Correct movement for Dragonbone Condor, Carrion Condor and Courier Lanson 
Closes #8145,#8139,#8128
 2012-10-27 09:42:16 +02:00
w1sht0l1v3
14c0d7b421 Scripts/SAI: Fix an assert error. 
Closes #8106
 2012-10-26 22:27:16 +03:00
Subv
ebdbe869af Core/SQL: Changed codification of recent SQL file to ANSI 2012-10-25 10:54:22 -05:00
Subv
9084c89ea8 Core/SQL: Renamed file from previous merge. 
Corrected the guids.
 2012-10-25 10:11:56 -05:00
Subv
55892048ef Merge pull request #8127 from Gacko/childrens_week 
Core/DB: Children's Week
 2012-10-25 07:43:02 -07:00
w1sht0l1v3
0a840fcb21 SQL: Typo fixes. 2012-10-24 17:36:19 +03: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
Kaelima
1ff5b83657 Merge pull request #8074 from Warpten/halionUpdate 
Scripts/Ruby Sanctum: Misc fixes.
 2012-10-23 03:58:48 -07:00
Spp
1be638e731 Core/Dungeon Finder: Add debugging commands 2012-10-23 11:44:02 +02:00
Spp
c1fada456b Core/Dungeon Finder: Correct rolechecks (4e8fa52) 
- Fix bad sql (36806bf)
- Add better teleport debug messages
 2012-10-23 09:48:08 +02:00
Warpten
a664a356e2 Scripts/Ruby Sanctum: 
* Fixed a crash caused by the grid.
* Update spawnmasks.
* Misc updates and corrections.

Closes #8079.
Closes #8078.
Closes #8081.
Closes #8077.
 2012-10-22 21:18:21 +02:00
Subv
1fc3aad9d7 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCfmt.h
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/scripts/Kalimdor/feralas.cpp
 2012-10-21 17:18:35 -05:00
Subv
4fd9f8693b Core/SQL: Renamed SQL from previous merge. 2012-10-21 17:13:18 -05:00
Subv
82c251dc3d Merge pull request #8088 from Gacko/q13038 
Core/DB: Quest 'Distortions in time'
Closes #3011
 2012-10-21 15:11:50 -07:00