Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
23,951 Commits 2 Branches 1 Tag
2cba07d6a1e319fec6d763daa69af3e29ba837c4
Commit Graph
1420 Commits
Author SHA1 Message Date
Shauren 2cba07d6a1 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	README.md
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.h
	src/server/game/Server/WorldPacket.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/shared/Packets/ByteBuffer.h
 2014-07-27 20:59:22 +02:00
Shauren 6f272ea5b7 Core/Network: Optimized packet sending by removing unneccessary memory copying 2014-07-27 17:46:46 +02:00
DDuarte cdb33ab174 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_feralas.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2014-07-24 17:10:21 +01:00
Trisjdc e2d6b9bf8c Core/Units: Properly remove auras that don't pass IsHighestExclusiveAura 2014-07-24 04:06:49 +01:00
Trisjdc 3f9f2e3ee5 Core/Units: IsNonMeleeSpellCast will no longer return false if there's an instant cast spell still arriving at the target with the caster doing a channel 2014-07-24 03:47:04 +01:00
Shauren 909acdbac3 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/authserver/Main.cpp
	src/server/authserver/Realms/RealmList.cpp
	src/server/authserver/Realms/RealmList.h
	src/server/authserver/Server/AuthSession.cpp
	src/server/authserver/Server/AuthSocket.h
	src/server/authserver/Server/RealmAcceptor.h
	src/server/game/Accounts/AccountMgr.h
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/ArenaTeamMgr.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/server/shared/Cryptography/BigNumber.h
	src/server/worldserver/RemoteAccess/RASocket.cpp
	src/server/worldserver/worldserver.conf.dist
 2014-07-19 03:51:11 +02:00
Shauren 7532864264 Buildsystem/MSVC: Warning fixes 
C4800 'type' : forcing value to bool 'true' or 'false' (performance warning)
C4127 conditional expression is constant
 2014-07-17 15:42:57 +02:00
Vincent-Michael 13ff07f121 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/scripts/Commands/cs_wp.cpp
 2014-07-14 21:01:55 +02:00
joschiwald 14bbe3e2e9 Core/Battleground: fixed typo 
* and fixed some warnings
 2014-07-14 20:12:39 +02:00
Vincent-Michael f03617cd0f Core/Creature: Fix problems with neutral innkeepers 2014-07-14 14:13:45 +02:00
Vincent-Michael 6797d78c1b Scripts/Misc: Added missing break in 495ca8c2dc (thx to @ccrs) 2014-07-11 17:36:52 +02:00
Vincent-Michael 04c2f6ca14 Core/LFG: Move 2 logs in trace 2014-07-11 10:22:27 +02:00
Vincent-Michael 6a6403a54e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/scripts/EasternKingdoms/CMakeLists.txt
 2014-07-09 10:23:14 +02:00
Sebastian Valle Herrera b84abc74a7 Core/Build: Fixed a typo when commiting 2014-07-08 10:18:30 -05:00
Sebastian Valle Herrera ffdb561b0a Core/Spells: Fixed SPELL_ATTR0_UNAFFECTED_BY_INVULNERABILITY not being checked in some places where IsImmunedToSpell is not called 
Closes #9362
Code by @joschiwald
 2014-07-08 10:15:18 -05:00
Vincent-Michael 7462fa63fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-08 00:14:53 +02:00
Vincent-Michael ba2563da5a Core/Spells: Convert "Shaman T10 Elemental 2P Bonus" in spell script 2014-07-07 21:50:18 +02:00
Vincent-Michael a508ce1976 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
 2014-07-05 14:28:58 +02:00
joschiwald 22113d1626 Core/Spells: restore some special aura proc handling 
Note: can cause some unexpected behavior

Closes: #12413
 2014-07-02 03:11:47 +02:00
Shauren 2a3546ca36 Core/Skills: Use SkillLineAbility.dbc to determine player initial spells - skill assignment done in a new table playercreateinfo_skills 
* Removed DK start skill hacks
* Resolved missing skills in character skill tab

Closes #12311
 2014-07-01 17:20:48 +02:00
Shauren fd910567ec Core/Loot: Fixed looting creatures that have only quest items in their loot 
Closes #12400
 2014-06-30 00:24:40 +02:00
Vincent-Michael 3b1c659b60 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
 2014-06-28 21:07:41 +02:00
joschiwald c28345e279 Core/Battleground: refactored BattlegroundScore 
(original code by Machiavelli)
 2014-06-27 23:14:15 +02:00
