Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-29 13:22:48 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,782 Commits 4 Branches 146 Tags
a28d2d22f3899208554332882d64543abdd1e1dc
Commit Graph

7818 Commits

Author SHA1 Message Date
Vincent_Michael
a28d2d22f3 Core: Fix non pch build 2013-01-03 23:40:12 +01:00
Vincent_Michael
f6ee4e3769 Core: Fix build 2013-01-03 18:15:23 +01:00
Vincent_Michael
6889f7cde6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
 2013-01-03 18:07:53 +01:00
Vincent_Michael
6a29a957dd Core/Spells: Rename SPELL_EFFECT_PLAYER_NOTIFICATION to SPELL_EFFECT_PLAY_SOUND 2013-01-03 18:00:26 +01:00
Vincent_Michael
eba9abd2ee Core/Spells: Update no fly zone for wintergrasp 2013-01-03 17:37:39 +01:00
Vincent_Michael
aa43ecd18d Core/Spells: Removed no fly zone for dalaran 2013-01-03 16:58:38 +01:00
Machiavelli
0782e0b851 Update src/server/game/Achievements/AchievementMgr.cpp 
Core/Achievements: Add player name and guid to CompletedAchievement log
 2013-01-03 14:55:49 +01:00
Spp
d35d33aa86 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/scripts/EasternKingdoms/CMakeLists.txt
	src/server/scripts/Kalimdor/CMakeLists.txt
 2013-01-03 09:17:53 +01:00
Spp
27b1e457e6 Core/Misc: More corrections to guid handling change (2292025) 2013-01-03 08:06:53 +01:00
Vincent_Michael
57c275f3e1 Core: Fix warning 2013-01-02 21:42:50 +01:00
Spp
786f27b74c Core/Misc: Missing changes from 8968dbc (Partial revert of 2292025) 
Closes #8843
 2013-01-02 21:23:54 +01:00
Malcrom
dbfc4b83aa Core/Scripting: Some file name updates. 2013-01-02 15:08:13 -03:30
Malcrom
38c55a15ad Core/Scripting: Rename zone scripts. 2013-01-02 14:52:13 -03:30
Malcrom
2fd10b5d15 Core/Scripting: Properly name boss_thorngrin_the_tender file. 2013-01-02 14:11:39 -03:30
Vincent_Michael
cc99c739c6 Core/MT: Fix model for "Pure Energy" 
Closes #8838
 2013-01-02 16:58:23 +01:00
Spp
8968dbc5a9 Core/Misc: Partial revert of 2292025 (Core/Misc: Replaced some macro definitions with inline functions) 
- That code is 4.3.4 and wasn't supposed to be pushed to master
 2013-01-02 15:20:38 +01:00
Spp
601fcc5612 Core/Misc: Removed odd code from CreatureAIImpl.h, it does not belong here 
- Also some minor corrections from previous commit
 2013-01-02 14:20:20 +01:00
Spp
6b668c8337 Core/Misc: Update headers to 2013 2013-01-02 13:31:19 +01:00
Spp
aed36a8375 Merge branch 'master' into 4.3.4 
Conflicts:
	dep/libmpq/CMakeLists.txt
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/Item/ItemPrototype.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/ReferAFriendHandler.cpp
	src/server/game/Movement/Spline/MoveSplineInit.h
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_gahzranka.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_grilek.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hakkar.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_hazzarah.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_renataki.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/EasternKingdoms/boss_kruul.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.h
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2013-01-02 13:30:51 +01:00
Spp
ebd14b4f01 Core/Mysql: Multiple changes 
- added support for setting NULL column values to MySQL wrapper in core
- replaced nonstandard strdup function and manual memory management with std::string
- fixed bug in MySQLPreparedStatement::getQueryString method, it failed when string parameter contained embedded '?' symbols
- fixed memory leak in MySQLPreparedStatement::setString method
 2013-01-02 12:22:50 +01:00
Spp
5280a77fe1 Core/Misc: Some minor changes here and there 2013-01-02 11:00:16 +01:00
Spp
d36c4a91ba Core/Misc: Use equal_range instead of lower_bound/upper_bound calls where possible. 2013-01-02 09:53:43 +01:00
Spp
2292025bf9 Core/Misc: Replaced some macro definitions with inline functions 2013-01-02 09:07:52 +01:00
Spp
c85dc26584 Core/Misc: EventMap will no longer inherit from std::map 2013-01-02 08:34:11 +01:00
Trista
423fb04270 Script/EoE: Some fixes here and there 
* Add db support for Power Sparks, Teleports and Drakes
* Fix Power Sparks animations and texts and add support for giving buff to players + warning
* Fix Power Spark way of stacking - should be MultiSlot aura, didn't stack before either way
* Teleporters mechanic is fixed and will summon only 1 spark per 30-35 sec
* Fixed players getting mounted on 3rd phase
* Cleanned some wrong aggro handling, but whole aggro/attack system should be rewritten to get it working blizz
That is for today, this doesn't fix the whole instance by any means!
 2013-01-02 06:35:28 +02:00
