Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 09:44:45 +01:00
Code Issues Packages Projects Releases Wiki Activity
28,714 Commits 4 Branches 146 Tags
bb3f6835cf873dc6db16b27f755f708c2ec0937f
Commit Graph

28714 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Killyana
bb3f6835cf DB/Gameobject: Fix respawn time for objects used for The Alchemist's Apprentice quest 
Updates #17002
By Tauriella
 2016-04-20 18:06:41 +02:00
Killyana
395ab66755 DB/SAI: Add missing Silvermoon Magister/Gnomeregan Conjuror SAI 
Updates #17007
By Kodekc
 2016-04-20 17:31:01 +02:00
Shauren
4a2bcb483a Core/Spells: Fixed spell effect value calculation for spells having MaxScalingLevel defined 2016-04-19 17:22:46 +02:00
DDuarte
e7c203334b Scripts: Add missing override 2016-04-19 01:37:17 +01:00
Gacko
aac868a6d9 Scripts: Add missing overrides. 2016-04-18 23:52:39 +02:00
Naios
51ec8d3b8c Core/Scripting: Use the path of the worldserver executable to search for the scripts dir 
* Fixes issues when starting the worldserver not in the bin directory
  or the CMAKE_INSTALL_PREFIX directory using the -c option.

(cherry picked from commit 86b0fcf67a)
 2016-04-18 23:03:24 +02:00
Naios
2809f11839 Core/Scripting: Use the systems temporary path for caching shared libs 
* Disables the shared library caching on platforms completely which
  never block files on usage (like linux).

(cherry picked from commit 081720b5dd)
 2016-04-18 22:11:23 +02:00
Naios
a679829050 Core/Cryptography: Move the SHA1 calculate helper to the SHA1 header 
(cherry picked from commit 3271f328de)
 2016-04-18 22:11:16 +02:00
Naios
d95bc7329d Core/Scripting: Add the info how much time the system took to reload 
(cherry picked from commit 11b5de63cb)
 2016-04-18 22:11:09 +02:00
Shauren
e6aff18593 Core/Player: Defined new known byte field offset 2016-04-18 16:55:40 +02:00
Naios
e3a583646e Contrib: Fix the check_update scripts after the recent organization changes 
* Fixes the travis build
* Ref 8778829a98
 2016-04-17 17:36:40 +02:00
Naios
9701fca7df Dep/Protobuf: Link protobuf dynamically when building with shared libs 
* Fixes issues with linux and dynamic linking
* Closes #16993
 2016-04-17 17:36:40 +02:00
Killyana
040a54e687 DB/Quest: Bring 'Em Back Alive 
Updates #16976
 2016-04-17 17:27:28 +02:00
Killyana
1424299a11 DB/SAI: Vladek <Wolfcult Initiate> 
Updates #16980
By Kodekc
 2016-04-17 16:28:00 +02:00
Killyana
960f8c4372 DB/SAI: Rework Scourge Deathspeaker 
Updates #16985
By Kodekc
 2016-04-17 15:17:20 +02:00
Killyana
c883938bff DB/Gameobject: Fix some gameobjects respawn time 
Updates #16970 #16977 #16972 #16990
 2016-04-17 14:54:49 +02:00
Killyana
25e1ecb33d DB/Creature: Fix Leviathan Mk II health points 
Updates #16983
 2016-04-17 02:50:27 +02:00
DDuarte
5299e25d25 Core/Items: Move Item::GetSkill to ItemTemplate::GetSkill 
Also moved some methods of ItemPrototype to .cpp

Thanks to Yehonal for the original patch

Closes #16884

(cherry picked from commit 0257aa0528)

# Conflicts:
#	src/server/game/Entities/Item/Item.cpp
#	src/server/game/Entities/Item/ItemPrototype.h
 2016-04-17 00:30:48 +01:00
