Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 17:54:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,037 Commits 4 Branches 146 Tags
59a828b49ed1e07bd5d705e3d3aa1a6d110be8fc
Commit Graph

4641 Commits

Author SHA1 Message Date
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
Subv
e475b50f58 Core/Conditions: Fixed a mistake in Conditions loading which didn't allow to use SAI conditions with negative source entry (guid) 2012-10-21 15:33:31 -05:00
durotar
998c74ebe0 Core/Script: Gnomeregan - Deleting duplicate texts and adjusted the script 2012-10-20 11:44:43 -05:00
Subv
1252e167e5 Core/SQL: Corrected a mistake from previous merge. 
Author: @Gacko
 2012-10-20 10:41:16 -05:00
Gacko
0b7a842b61 Core/DB: Quest 'Gordunni Cobalt' 
SpellScript and conditions for spells of this quest.
 2012-10-20 15:01:04 +02:00
kaelima
2f4d7fc8e8 DB: Update period timer for icecrown ship transports 2012-10-20 03:42:15 +02:00
Subv
38ca1531d8 Core/SQL: Renamed SQL from previous pull request merge. 2012-10-19 17:37:20 -05:00
Subv
5362fc54f5 Merge pull request #8107 from durotar/master 
Core/Script: Update creature_text for Gnomeregan
 2012-10-19 15:34:45 -07:00
Spp
36806bf5b3 Move LFG string out of Custom patch range 2012-10-19 17:36:24 +02:00
Spp
2e55abcde4 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.h
 2012-10-19 14:24:11 +02:00
Spp
479d34d2a0 Core/Dungeon Finder: Minor optimizations 
- Internal changes in store types
- Remove of (Player *) and (Group *) From LFGMgr.cpp (step 2)
 2012-10-18 14:31:28 +02:00
Subv
705873091b Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/TicketHandler.cpp
	src/server/game/Tickets/TicketMgr.cpp
	src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/boss_halion.cpp
 2012-10-16 21:55:01 -05:00
Subv
27f091806a Core/SpellAreas: Changed the way quest_start and quest_end works. 
They now follow this rule:
The player's quest status of quest_start must have the mask defined in quest_start_status in order for the spell to be applied/kept.
The player's quest status of quest_end must _NOT_ have the mask defined in quest_end_status in order for the spell to be removed
To generate the mask:
Take the QuestStatus enum in QuestDef.h, use (1 << theValueYouWant) to obtain a mask and you can use | to combine masks.
This expands the usage of the spell_area table, making possible to give a player an aura while he has a quest, but remove it as soon as the quest is completed (not rewarded).
Feature request by @Svannon
 2012-10-16 21:44:28 -05:00
kaelima
6abc6253a6 DB: Add gm_tickets changes to base character db 2012-10-17 02:56:07 +02:00
durotar
eae10134de Missing sql for previous commit 2012-10-16 19:41:36 -05:00
kaelima
98588aa192 Core/Ticket: 
- Fully parse CMSG_GMTICKET_CREATE, use GmTicket::GetChatLog() to access the reporters chat log from this session (unused atm, possible useful to detect chat harassment)
- Simplify SMSG_GMTICKET_GETTICKET and fix "category" field (renamed it same as in blizz LUA files)
- Store response in DB
 2012-10-17 00:53:55 +02:00
Subv
fc796fb879 Scripts/Spells: Deleted a deprecated SpellScript (Astral Shift) 2012-10-15 18:01:16 -05:00
Subv
fe55f735c1 Scripts/Spells: Updated some more spells to 4.3.4 2012-10-15 14:27:56 -05:00
Subv
e10c4afc35 SQL: Renamed SQL from previous merge. 2012-10-15 13:46:42 -05:00
Naios
61dce1a02e Core/PhaseMgr: Implemented Phase Definitions, Terrainswap and multiphasing 
* fixes cataclysm aura effect SPELL_AURA_PHASE without phasemasks defined in miscValueA
* implements CONDITION_SOURCE_TYPE_PHASE_DEFINITION

