Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-24 19:06:49 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,962 Commits 4 Branches 146 Tags
14dab1f893e49df4f3d06fd083816101bf3b32f6
Commit Graph

7225 Commits

Author SHA1 Message Date
Spp
14dab1f893 Fix compile without pch 2012-10-16 09:35:15 +02:00
Subv
7cc1b999a6 Merge pull request #8073 from cristal/PvPLogData 
Core/Battlegrounds: Fix visual honor gain in PvPLogData
 2012-10-15 19:21:08 -07:00
Subv
fc796fb879 Scripts/Spells: Deleted a deprecated SpellScript (Astral Shift) 2012-10-15 18:01:16 -05:00
Subv
fe55f735c1 Scripts/Spells: Updated some more spells to 4.3.4 2012-10-15 14:27:56 -05:00
Naios
61dce1a02e Core/PhaseMgr: Implemented Phase Definitions, Terrainswap and multiphasing 
* fixes cataclysm aura effect SPELL_AURA_PHASE without phasemasks defined in miscValueA
* implements CONDITION_SOURCE_TYPE_PHASE_DEFINITION

Thanks to:
 - Cyberbrest: For the hard research work about multiphasing.
 - Venugh: He helped me with a lot of strange compile Errors.
 - Shauren: For the 4.3.4 phaseshift packet.
 - Booksize: He showed me how terrainswap works

Signed-off-by: Naios <naios-dev@live.de>
 2012-10-15 20:31:41 +02:00
Subv
c757f811f2 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_modify.cpp
 2012-10-15 11:15:25 -05:00
Subv
963aa5a159 Scripts/Spells: Updated some warlock spellscripts to 4.3.4 2012-10-14 19:18:18 -05:00
Nay
6f0a8040d8 Core/SpellMgr: Replace magic number by constant 
Thanks 2010phenix
 2012-10-13 17:36:19 +02:00
Cristal
85cd892354 Core/Battlegrounds: Fix visual honor gain in PvPLogData 2012-10-13 15:19:06 +02:00
Nay
c25a0bac72 Merge pull request #8053 from tibbi/rep_fix 
renaming GetBaseReputation used for offline players
 2012-10-12 16:29:13 -07:00
Nay
e60aafcf35 Merge pull request #8065 from MrSmite/PetAI_Cleanup_1 
PetAI Cleanup
 2012-10-12 16:27:35 -07:00
Elron103
ae4f5f3dee Core/Spells: Fix power drain effect for heroic versions of spell 70759 (72015, 72016) - thanks to Shauren 2012-10-13 00:43:20 +02:00
Shocker
1b43240512 Fix build 2012-10-13 01:35:42 +03:00
MrSmite
d28a62e579 Cleanup PetAI, remove unnecessary and broken JustDied(). Closes #7242 
Thanks to Oiler2112 for suggestions and testing.
 2012-10-12 16:48:33 -04:00
Warpten
c8c4291c6f Core/Commands: Allow .modify money to take another parameter structure: 
Example uses:
* .modify money 325g 25s 12c is the same as .modify money 3252512
* .modify money -12g is the same as .modify money -120000
* .modify money -12g 45s is the same as .modify money -115500
* .modify money 25c 18g is the same as .modify money 18g 25c
 2012-10-12 22:13:28 +02:00
Subv
c199e30874 Core/XP: Players only get 10% xp for killing NPCs of the same expansion or lower. 2012-10-12 10:46:06 -05:00
Subv
b06e9cfd41 Revert "Core/Entities: Do not create the model twice for a GameObject." 
This reverts commit 0f166336ca.
 2012-10-12 09:33:34 -05:00
tibbi
4a332082f9 renaming GetBaseReputation used for offline players 2012-10-12 13:47:57 +01:00
Aokromes
948f9d11f2 Core/Battlefield: Compile Fix 2012-10-12 04:32:14 +03:00
Nay
abe81119b4 Core/Script: Fix item unusual compass. 
By Kaelima and Retriman

Closes #8039
 2012-10-12 01:28:37 +02:00
Tuxity
b881f131c1 Core/Battlegrounds: Now it works ! 
Thanks to @Subv, @Drethek and @Zakamurite

Todo:
- Display countdown when bg start (packet related)
- Implement packet SMSG_BATTLEFIELD_STATUS_WAITFORGROUPS
- Maybe little typos here and here

Signed-off-by: Tuxity <kevin.darcel@gmail.com>
 2012-10-12 00:38:18 +02:00