Naios
bb7ac917fb Core/Scripting: Change the INFO logger of the hotswap system to enabled 
(cherry picked from commit 1fe4e09d1f)
 2016-04-17 01:19:32 +02:00
Shauren
5d4e0e42f2 Changed supported version to 21463 2016-04-17 00:24:14 +02:00
Naios
8fa52860ab Core/Scripting: Improve the error message when the script reloader fails to create a cache entry 6.2.4/21355 2016-04-16 22:07:13 +02:00
Naios
5fa7127927 Core/Proto: Convert the proto project to a standalone shared library 
* Fixes issues with dynamic linking on linux
* Closes #16981
 2016-04-16 22:07:07 +02:00
DDuarte
37a79bde97 Travis: Remove libzmq apt-get 2016-04-16 20:38:45 +01:00
tkrokli
d82a2cf471 Core/Scripts: zone_shattrath_city cleanup 
- restore missing text lines for Sal'salabim and Raliq the Drunk
- replace hardcoded text with DB gossip ID enum sections
- move gossip ID, quest ID, spell ID (and so on) into enum
- remove core script for Ishanah, High Priestess of the Aldor

Closes #16684

(cherry picked from commit acdfc36a4e)
 2016-04-16 19:05:32 +01:00
DDuarte
8778829a98 SQLs: Update to the /sql/updates organization 
Update SQL files should now be in a sub-folder equal to the current branch name