Thanks to:
 - Cyberbrest: For the hard research work about multiphasing.
 - Venugh: He helped me with a lot of strange compile Errors.
 - Shauren: For the 4.3.4 phaseshift packet.
 - Booksize: He showed me how terrainswap works

Signed-off-by: Naios <naios-dev@live.de>
 2012-10-15 20:31:41 +02:00
Subv
c757f811f2 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_modify.cpp
 2012-10-15 11:15:25 -05:00
Gacko
887509b1de Core/DB: Quest 'Distortions in time' 2012-10-14 19:18:41 +02:00
Gacko
59557091a6 Core/DB: Quest 'Distortions in time' 2012-10-14 17:24:59 +02:00
Warpten
e3d8c666bd Scripts/Ruby Sanctum: 
* Fixed Halion's health pool in the Twilight Realm.
* Updated missing expansion fields for Saviana Ragefire, General Zarithrian.
* Have Halion bind players to instance on any other mode than 10NM.
* Link template entries depending on difficulties.

Closes #8017.
Closes #8024.
 2012-10-12 23:04:56 +02:00
Kandera
923cad31f3 Wintergrasp: move keep banner spawns to db. fix invisible stalker position. 2012-10-11 11:33:22 -04:00
Subv
a8fa67c53c Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
 2012-10-10 10:29:18 -05:00
Subv
af00564184 SQL: Renamed SQL from previous pull request. 2012-10-10 09:15:34 -05:00
Subv
6b5aa93dda Merge pull request #8035 from Retriman/BG 
DB:
 2012-10-10 07:08:51 -07:00
Retriman
028b6e778c DB: Remove all bgs from e1bee86ee6 2012-10-10 11:06:15 -04:00
Subv
93189bacc5 SQL/StackRules: Added one more stack rule. 
Totem of Wrath and Heart of the Crusader should not stack.
 2012-10-09 12:04:04 -05:00
Subv
5eccf9f4da SQL/StackRules: Added one more stack rule. 
Blood Frenzy (Warrior) and Savage Combat should not stack.
ref #7667
 2012-10-09 11:22:46 -05:00
Subv
cce014a2ba SQL/StackRules: Added a stack rule for some spells. 
Improved Scorch, Improved Shadow Bolt and Winter's Chill should not stack
ref #7667
 2012-10-09 11:01:51 -05:00
tibbi
c0e0f1d89b allow glyph1 be null like other glyph slots 2012-10-09 16:58:29 +01:00
Subv
c6f4f0287a Merge pull request #7999 from tibbi/Cinderglacier 
Make Rune of Cinderglacier not proc off dots
 2012-10-07 17:57:58 -07:00
zxbiohazardzx
608ed2cf1d DB/Loot: increase dropchance for Plump Buzzard Wing 
Closes #7989
 2012-10-07 17:43:13 +02:00
Nay
44c2edee51 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Spells/SpellMgr.cpp
 2012-10-07 14:57:18 +01:00
tibbi
ef4f89b405 Make Rune of Cinderglacier not proc off dots 2012-10-07 13:44:30 +01:00
w1sht0l1v3
1a89de87c1 Fixup a guid issue in 2012_10_06_04_world_misc_spawns.sql 2012-10-07 15:01:16 +03:00
kaelima
5273949315 Fixed compile and renamed one sql files 2012-10-07 00:08:04 +02:00
Kaelima
6b56acaa28 Merge pull request #7913 from Warpten/theRubySanctum 
Scripts/Ruby Sanctum: Halion, the Twilight Destroyer.
 2012-10-06 14:27:59 -07:00
Warpten
c971447855 Scripts/Ruby Sanctum: Halion, the Twilight Destroyer. 2012-10-06 22:47:52 +02:00
Nay
e369742dc7 SQL: Rename SQLs from 65c6b89d01 2012-10-06 16:44:35 +01:00
Nay
65c6b89d01 Merge pull request #7970 from Retriman/DungeonsSII 
Core/Script: Dungeon Ahnkahet Boss Elder Nadox.
 2012-10-06 08:42:32 -07:00