Commit Graph

27505 Commits

Author SHA1 Message Date
Killyana
43f4e32cab DB/Creature: Nerub'ar Broodkeeper
Add visual Web Beam on aggro
Fix creature addon for 25 mode
Fix InhabitType issue after landing

(cherry picked from commit 126b57acc6)
2015-10-16 16:01:39 +02:00
Killyana
60dc515b64 DB/Creature: Fix Npcflag for High Overlord Saurfang and Muradin Bronzebeard
(cherry picked from commit 6a10dbd79c)
2015-10-16 15:57:11 +02:00
Killyana
9dd7a06b51 DB/quest: The Ancient Armor of the Kvaldir
closes #11154
Vehicle issue fixed on #15376 By @StormBytePP

(cherry picked from commit e27588fdba)
2015-10-16 13:34:13 +02:00
MitchesD
1e39354cdd DB/Conditions: Simplify the conditions for Kael'thas Ressurection spell
Sorry for the oversight, thanks @joschiwald

(cherry picked from commit 5c97594a16)

DB/Conditions: Missing spell target conditions for Kael'thas advisor Ressurection spell

(cherry picked from commit 234d0c17d6)
2015-10-16 13:29:27 +02:00
StormBytePP
e4cf0a0a58 Core/Scripts: Fix noPCH compile
(cherry picked from commit 68e6c95f16)
2015-10-16 13:15:06 +02:00
Nyeriah
07c10ded2e Scripts/TheEye: Update Kael'thas Sunstrider's script
Closes #4180
Closes #4181
Closes #8479
Updates #1885

(cherry picked from commit fe07614916)

# Conflicts:
#	src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
2015-10-16 13:13:09 +02:00
sirikfoll
59742469fb Core/Scripts: Friend or Fowl Achievement
Change AURA_EFFECT_HANDLE_REAL to AURA_EFFECT_HANDLE_REAL_OR_REAPPLY_MASK, the hook needs to be called on every apply/reapply to keep tracking the stack amount.

(cherry picked from commit f877b6af0a)
2015-10-16 12:50:51 +02:00
MitchesD
68d725e211 Scripts/ZulAman: fix build after cherry pick 2015-10-16 12:49:25 +02:00
treeston
0bf78d5761 Custom logic for putting people in combat instead of relying on CreatureAI or Creature methods.
(cherry picked from commit 6a8524c068)
2015-10-16 12:45:53 +02:00
treeston
89357f5425 Core/Creature: Add facilities to the Creature class to allow setting an automated, periodic pulse that puts every player in the zone in combat and on the creature's threat list.
Scripts/BossAI: Set the BossAI parent class to make use of this in its _EnterCombat and _Reset methods. Combat pulses happen every 5 seconds.

(cherry picked from commit d57193df44)

# Conflicts:
#	src/server/game/AI/ScriptedAI/ScriptedCreature.cpp
#	src/server/game/Entities/Creature/Creature.cpp
2015-10-16 12:44:17 +02:00
treeston
c64b71d01e Clean up SmartAI::MoveInLineOfSight. Remove tons of duplicate logic and forward to CreatureAI::MoveInLineOfSight instead of using its own (incorrect) implementation.
Move the removal of the 'distracted' state from SmartAI to UnitAI.cpp.

Fixes and closes #7197 and #15482.

(cherry picked from commit f446538cb1)
2015-10-16 12:37:42 +02:00
Killyana
5c0a4ae3ef DB/Gossip Menu: Add missing gossips for Karazhan's npcs
Move npc_berthold script to the DB
Add missing gossips
Closes #15564
Thanks to @Riztazz and @xjose93

(cherry picked from commit 4c46e2048b)
2015-10-16 12:05:08 +02:00
Killyana
b293abf7df DB/Creature: Spirit of Olum
Move the script to the DB
Fix conditions for the teleportation
Add the missing teleportation to the Chamber of Command
Fix gossip text