Vincent-Michael f3de6f0284 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-27 19:39:23 +02:00
Shauren 74850abcfc Core/Loot: Skinning improvements 
* Set skinnable flag only after all loot was taken
* Creatures are skinnable only once - after skinning, the player only has to loot the creature again if he did not take all skinning loot
 2014-06-26 22:01:55 +02:00
Vincent-Michael 50cf908d78 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/World/World.h
 2014-06-25 19:51:27 +02:00
Subv 8c944f1456 Core/Loot: Make the pickpocket loot refill every 10 minutes by default on the NPCs after they have been pickpocketed. 
Configurable by Creature.PickPocketRefillDelay
Closes #935
 2014-06-24 22:13:59 -05:00
Rochet2 c22d51f468 Core: Fix pet dismiss on phase with update 2014-06-21 23:57:23 +03:00
Vincent-Michael 910f32d48d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
 2014-06-19 22:57:44 +02:00
Vincent-Michael dc96fb1cee Core: Fix typo in 316d9a5ce8 2014-06-19 18:51:47 +02:00
Vincent-Michael 316d9a5ce8 Core/Misc: Fix coverity analysis issues 2014-06-19 15:58:33 +02:00
Kinzcool 34572492dd Merge branch '4.3.4_phases' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2014-06-18 23:25:57 -04:00
joschiwald a986e328b0 Merge pull request #12291 from Unholychick/patch-lotp 
Core/Spells: Fix Leader of the Pack
 2014-06-17 01:05:22 +02:00
Unholychick bd0dd6443f Core/Spells: Fix Leader of the Pack 
Broken with 6b430db910 because we used the wrong spell...
 2014-06-16 23:07:38 +02:00
Vincent-Michael 97ccfdb625 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
 2014-06-16 22:17:27 +02:00
Trisjdc e8df8ff4df Core/Auras: Implement stacking interaction between SPELL_AURA_MOD_TOTAL_STAT_PERCENTAGE and SPELL_GROUP_STACK_RULE_EXCLUSIVE_SAME_EFFECT. Allows BoK/BoS to stack while maintaining the strongest buff 2014-06-16 02:48:48 +01:00
Vincent-Michael 99404900af Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-15 19:38:40 +02:00
Vincent-Michael 26dd770b8e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/shared/Utilities/Util.cpp
 2014-06-15 19:36:30 +02:00
Trisjdc 6098a5e43a Core/Auras: Add a new stack rule to handle cases where the aura that is 'stronger' prevails (SPELL_GROUP_STACK_RULE_EXCLUSIVE_HIGHEST) 2014-06-15 17:27:57 +01:00
Shauren 2d5b54a69d Replaced calls to ceilf (msvc extension) with ceil - fixes build 2014-06-14 17:27:28 +02:00
Shauren 08edc7d630 Core/Vehicles: Fixed power issues 
* Regenerate powers only if vehicle has UNIT_FLAG2_REGENERATE_POWER
* Removed old pyrite power hack
* Apply creature_template.ManaMod to all power types

Closes #12141
 2014-06-14 17:09:35 +02:00
Shauren 5804372042 Core/Transports: Fixed crash happening during teleporting transports 
Closes #11793
 2014-06-13 11:16:17 +02:00
Trisjdc c75b7942a8 Core/Spells: Partially revert 4992c0290b, and further implement SPELL_ATTR3_NO_DONE_BONUS (which is the correct way of doing this) 2014-06-12 21:23:37 +01:00
Trisjdc 12b8bf037f Quick fixup for previous commit 2014-06-12 20:13:07 +01:00
Trisjdc 4992c0290b Core/Spells: Change haste benefit to cast time formulas, may need further correction 
- With these changes, Paladin/Death Knight mount summons will no longer benefit from haste
 2014-06-12 20:03:52 +01:00
Warpten c9613e0005 Merge pull request #12233 from Trisjdc/aura_stacking 
Core/Auras: Expanding functionality of SPELL_GROUP_STACK_RULE_EXCLUSIVE_SAME_EFFECT to be able to take care of aura effects inside their handlers
 2014-06-10 12:23:57 +02:00
Shauren f81635ebe5 Core/Vehicles: Fixed channeled spells being interrupted for passengers when vehicle moves 2014-06-09 21:08:19 +02:00
Vincent-Michael 18b6a6450b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/Spells/spell_hunter.cpp
	src/server/scripts/Spells/spell_warlock.cpp
 2014-06-09 03:27:53 +02:00
Trisjdc 38e12321a5 Merge pull request #12069 from Trisjdc/cheat_death 
Core/Spells: Fix Cheat Death formula
 2014-06-09 00:45:12 +01:00
Lucas 5d40838207 Fix Warnings 2014-06-08 21:21:49 +02:00