/sql/updates/auth/*.sql -> /sql/updates/auth/6.x/*.sql
/sql/updates/characters/*.sql -> /sql/updates/characters/6.x/*.sql
/sql/updates/hotfixes/*.sql -> /sql/hotfixes/world/6.x/*.sql
/sql/updates/world/*.sql -> /sql/updates/world/6.x/*.sql

This facilitates merges between the version branches
 2016-04-16 18:48:11 +01:00
DDuarte
eaaee4b7c0 Core/Players: Fix flight form & fall damage (#16955) 
(cherry picked from commit fcbbc60b93)
 2016-04-16 18:35:30 +01:00
DDuarte
4e0b0e76c9 Core/Quests Fix Quests Borrowed Technology, Volatility and The Solution Solution (#16968) 
(cherry picked from commit d1a053e4f5)

Rename sql

(cherry picked from commit 41e776fe64)
 2016-04-16 18:22:35 +01:00
DDuarte
e8179e107b Merge branch '3.3.5-gluth' into 3.3.5 (PR #14865) 
(cherry picked from commit b115458001)
 2016-04-16 18:21:22 +01:00
DDuarte
00da19ed9e Merge remote-tracking branch 'sirikfoll/geddon' into 3.3.5 (PR #16975) 
(cherry picked from commit 75f7b5ae4b)
 2016-04-16 18:20:11 +01:00
DDuarte
98a8f539b4 Merge remote-tracking branch 'sirikfoll/bossAhune' into 3.3.5 (PR #14884) 
(cherry picked from commit 37067ad390)
 2016-04-16 17:20:57 +01:00
r00ty-tc
bf85d8d07f Solve many of the creature falling through floor issues. 
This seems entirely wrong to discount the returned map height if we're
already below it. In many cases this is exactly why we want the height!

(cherry picked from commit 10550fe8cf)
 2016-04-16 16:49:56 +01:00
Lopfest
ff3e176eb1 Core/Spells: enabled SPELL_EFFECT_160 (#16987) 2016-04-16 15:24:57 +02:00
Vincent-Michael
3cd19d3b30 Core: Removed Whitespaces 2016-04-16 12:19:23 +02:00
Henry Gordon
a4b0088671 Core/Instances: If a boss kills itself, still save the group to the instance (#16978) 2016-04-16 12:02:47 +02:00
Chaouki Dhib
3cbbcdb51a Core/Movement: Clean up and improvements on Unit::SetSpeed (#16843) 
- Clean up of Unit::SetSpeed (mostly cherry picks from the 6.x branch):
- the opcode sent depends on the unit. until now, MSG_MOVE_SET_* were sent for every units which isn't like retail behavior.
- Removed the unused method parameter "forced" from Unit::SetSpeed
- Renamed Unit::SetSpeed to SetSpeedRate
- Removed the unused method parameter "forced" from Unit::UpdateSpeed
- Added utility method Unit::SetSpeed which take the new flat value.
(cherry picked from commit dc3327f9c5)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Handlers/MovementHandler.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
#	src/server/scripts/Kalimdor/zone_azshara.cpp
#	src/server/scripts/Kalimdor/zone_durotar.cpp
#	src/server/scripts/Outland/zone_hellfire_peninsula.cpp
 2016-04-16 02:26:24 +01:00
treeston
213c6b73c8 Entities/Unit: Fix aggression checks when testing player pets vs neutral creatures. Pets will no longer be able to attack unattackable creatures in some situations. Fixes and closes #16659. 
(cherry picked from commit bf4d8ad310)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
 2016-04-16 01:54:40 +01:00
Aokromes
0f867ab6d7 Update worldserver.conf.dist 
(cherry picked from commit afaa8e2c60)
 2016-04-16 01:53:01 +01:00
Shauren
9a799d7563 Core/Auras: Fixed a visual issue with combat log appearing to deal negative damage with SPELL_AURA_PERIODIC_LEECH if the spell does more damage than target has health (before calculating resist) and any damage is resisted. 
Closes #16495

(cherry picked from commit f9697cb86a)
 2016-04-16 01:31:59 +01:00
Dustin Paul
38cc1b902d Core/LFG: Readd players to queue when proposal fails because someone else declined it (#16279) 
(cherry picked from commit bdeeab13bd)
 2016-04-16 01:31:36 +01:00
Chaouki Dhib
d26b0419c3 Core/Movement: Added a wrapper method in MotionMaster for a unit to move toward another unit and stop once it reaches the target at a certain distance. (#16806) 
(cherry picked from commit 97b053d203)
 2016-04-16 01:31:15 +01:00
Aokromes
4ab56dc309 Misc: Update issue template to avoid false incorrect hash error 2016-04-16 01:14:22 +02:00
Shauren
c8b3ee3dd6 Core/Bnet: Fixed LoginREST.* address selection 2016-04-16 00:20:20 +02:00
Killyana
020a091901 DB/SAI: Fix phasing action for The Brothers Bronzebeard 2016-04-15 19:05:45 +02:00
Killyana
385b9d5b89 DB: Fix Typo 2016-04-15 16:43:19 +02:00
Shauren
bf8637cf9d Core/Toys: Warning fix 2016-04-15 00:07:10 +02:00
Naios
8f78b1ed87 Core/Scripting: Fix a typo in b970a684 
(cherry picked from commit ea627589d6)
 2016-04-14 22:17:54 +02:00
Naios
19bf0513bc Core/Scripting: Wait until the debugger is detached before rebuilding scripts. 
* Thanks Shauren for the IsDebuggerPresent() hint.

(cherry picked from commit b970a68473)
 2016-04-14 21:30:52 +02:00
Naios
2038c31100 Core/Scripting: Disallow the build directory to contain spaces 
* I wasn't able to work arround a path which contains spaces,
  since it seems like a CMake specific issue.
* Closes #16947

(cherry picked from commit 42eeb28a8b)
 2016-04-14 21:30:43 +02:00
Naios
48776d9ce9 Core/Worldserver: Correct the default comment of HotSwap.EnableReCompiler 
* Thanks jackpoz for noticing

(cherry picked from commit 9e43e50fa7)
 2016-04-14 21:30:36 +02:00
Naios
ea4ac00ac7 Core/Build: Provide an interface target for game 
* Increases the build time because dependent projects can build
  without waiting for the game project.

(cherry picked from commit ff8a54ab92)
 2016-04-14 21:30:27 +02:00