(cherry picked from commit 774ea0b4bd)
2015-10-16 12:02:56 +02:00
joschiwald
2bc4dea4da Core/Misc: renamed sGossipSelect parameters
(cherry picked from commit ad38c27124)

# Conflicts:
#	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
#	src/server/scripts/Kalimdor/zone_azshara.cpp
2015-10-16 11:56:53 +02:00
Tomatoes
3874178da8 Server/Game/AuctionHouse
Fixes world config value of less than 1 being ignored by deposit formula.

Had problems with the last commits and pr, sorry

Update AuctionHouseMgr.cpp

Adds another check to config to handle values over 1 and properly adjust the minimum higher. Thanks jackpoz!

(cherry picked from commit 817a2ce4f7)
2015-10-16 11:49:01 +02:00
Incorrect
7b1249270b Core/Misc: Fix a typo
(cherry picked from commit e99e69d31f)

# Conflicts:
#	src/server/game/Entities/Player/Player.h
2015-10-16 11:46:57 +02:00
ShinDarth
e9a4e4cfa4 Core/Misc split Rate.XP.Kill and Rate.XP.BattlegroundKill settings
(cherry picked from commit 2185165e84)
2015-10-16 11:32:06 +02:00
Aokromes
fce4fb304c Update README.md 2015-10-16 11:16:01 +02:00
Aokromes
c5c435c3b9 Update CONTRIBUTING.md 2015-10-16 11:10:28 +02:00
Shauren
4c866a0af0 Core/Crash reporting: Fixed windows version detection for 8.1 and newer 2015-10-16 00:50:49 +02:00
Aokromes
0a5d28ffc7 DB/Misc: Fix Typo 2015-10-16 00:29:20 +02:00
Aokromes
ea71f9a958 DB/Misc: Fix import
I hope...
2015-10-16 00:17:37 +02:00
Aokromes
a589bbe854 Merge branch '6.x' of http://github.com/TrinityCore/TrinityCore into 6.x 2015-10-16 00:02:55 +02:00
Aokromes
bdcfd5271c DB/Misc: Move some mop spawns to proper place
Again intended filename
2015-10-16 00:02:26 +02:00
Shauren
45994a177c Core/Players: Check if player can enter the instance during login before trying to add him to map
* Fixes name displaying as "Unknown"
2015-10-15 23:29:19 +02:00
Aokromes
65038a73a7 DB/Misc: Move some mop spawns to proper place 2015-10-15 23:26:27 +02:00
Aokromes
0dbf1cd288 DB/Misc: fix import 2015-10-15 22:06:36 +02:00
Aokromes
66a0a3607d DB/Misc: Sync 6.x guids with 3.3.5a and 4.3.4 2015-10-15 16:23:06 +02:00
Aokromes
30f1d372ca Update 2015_10_14_00_world.sql 2015-10-14 09:36:23 +02:00
Shauren
b808910a89 Core/Auras: Fixed auras limited to a single target not being removed in all cases as expected
* Fixes possible assertion failure in Aura::UnregisterSingleTarget
Closes #15696
Ref #15668
2015-10-14 08:29:19 +02:00
Carbenium
e06bc72da7 DB/Creature: Fix spawns/pathing in AQ40
By malcrom
2015-10-14 02:30:12 +02:00
tkrokli
2fbf89b201 contrib/script: error text corrections in check_updates.sh
Fix a factual error in the /contrib/check_updates.sh error message text,
Best shown in an example from the latest travis build error:
```
$ ./contrib/check_updates.sh auth auth
Database Updater check script:
  Checking database 'auth' for missing filenames in tables...

- "sql/updates/2015_10_09_00_auth.sql" is missing in table 'auth'.'updates'

Fatal error:
  The Database Updater is broken for database 'auth
  due to applied update which are missing in the 'auth'.'updates' table.

How to fix:
  Insert the missing names of sql updates which were applied already to
  the 'updates' table of the 'auth' base dump ('sql/base/auth_database.sql').

The command "./contrib/check_updates.sh auth auth" exited with 1.
```
Main fix: `\"sql/updates/${file}\"` -> `\"sql/updates/${name}/${file}\"`

