Commit Graph
27516 Commits
Author SHA1 Message Date
Aokromes b67670af9b DB/Misc: Fix some startup errors 2015-10-18 13:22:29 +02:00
MitchesD eea15e7cc5 DB/Misc: corrected all PhaseIDs and PhaseGroups in creature and gameobject tables 2015-10-18 11:53:46 +02:00
Aokromes 2dd0312cff DB/Misc: Fix few startup errors 2015-10-17 19:07:46 +02:00
Shauren 82db416b5d Warning fixes 2015-10-17 16:35:37 +02:00
Naios 13654bac2c Core/Tools: Fix brutal linking in mmaps extractor.
* caused warnings with shared linking
* ref #15671
2015-10-17 13:14:20 +02:00
Naios 0946fcf2aa Core/Build: Never overwrite the msvc cxx flags in the cache
* Setting all compiler flags in the cache led to circular bloating of
  msvc cxx parameters (was visible in console) which caused MSVC to
  rebuild the whole solution even on a small CMake change.
  It's not neccessary anyway to set the cxx parameters to the cache
  to take effect.
* I'm not sure if the workarround is still needed for MSVC 12+.
* Cleaning the CMake cache is recommended!
* ref #15671
2015-10-17 13:11:49 +02:00
Killyana ceaa8c6f0a DB/Misc: Add missing spawns on Howling Fjord
Improve some vehicles behavior
Improve some SAI
Thanks to @Pitcrawler for the scripts

(cherry picked from commit 64959cd9d0ba9c1f8f62cedd09eb4fdcb81e2d8a)
2015-10-17 13:02:19 +02:00
MitchesD 105f943ac6 DB/Auth: changed battlenet_account_toys engine to InnoDB 2015-10-17 12:44:19 +02:00
Rushor 06bf701bd6 DB/SAI: Dalaran Mages - Add Emotescripts
(cherry picked from commit 7c0270913926c7daac154fb060f8203260cd1366)
2015-10-17 11:36:50 +02:00
Dr-J 99e6973fd9 DB/Misc: Updates for Argent Tournament Quests
* add visual for The Light's Mercy
* On Agro text for Mistcaller Yngcar
* Correct Defend spell for Boneguard Lieutenant

Thanks to @killyana for updates to script for the Light's Mercy
(cherry picked from commit def132d5ab4dd5db6dad86f74f56d0223297cecb)
2015-10-17 11:35:53 +02:00
MitchesD 9fe29de260 Core/Player: implemented Heirloom Collection
* implemented all things related to that collection
* you can create heirloom by click on item in collection
* also you can upgrade heirlooms by using specific kits
* old heirlooms are converted to new ones
2015-10-16 23:09:42 +02:00
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 126b57acc665a918d3c72749cab4535878594591)
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 6a10dbd79c9436c9233d8e170833c0897ce145f8)
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 e27588fdbaf79e949829d8480813360e5f4edb35)
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 5c97594a1691b78ab881437985dc5eeebb31a979)

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

(cherry picked from commit 234d0c17d6400fb5d395f3c640846967e4ec2e3a)
2015-10-16 13:29:27 +02:00
StormBytePP e4cf0a0a58 Core/Scripts: Fix noPCH compile
(cherry picked from commit 68e6c95f16dc978066bb957407a1c3bfd4cb8505)
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 fe07614916405464169d0fa3d4a62466308114e2)

# 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 f877b6af0a48a216aad9078900763dadb2221d24)
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 6a8524c068d418092c193a3419b65818f3fd3443)
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 d57193df444b719757ae1da4a5f19e204074f6ae)

# 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 f446538cb16dad3dcd04e79aebc944feefc16275)
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 4c46e2048b317da4ada75140794b5b40c0db1305)
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 774ea0b4bd1e0d469cfce8013f2e557f030c7c97)
2015-10-16 12:02:56 +02:00
joschiwald 2bc4dea4da Core/Misc: renamed sGossipSelect parameters
(cherry picked from commit ad38c2712460fe9d3ecb71959294655d2b88799d)

# 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 817a2ce4f744d75e8526e351b35ed1c787cc5b01)
2015-10-16 11:49:01 +02:00
Incorrect 7b1249270b Core/Misc: Fix a typo
(cherry picked from commit e99e69d31ff7f768517a59bd0c2cd6cbb87c2cef)

# 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 2185165e8481ebcfd28895e5066991c89baaec14)
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 01e0475ab898632bb9fd7c3ab0b11ddc6d5cee81)
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