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

28958 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Aokromes
2be2d00a7b DB/Misc: 3.3.5a fixes 2016-08-04 02:57:53 +02:00
Aokromes
54975aef46 rename file. 2016-08-04 02:46:04 +02:00
tkrokli
de2ad7d38c Core/Scripts: move npc_kharan_mighthammer to DB/SAI 
This PR affects the following 2 quests:
Quest ID 4001 "What Is Going On?" - part 2 (Horde)
Quest ID 4342 "Kharan's Tale" (Alliance)

Target of this PR:
Move core script npc_kharan_mighthammer to DB/SAI
(thereby removing 10 lines of hardcoded text).

* DB/conditions: extra gossip conditions

- added conditions for gossip before quest taken and after quest completed.
- removed redundant core script SAY_GET_ME_OUT_OF_HERE comment

* DB/creature: add more text to Kharan

- add all missing creature_text lines to entry 9021 Kharan Mighthammer
- add SAI duration to wait before TEXT_OVER is triggered (3000 ms)
 2016-08-04 02:42:00 +02:00
Aokromes
c3cb3e7233 compile fix 2016-08-03 23:47:37 +02:00
jackpoz
5dcb395e90 Common/Crypto: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-03 23:35:34 +02:00
jackpoz
3c66feafcc Common/Maps: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-03 22:39:59 +02:00
jackpoz
8cd5cefaf6 Common/Maps: Reduce differences between 3.3.5 and 6.x branches 
Code functionality shouldn't have been modified.
 2016-08-03 19:48:38 +02:00
Aokromes
2b3987cf56 DB/Pet: Fix some startup errors 2016-08-03 14:48:39 +02:00
Aokromes
14ee1c992f revert fail 2016-08-03 14:16:30 +02:00
Aokromes
ee2a8eafcf compile fix 2016-08-03 12:13:15 +02:00
ariel-
a69cbeb9d5 Core/PvP: Gameobject rotation in BGs and Wintergrasp. 
- Add a workaround in BattleGround correcting for bad rotations in BG scripts
- Calculate rotation from rotation in Wintergrasp, this function hasn't a rotation parameter and should be added in the future.
- Also removed an ugly hardcode in Battlefield::SpawnGameObject

Closes #17711
 2016-08-03 11:57:09 +02:00
jackpoz
242917e461 Core/Group: Do not allow a player to invite himself 
Do not allow a player to invite himself in group.
Fix an edge case when inviting another player that would cause a crash.
Fix #17664
 2016-08-03 11:56:29 +02:00