Warpten
91f8ca3244 Core/GuildFinder: Remove all requests from a player when he enters a guild. 2013-01-02 05:19:18 +01:00
Vincent_Michael
336752a409 Core: Add missing changes in f7e7f5fe26 2013-01-02 03:25:08 +01:00
Vincent_Michael
e0db317530 SQL: Fix sql import problem 2013-01-02 03:06:55 +01:00
Malcrom
1062a0b40f Core/Scripts: Added spell scripting for Commander Sarannis. Added Instance Template for The Botanica. 
Thanks to Vincent Michael
 2013-01-01 22:28:29 -03:30
Vincent_Michael
56096b7704 DB/Creatures: Some fix for Wyrmrest Skytalon 
Closes #8733
 2013-01-02 02:43:41 +01:00
Vincent_Michael
88e6071ff6 Core: Fix build 2013-01-02 02:28:00 +01:00
Malcrom
596ef0efd7 CORE/Scripting: Forgot new lines at end of file. 2013-01-01 21:41:37 -03:30
Malcrom
f7e7f5fe26 CORE/Scripting: Move Commander Sarannis & Thorngrin the Tender to cpp scripting. Add instance script. 
Thanks to Vincent Micheal for the help :)
 2013-01-01 21:36:21 -03:30
Warpten
2fa3972707 Core/Guilds: Fixed a possible crash on guild invite. 
Closes #8699
 2013-01-01 22:27:26 +01:00
Shauren
312e8509dd Core/Spells: Implemented SPELL_EFFECT_RESURRECT_WITH_AURA (effect number 172) 2013-01-01 21:57:31 +01:00
Gacko
01b705c844 Core/Player: Fix armor calculation - 2nd try 
Base armor value from WDB data includes the ArmorDamageModifier. Items of
same item level, required level, armor type and equiptment slot should
have (nearly) the same armor values.

See following links for further proofs:
http://pastebin.com/fqNJLYj4
http://www.wowhead.com/item=50466#comments:id=889035:reply=444786

The shown item should have a base armor value of 177 as similar items and
a bonus armor value of 560 which equals 737 - like in DB atm.
 2013-01-01 21:43:17 +01:00
Gacko
431b807275 Core/Player: Fix armor calculation 
Base armor value from WDB data includes the ArmorDamageModifier. Items of
same item level, required level, armor type and equiptment slot should
have (nearly) the same armor values.

See following links for further proofs:
http://pastebin.com/fqNJLYj4
http://www.wowhead.com/item=50466#comments:id=889035:reply=444786

The shown item should have a base armor value of 177 as similar items and
a bonus armor value of 560 which equals 737 - like in DB atm.
 2013-01-01 20:47:05 +01:00
Vincent_Michael
7fea285aea Core/Command: Add command for near creature finding 2013-01-01 18:16:32 +01:00
Warpten
35451c2307 Core/Logging: Improved opcode compressing logging. 2013-01-01 18:12:11 +01:00
Warpten
49e3526882 Core/Spells: Implemented SPELL_EFFECT_GIVE_CURRENCY. 2013-01-01 17:48:09 +01:00
Vincent_Michael
eef7754dc2 Update more copyright note for 2013. 2013-01-01 15:35:09 +01:00
Vincent_Michael
11e1227784 Update more copyright note for 2013. (alcohol sucks) 2013-01-01 12:57:23 +01:00
Vincent_Michael
cc65aba789 Update copyright note for 2013. 
Happy new year.
 2013-01-01 00:41:01 +01:00
Shauren
fefee58de7 Core/Scripts: Added ai method to temporarily despawn a boss when it enters evade mode (respawns after 30 seconds) 2012-12-31 21:14:54 +01:00
Shauren
4082a411ac Core/Spells: Added new spell effect/target definitions 2012-12-31 21:13:40 +01:00
Shauren
47ac83ec3a Core/Units: Check aura presence before casting liquid spell to avoid resetting periodic tick timers 2012-12-31 21:12:33 +01:00
Shauren
f1170ba0fb Core: Fixed some level 4 warnings (msvc) 2012-12-31 20:43:14 +01:00
Shauren
b229f72bf4 Core/Units: Cleaned up DealDamage log message and moved it to debug level 2012-12-31 18:53:44 +01:00
Shauren
c021bff594 Core/Vehicles: Fixed basepoints used when ride vehicle aura is created for !IsInMap case 2012-12-31 17:58:21 +01:00
click
7ef2c1e062 Core: Change a rather badly phrased warning regarding "bad" DBC datastructures 2012-12-31 16:36:58 +01:00