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
29,235 Commits 4 Branches 146 Tags
df2c6972c46123eb62b1e81eeb37f6931e98f9f3
Commit Graph

998 Commits

Author SHA1 Message Date
Gustavo
49d4e22c6a Scripts/Pet Implemented Argent Squire/Gruntling and Argent Pony Bridle 2016-08-25 14:52:56 +02:00
SnapperRy
506b2a4f2a Event/Brewfest: implement relay race (#17603) 2016-08-23 13:54:57 +02:00
Gustavo
83de75e31b Improve scripts for quests Breakfast Of Champions and A Bear of an Appetite (#17780) 
Properly despawn the related GameObjects after use of the quest item, avoiding multiple use and summon
 2016-08-23 13:54:24 +02:00
Aokromes
58499f9488 another override 2016-08-05 02:42:30 +02:00
ariel-
30d4f70533 Core/Entities: debloat SummonGameObject parameter list using proper wrappers and enable GO rotation in scripts 
- There's still an overload allowing for x, y, z, o to be passed directly
- Fixed default animstate for GameObject creation in many places, it should be 255, not 100 (checked in sniffs)

(cherry picked from commit 62bfee37cb)

Conflicts:
	src/server/game/Entities/GameObject/GameObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Commands/cs_gobject.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
 2016-08-01 01:23:47 -03:00
Aokromes
ed8b9fe1c4 Scripts/Misc: Add missing override 2016-07-25 15:49:08 +02:00
Keader
6759266253 Core/Scripts: Hallow's End Pumpkin Treat 
Add all 6 spells available from item 20557,
Hallow's End Pumpkin Treat:
- Hallow's End Candy, Orange Giant (24924)
- Hallow's End Candy, Skeleton (24925)
- Hallow's End Candy, Pirate (24926)
- Hallow's End Candy, Ghost (24927)
- Hallow's End Candy, Female Defias Pirate (44742)
- Hallow's End Candy, Male Defias Pirate (44743)

Thanks @Keader for creating the new spell scripts & SQL,
 saved me a lot of time! :-)
 2016-07-20 19:35:07 +02:00
Gustavo
0d412494ef Core/Spells GameObjects needs to be spawned in order to be acceptable as a SpellFocus (#17594) 2016-07-20 19:33:29 +02:00
Aokromes
74cb8608c3 compile fix 2016-07-20 14:16:33 +02:00
Shauren
e58f0e805c Core/Units: Renamed and documented UNIT_FLAG_DISABLE_MOVE to prevent people from trying to use this flag to root a creature leaving them wondering why it doesn't do anything 2016-07-20 13:56:16 +02:00
Aokromes
11636faadf Core: define CREATURE_FAMILY_NONE to avoid magic numbers in code 2016-07-20 12:49:38 +02:00
Aokromes
3f0c7f6b2f Core/Spells: Renamed EnsureSpellInfo to AssertSpellInfo to minimize differences between branches 2016-07-19 12:02:52 +02:00
SnapperRy
55fc90fbc3 Event/Midsummer: improve pole ribbon functionality (#17464) 
Event/Midsummer: improve pole ribbon functionality:

- Bunny creature should hover, which puts it in the intended position.
- Use correct visual and internal spells to handle cosmetics and timers.
 2016-07-17 16:32:52 +02:00
Aokromes
726eb7bdef Scripts/Midsummer: Burning hot pole dance (#17445) 
* Scripts/Midsummer: Burning hot pole dance
By  zwerg, closes #6876
 2016-07-17 16:31:22 +02:00
Aokromes
d647b5d6a1 Scripts/Spells: fixed Decahedral Dwarven Dice and Worn Troll Dice 2016-05-14 06:23:38 +02:00
Gustavo
a407fddca5 Core/Quests Fix Quests Borrowed Technology, Volatility and The Solution Solution (#16968) 2016-05-12 08:47:02 +02:00
Shauren
a7f68c489a Properly rename the stand state method... 2016-05-12 08:27:48 +02:00
Shauren
a12493fd84 Core/Misc: Renamed getStandState to minimize differences between branches 2016-05-12 08:27:29 +02:00
Kito
5430da8e81 Scripts/Spells: Add generic spell to handle ClearDebuffs spell 2016-05-12 08:19:56 +02:00
Aokromes
30b80d6e82 Core: fixed few coverity issues and warnings 
Partial port of b68b6417f6 by joschiwald
 2016-04-03 07:36:50 +02:00
ariel-
65aec5f8f7 Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Note: additional hand-picked ports from 6.x to fix build

Conflicts:
	sql/updates/world/2016_02_22_00_world.sql
	sql/updates/world/2016_02_22_01_world.sql
	sql/updates/world/2016_02_22_02_world.sql
	sql/updates/world/2016_03_07_00_world.sql
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Scripting/ScriptLoader.cpp
	src/server/game/Scripting/ScriptLoader.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/CMakeLists.txt
	src/server/scripts/Commands/cs_gm.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_rbac.cpp
	src/server/scripts/Commands/cs_ticket.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/CMakeLists.txt
	src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/OutdoorPvP/CMakeLists.txt
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/shared/CMakeLists.txt
	src/server/worldserver/CMakeLists.txt
	src/server/worldserver/Main.cpp
	src/tools/mmaps_generator/CMakeLists.txt
 2016-03-11 18:32:07 -03:00
joschiwald
ffdf75a233 Scripts/Spells: Glyph of Arcane Shot is affected by own debuffs on target only 2016-02-27 17:55:43 +01:00
treeston
1fbe7979ff Nobody saw that. 2016-02-24 15:47:57 +01:00
Treeston
4e4b2b9a13 Merge pull request #16644 from Treeston/3.3.5-customcharmai 
Core/UnitAI: Rework creature-controlled player behavior.
 2016-02-24 13:39:31 +01:00
treeston
2f14664340 Core/UnitAI: Rework creature-controlled player behavior. 
- Removed hacked control mechanism, use proper PlayerAI instead
- Port old hacky code to new SimpleCharmedPlayerAI class
- Make adjustments to aforementioned code to fix bugs:
    - Properly clean up movement after charm ends
    - Only try to attack a target if charmer is engaged in combat
 2016-02-23 13:41:56 +01:00
Naios
9e43365b3d Core/Scripts: Split the huge scriptloader into smaller pieces 
* Each subdirectory contains it's own translation unit now
  which is responsible for loading it's directory
* Improves merging & decoupling between 3.3.5 <-> 6.x
* Removes unused Battleground loader
* Ref #15671

(cherry picked from commit 5534915f74)
 2016-02-22 16:25:54 +01:00
ariel-
35aa198984 Core/Scripts: Fix startup errors 2016-02-21 20:32:48 -03:00
ariel-
8bc477a2de Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Conflicts:
	sql/base/characters_database.sql
	sql/updates/world/2016_01_26_00_world.sql
	sql/updates/world/2016_01_31_00_world.sql
	sql/updates/world/2016_02_07_00_world.sql
	src/server/authserver/Server/AuthSession.cpp
	src/server/database/Database/Implementation/LoginDatabase.cpp
	src/server/database/Database/Implementation/LoginDatabase.h
	src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
	src/server/game/AI/ScriptedAI/ScriptedCreature.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_generic.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Networking/AsyncAcceptor.h
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/adt.h
	src/tools/mmaps_generator/MapBuilder.cpp
 2016-02-21 07:02:53 -03:00
Shauren
2ee36facad Merge pull request #16622 from P-Kito/3.3.5 
[3.3.5] Core/Spells: Fix Glyph of Arcane Shot
 2016-02-19 15:02:17 +01:00
MitchesD
408572c472 Merge pull request #16258 from sirikfoll/feast 
Core/Spells Implemented SpellScripts Needed for Achievement Pilgrim's…
 2016-02-18 21:03:11 +01:00
Kito
ab2b0f4168 Core/Spells: Fix Glyph of Arcane Shot 2016-02-17 22:58:04 +01:00
treeston
ae58f8e616 Revert "Merge pull request #16535 from Eliminationzx/FixWrongSealOfRighteousnessCalculation" while we figure out more details (see discussion in the PR). 
This reverts commit 1a213bd921, reversing
changes made to 657adc270a.
 2016-02-16 12:34:20 +01:00
Treeston
1a213bd921 Merge pull request #16535 from Eliminationzx/FixWrongSealOfRighteousnessCalculation 
[3.3.5] Core/Spells: Fix incorrect Seal of Righteousness calculation.
 2016-02-15 14:58:10 +01:00
treeston
3535a9fc7b Core/Spells: Disallow druid flight form while in shapeshift forms that prevent mounting. No more swimming zombies. Closes #16354. 2016-02-12 17:28:35 +01:00
ccrs
983bbe4a4c Core/Spells: Rogue Honor Among Thieves 2016-02-10 14:12:58 +01:00
Elimination
ff324e7284 Fix incorrect Seal of Righteousness calculation. 
Source http://wowwiki.wikia.com/wiki/Spell_power_coefficient
 2016-02-10 16:15:42 +07:00
Shauren
aa432db36d Core/Maps: Changed the way area data is stored in maps, it now uses ID field from AreaTable.dbc instead AreaBit used for exploration marker (and is not unique anymore on top of simply being stupidly confusing) 
Note: Extracting maps is required
(cherry picked from commit db0b8bf24e)

# Conflicts:
#	src/server/game/Achievements/AchievementMgr.cpp
#	src/server/game/Chat/Chat.cpp
#	src/server/game/Conditions/ConditionMgr.cpp
#	src/server/game/DataStores/DBCStores.cpp
#	src/server/game/DataStores/DBCStores.h
#	src/server/game/DataStores/DBCfmt.h
#	src/server/game/Entities/Player/Player.cpp
#	src/server/game/Globals/ObjectMgr.cpp
#	src/server/game/Handlers/BattleGroundHandler.cpp
#	src/server/game/Handlers/MiscHandler.cpp
#	src/server/game/Maps/Map.cpp
#	src/server/game/Spells/Spell.cpp
#	src/server/game/Spells/SpellEffects.cpp
#	src/server/scripts/Commands/cs_go.cpp
#	src/server/scripts/Commands/cs_group.cpp
#	src/server/scripts/Commands/cs_lookup.cpp
#	src/server/scripts/Commands/cs_misc.cpp
#	src/tools/map_extractor/System.cpp
#	src/tools/mmaps_generator/TerrainBuilder.cpp
 2016-02-09 18:19:28 +01:00
Keader
61f92b9a89 Core/Spells: Fixed Totemic Mastery (Tier 6 2P) Shaman 2016-02-08 22:28:47 +01:00
treeston
0813261c6f Merge branch '3.3.5-toytrain' into 3.3.5 (PR #16218) 2016-02-05 15:11:22 +01:00
ariel-
bcc0073f47 Core/Scripts: Remove both shadowform visuals, caused an issue of permanent visual if glyph was added/removed while Shadowform was active. 
Closes #10
 2016-01-24 13:30:52 -03:00
jackpoz
0e76d67e49 Scripts/Misc: Fix issues reported by static analysis 2016-01-23 17:42:37 +01:00
Aokromes
21a41fd385 Scripts/Spells: Hand of Reins - Questsupport for 'Mounting Up' 
by @untaught
 2016-01-22 16:43:40 +01:00
Aokromes
2a8ee2e461 Core/Misc: Enable one script 2016-01-22 16:41:23 +01:00
ariel-
47eba9ce1d Core/Scripts: Fixed Death and Decay 
Closes #46
 2016-01-20 01:35:02 -03:00
ariel-
93b31eeb4e Scripts/Spells: Merged 6.x beacon of Light instead of 3.3.5 2016-01-20 01:34:19 -03:00
ariel-
67bb4c0c3c Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 
Conflicts:
	sql/updates/world/2015_11_09_02_world335.sql
	sql/updates/world/2015_11_09_02_world_335.sql
	sql/updates/world/2015_11_11_24_world_from_335_was_2015_11_09_02_world.sql
	sql/updates/world/2015_12_16_02_world335.sql
	sql/updates/world/2015_12_16_02_world_335.sql
	sql/updates/world/2015_12_18_19_world_from_335_was_2015_12_16_02_world_335.sql
	sql/updates/world/2016_01_02_00_world335.sql
	sql/updates/world/2016_01_02_00_world_335.sql
	sql/updates/world/2016_01_04_28_world_from_335_was_2016_01_02_00_world_335.sql
	sql/updates/world/2016_01_10_05_world335.sql
	sql/updates/world/2016_01_10_05_world_335.sql
	sql/updates/world/2016_01_12_01_world335.sql
	sql/updates/world/2016_01_12_01_world_335.sql
	sql/updates/world/2016_01_12_02_world335.sql
	sql/updates/world/2016_01_12_02_world_335.sql
	sql/updates/world/2016_01_14_12_world_from_335_was_2016_01_10_05_world_335.sql
	sql/updates/world/2016_01_14_14_world_from_335_was_2016_01_12_01_world_335.sql
	sql/updates/world/2016_01_14_15_world_from_335_was_2016_01_12_02_world_335.sql
	sql/updates/world/2016_01_15_00_world.sql
	sql/updates/world/2016_01_17_10_world.sql
	sql/updates/world/2016_01_17_11_world.sql
	sql/updates/world/2016_01_17_12_world.sql
	sql/updates/world/2016_01_17_13_world.sql
	sql/updates/world/2016_01_17_14_world.sql
	sql/updates/world/2016_01_17_15_world.sql
	sql/updates/world/2016_01_18_00_world.sql
	sql/updates/world/2016_01_19_00_world.sql
	sql/updates/world/2016_01_19_01_world.sql
	sql/updates/world/2016_01_19_02_world.sql
	sql/updates/world/2016_01_19_03_world.sql
	src/server/scripts/Spells/spell_paladin.cpp
 2016-01-19 22:24:14 -03:00
ariel-
2961a6baaf Core/DB: Fix spellscript validation startup errors 
Closes #44
 2016-01-19 01:42:42 -03:00
ariel-
39fb6f1d6d Core/Spells: Fix Raise Dead 
- Also corrected issue where summoned ghoul didn't have energy bar.

Updates #44
 2016-01-18 23:19:13 -03:00
ariel-
d797741116 Core/Spells: Fix Pestilence 
Updates #44
 2016-01-18 21:07:54 -03:00
treeston
8c7cd03d08 Item/Misc: Implement Toy Train Set and Wind-Up Train Wrecker. 2016-01-18 15:11:27 +01:00