Aokromes
3ed49467ba Core/Chat: Split ChatLevelReq.Say into 3 2016-08-03 11:56:08 +02:00
Aokromes
d6915eb661 Typo fix 2016-08-03 11:50:11 +02:00
ariel-
4a5e0e2f35 Core/Battlegrounds: do not teleport GMs if out of bounds before starting 2016-08-03 11:49:50 +02:00
Aokromes
56feab44d9 Core/Player: New PartyLevelReq setting 2016-08-03 11:49:01 +02:00
Aokromes
75cd39b66d ddf 2016-08-03 11:45:29 +02:00
ariel-
35209adb87 Core/Spells: Abyssal Shatter should have a chance to skill up 2016-08-03 11:44:23 +02:00
Keader
e8c31ba61a Core/Scripts Shade of Akama Rewrite (#17567) 2016-08-03 11:43:27 +02:00
Aokromes
da3f7d464c Core/PVP: Move report AFK requirement to config (#17699) 2016-08-03 11:42:59 +02:00
Aokromes
08cb0da558 DB/Misc: 3.3.5a fixes 2016-08-03 11:42:05 +02:00
Aokromes
bb79774f01 Core/Scripts: convert script npcs_riverbreeze_and_silversky to SAI 
By tkrokli
(remove dead code)
 2016-08-03 11:35:28 +02:00
tkrokli
28848a1860 Core/Scripts: Remove useless SD2 error log (#17691) 
* Core/Scripts:  Remove useless log message (ref. joschiwald)
 2016-08-03 11:27:03 +02:00
ariel-
a85dd54ce0 Update BattleGroundHandler.cpp 2016-08-03 11:26:49 +02:00
Aokromes
d1197ef166 Core/PVP: Improve log (#17698) 2016-08-03 11:25:57 +02:00
Aokromes
58efdd9ee3 DB/Misc: Fix startup error 2016-08-02 16:14:26 +02:00
Aokromes
b99dd77b1f DB/Gameobject: Add missing gameobjects 2016-08-01 16:37:11 +02:00
Aokromes
df566a9d04 fix import 2016-08-01 15:21:13 +02:00
Aokromes
8d9c0eb150 typo fix 2016-08-01 15:00:45 +02:00
Aokromes
8301c9ac49 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2016-08-01 14:56:37 +02:00
Aokromes
ea7613b776 DB/Gameobject: Add missing loots 2016-08-01 14:56:04 +02:00
ariel-
aa53a0d71b Core/Spells: Define some aura types 
(cherry picked from commit 802ebbe36a)

Conflicts:
	src/server/game/Spells/Auras/SpellAuraDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
 2016-08-01 03:54:32 -03:00
ariel-
61c72215c3 Core/Auras: Renamed spell aura 333 to better describe its purpose 
(cherry picked from commit c2f6c4d2bd)

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2016-08-01 03:54:31 -03:00
ariel-
badef62df4 Core/Spells: ported helper function from 3f28fd304d 
Core/Spells: Reimplemented automatic spell learning
 2016-08-01 03:54:31 -03:00
ariel-
87f25be0aa Core/Spells: build fixes 2016-08-01 03:54:30 -03:00
ariel-
79b3fa5862 Core/Auras: Implemented SPELL_AURA_MOD_SPELL_COOLDOWN_BY_HASTE, SPELL_AURA_MOD_GLOBAL_COOLDOWN_BY_HASTE, SPELL_AURA_MOD_COOLDOWN_BY_HASTE_REGEN and SPELL_AURA_MOD_GLOBAL_COOLDOWN_BY_HASTE_REGEN 
(cherry picked from commit 6c71c8694f)

Conflicts:
	src/server/game/Spells/Auras/SpellAuraDefines.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellHistory.cpp
 2016-08-01 03:54:29 -03:00
ariel-
0c51829cc4 Core/Auras: Implemented aura 321 SPELL_AURA_MOD_NO_ACTIONS 
(cherry picked from commit 55d5cd37df)
 2016-08-01 03:54:28 -03:00
Aokromes
8db3b69fc7 Fix typo 2016-08-01 07:31:15 +02:00
Aokromes
00d91e4cf8 Fix sql 
By Malcrom.
 2016-08-01 07:27:07 +02:00
Aokromes
49773c530b DB/Gameobject: Fix one startup error 
By Malcrom
 2016-08-01 07:06:04 +02:00
Aokromes
0aad7fedf7 Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into 4.3.4 2016-08-01 06:44:57 +02:00
Aokromes
1db20f3170 DB/Misc: Fix some startup errors 
By Malcrom
 2016-08-01 06:44:12 +02:00
ariel-
7c58e4cc08 Core/GameObject: misc type mismatch 
(cherry picked from commit 4baa7f443a)
 2016-08-01 01:29:58 -03:00
ariel-
a0ce33c209 Core/Scripts: Compile fix 2016-08-01 01:27:23 -03: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
8ff67eb6ac DB/Gameobject: Fix another startup error 2016-08-01 01:17:03 +02:00
Aokromes
ee374a6e2a DB/Misc: Silence some startup erros 
This will be removed when disables support disable loot
By Malcrom
 2016-08-01 00:56:34 +02:00
Aokromes
18f58dcc56 DB/Item: Make deck of trades spell more offilike 
By Malcrom
 2016-08-01 00:15:37 +02:00
Aokromes
df8f3239fb DB/Misc: Add missing items 2016-08-01 00:11:08 +02:00
Aokromes
c903b8a115 DB/Spell: Fix some startup errors 
By Malcrom
 2016-07-31 23:59:23 +02:00