Before this change, the error message claims that the updated SQL file was placed
directly in the `/sql/updates/` directory and not in the subdirectory based on its DB name.

All the other changes are improvements in English grammar and more precise description.

(cherry picked from commit 01e0475ab8)
2015-10-14 00:29:57 +02:00
Shauren
559c58f1c2 Core/Battle.net: Fixed warnings about uninitialized values 2015-10-12 17:14:26 +02:00
Naios
40e1fc0670 Core/Battle.net: Fix "comparison of integers of different signs" warning 2015-10-12 02:28:52 +02:00
Shauren
ee2b43e368 Core/Battle.net: Updated packet enums and added new build data 2015-10-10 20:19:41 +02:00
MitchesD
2e894d0f18 Merge pull request #15688 from Espionage724/patch-1
Line break in bnetserver.conf.dist for consistency
2015-10-10 10:56:57 +02:00
Vincent-Michael
d8c5136325 SQL: Update auth_database 2015-10-10 10:39:02 +02:00
Sean Rhone
c28ee6a9a9 Update bnetserver.conf.dist
- New line for consistency
- Same as https://github.com/TrinityCore/TrinityCore/pull/15628 only for 6.x
2015-10-09 22:19:32 -04:00
Helias
bd77329812 DB/Misc: added the last missing creature queststarter and questender
Closes https://github.com/TrinityCore/TrinityCore/issues/15500
2015-10-09 12:53:15 +02:00
Helias
6c278ff5e4 DB/Misc: added missing creature queststarter and questender in "Mists of Pandaria"
Closes https://github.com/TrinityCore/TrinityCore/issues/15484
2015-10-09 12:50:53 +02:00
Vincent-Michael
4d4da189ff DB/Auth: Updated to 6.2.2a.20574 2015-10-09 09:06:28 +02:00
Shauren
5743333e46 Core/Bnetserver: Fixed copypaste mistake for packet names 2015-10-07 23:48:50 +02:00
Naios
a2908719c0 Core/Bnetserver: Fix warnings caused through non virtual destructors. 2015-10-06 16:11:54 +02:00
Shauren
63def8aa32 Core/Battle.net:
* Changed packet structures to mirror client names
* Simplified ToString Building
* Removed deprecated structures

World: Cleaned up duplicate realm info 'realm' and 'realmHandle' variables (realmHandle was removed, that data is fully contained in realm)
2015-10-06 00:30:47 +02:00
Naios
2c828a47a5 DB/Auth: Add some missing applied updates to the update list. 2015-10-06 00:17:23 +02:00
Naios
be53a45a39 Travis: Add check for update entries not listed in base dumps.
* Will mark the travis build as failed when the database updater is broken.

(cherry picked from commit 4dd6070c79)
2015-10-05 23:36:04 +02:00
Naios
1bce131bdc CMake: Fix bad generation of "revision_data.h" not including MYSQL_EXECUTABLE.
* was caused through invoking "FindMySQL" after using ${MYSQL_EXECUTABLE}.
* better re-run CMake if you are affected by the mysql exe wasn't found issue.

(cherry picked from commit 45a60c2d22)
2015-10-05 17:18:15 +02:00
Naios
02ab60a133 Core/Updater: Fix mysql in path check/search.
(cherry picked from commit a561edefb9)
2015-10-05 17:17:56 +02:00
Shauren
aaaa1c3441 Core/World: Store account id in CharacterInfo to reduce the amount of database queries 2015-10-05 15:06:27 +02:00
joschiwald
fe0c07a6fe Core: fixed warning introduced in last commit 2015-10-05 00:12:38 +02:00