Kandera
923cad31f3 Wintergrasp: move keep banner spawns to db. fix invisible stalker position. 2012-10-11 11:33:22 -04:00
kandera
104b86f3d4 Merge pull request #8042 from Retriman/SpellBarkskin 
Core/Spell:
 2012-10-11 05:41:24 -07:00
kaelima
a1c0d81fd6 Fix build 
Remove 2 unused header includes
 2012-10-11 08:34:00 +02:00
Retriman
d02298509f Core/Spell: 
*Barkskin can be used to stun and sleep.
 2012-10-11 01:32:28 -04:00
Subv
eff164caf6 Core/Build: Fixed some more errors from recent merge. 
Closes #8038
 2012-10-10 17:31:00 -05:00
Subv
ec21666cc6 Core/Build: Fixed some compile errors left from the merge. 2012-10-10 15:45:05 -05:00
Subv
c51f984837 Core/Misc: Only remove auras in arenas for non-gm players. 
Closes #7559
 2012-10-10 15:12:05 -05:00
Subv
970009cb3b Core/Players: Remove the mute from the DB when the timer expires. 2012-10-10 11:49:51 -05:00
Subv
a8fa67c53c Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
 2012-10-10 10:29:18 -05:00
Subv
1f699f2cd3 Core/Scripts: Fixed the command to restore deleted characters. 2012-10-10 10:14:26 -05:00
Subv
ecc2362c69 Scripts/Commands: Fixed the command to restore a deleted character. 
Thanks @vlad852
 2012-10-10 09:25:25 -05:00
Subv
595d194d99 Core/Players: Fixed a possible crash if a player is in an invalid zone 
Thanks to the ones who commented in the commit that introduced the issue.
 2012-10-10 09:13:03 -05:00
Subv
ef6e7e0914 Merge pull request #8001 from tibbi/reputation_convert 
correct reputation converting at faction change
 2012-10-10 06:43:47 -07:00
Subv
3e5af53bf7 Core/Achievements: ACHIEVEMENT_CRITERIA_TYPE_SPECIAL_PVP_KILL doesn't require a killing blow anymore, only a honorable kill. 
Author: @tibbi
Closes #6224
 2012-10-09 22:59:18 -05:00
Subv
b75b6d33b0 Core/Achievements: Fixed achievements with ACHIEVEMENT_CRITERIA_TYPE_WIN_ARENA 
Closes #6339
 2012-10-09 22:50:02 -05:00
kaelima
2958f64ffc Scripts/Misc: Correct two wrong urand's 
(found by Aokromes)
 2012-10-09 14:53:29 +02:00
Subv
0620d22491 Core/SAI: Added a missing break. 2012-10-08 18:38:15 -05:00
Nay
a3aebf7790 Merge pull request #8005 from tibbi/sota 
correcting SotA demolisher spawn, adding preparation buff to 2nd round t...
 2012-10-08 16:35:05 -07:00
Nay
e7a4a316c9 Merge pull request #8025 from gigatotem/4.3.4 
[4.3.4] PVP Trinkets
 2012-10-08 16:34:39 -07:00
Gigatotem
ac83e581be Typo fix with Previous commit. 2012-10-09 01:26:52 +02:00
Gigatotem
afba120838 Items/PVP Trinkets: 
As of Cataclysm you're able to PVP Trinket out of Disarms and Silence effects.
 2012-10-09 01:25:18 +02:00
Nexflame
4fabb0ba32 Fix Compile 2012-10-08 22:52:13 +03:00
tibbi
05eaf75501 adding forgotten UpdateCharacterNameDataLevel call 2012-10-08 20:02:11 +01:00
tibbi
405c3b09aa adding a new prepared statement for selecting char at_login and titles 2012-10-08 17:29:02 +01:00
tibbi
5896da6689 some optimization + adding level to CharacterNameData 2012-10-08 17:21:09 +01:00
Kaelima
5c98a43852 Merge pull request #8010 from Retriman/SpellsSIIII 
Core/Misc:
 2012-10-07 22:44:03 -07:00
Kaelima
17568c03b3 Merge pull request #8014 from Retriman/MasSpells 
Core/Misc:
 2012-10-07 22:43:44 -07:00
Nay
0fe1c10484 Merge pull request #8000 from gigatotem/master 
Spells/Hunter: Readiness
 2012-10-07 17:55:21 -07:00
Subv
00373eee90 Merge pull request #8015 from Retriman/masspellsTIII 
Core/Spells:
 2012-10-07 17:52:14 -07:00