Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-26 03:42:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
17,967 Commits 4 Branches 146 Tags
644d3c09874845ddf58fb8d3d9b3d45c8fc95e26
Commit Graph

17967 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Subv
644d3c0987 Codestyle: Fixed codestyle from previous commits. 2012-10-16 14:41:13 -05:00
Subv
4d526fd73d Core/Vendors: Fixed the "Item not found" error message when trying to buy an item from a vendor. 2012-10-16 14:28:41 -05:00
Subv
bbb5712e97 Core/Vendors: Fixed the "Item does not go into that slot" problem. 
The client sends the player guid when trying to store the item in the default backpack (255)
 2012-10-16 13:18:32 -05:00
Spp
67118c6999 Fix compile under windows 2012-10-16 18:43:21 +02:00
Subv
bc792e7c66 Core/Achievements: Fixed a recursive call in AchievementGlobalMgr::GetAchievementCriteria 2012-10-16 11:27:36 -05:00
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
Subv
e10c4afc35 SQL: Renamed SQL from previous merge. 2012-10-15 13:46:42 -05:00
Subv
acc617c1ab Merge pull request #7979 from Naios/phase_definitions_rebase 
[4.3.4] Phase Definitions, Terrainswap & Multiphasing (v.2)
 2012-10-15 11:38:29 -07: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
Shocker
71f6b7d74b Update THANKS file 
Don't complain about duplicates / invalid names, they were extracted & parsed from commits
 2012-10-13 03:47:14 +03: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
d67adf0c9e Merge pull request #8066 from Warpten/halionUpdate 
Scripts/Ruby Sanctum:
 2012-10-12 16:28:08 -07:00
Nay
e60aafcf35 Merge pull request #8065 from MrSmite/PetAI_Cleanup_1 
PetAI Cleanup
 2012-10-12 16:27:35 -07:00
Shauren
e0f34eb93c Merge pull request #8067 from Elron103/pull-requests 
Core/Spells: Fix power drain effect for heroic versions of spell 70759 (72015, 72016) - thanks to Shauren
 2012-10-12 15:46:20 -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
Warpten
e3d8c666bd Scripts/Ruby Sanctum: 
* Fixed Halion's health pool in the Twilight Realm.
* Updated missing expansion fields for Saviana Ragefire, General Zarithrian.
* Have Halion bind players to instance on any other mode than 10NM.
* Link template entries depending on difficulties.

Closes #8017.
Closes #8024.
 2012-10-12 23:04:56 +02: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
Shocker
db61c290a1 Merge pull request #8064 from Warpten/modMoney 
Core/Commands: Allow .modify money to take complex parameters
 2012-10-12 13:22:13 -07: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
Subv
7918ac0dea Merge pull request #8051 from Aokromes/master 
Core/Battlefield: Compile Fix
 2012-10-11 18:40:40 -07: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
Nay
5e1b744261 Merge pull request #8048 from Tuxity/battlegrounds_stuff 
[434] Battlegrounds
 2012-10-11 16:24:21 -07: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
af00564184 SQL: Renamed SQL from previous pull request. 2012-10-10 09:15:34 -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
6b5aa93dda Merge pull request #8035 from Retriman/BG 
DB:
 2012-10-10 07:08:51 -07:00
Retriman
028b6e778c DB: Remove all bgs from e1bee86ee6 2012-10-10 11:06:15 -04:00