Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 18:36:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
24,439 Commits 4 Branches 146 Tags
1f6066c6e3624a4273de3d84a265bf3ed1311896
Commit Graph

737 Commits

Author SHA1 Message Date
DDuarte
1f6066c6e3 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
 2014-09-06 22:03:20 +01:00
jackpoz
29b9e5f0d5 Scripts/Commands: Fix issues reported by static analysis 
Fix possible buffer overflow in ".server shutdown" and NULL-dereference/Triggered Debug Assert.
 2014-09-06 20:43:08 +02:00
Nyeriah
3b987c4a89 Scripts/Commands: Move instance command strings to database 2014-09-05 21:59:58 -03:00
Vincent-Michael
fe99efd6fa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Events/childrens_week.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
	src/server/scripts/Kalimdor/zone_darkshore.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Kalimdor/zone_moonglade.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_herald_volazj.cpp
 2014-09-06 02:41:45 +02:00
Duarte Duarte
88045921a4 Merge pull request #13016 from Odyssey/pinfo 
Scripts/Commands: Move cs_misc.cpp command output hardcoded strings to DB
 2014-09-05 21:52:49 +01:00
Duarte Duarte
36f7cfbd04 Merge pull request #13039 from Nyeriah/pr-cmd 
Core/Tickets: Send global GM system messages on ticket complete
 2014-09-05 21:51:52 +01:00
Odyssey
5efd2579e5 Scripts/Commands: Move cs_misc command output hardcoded strings to DB so they can be localized too 2014-09-05 12:42:08 +02:00
Nyeriah
014adaa0fd Core/Tickets: Send global GM system messages on ticket complete 2014-09-03 17:25:36 -03:00
Vincent-Michael
8a97243728 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-09-01 09:19:57 +02:00
Duarte Duarte
c565d8566f Merge pull request #13004 from Nyeriah/pr-cmd 
Scripts/Commands: Fix up logic at group join command, so it doesn't retu...
 2014-09-01 03:46:30 +01:00
Nyeriah
a151105a69 Scripts/Commands: Fix up logic at group join command, so it doesn't return full group error when it actually isn't full 2014-08-31 23:43:36 -03:00
DDuarte
d5c0aeaa18 Scripts/Commands: Replace regex usage 
Sorry for the shitty C code but std::regex is not supported by GCC 4.7 and 4.8
 2014-09-01 03:03:26 +01:00
Vincent-Michael
56e0459b07 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-30 16:36:24 +02:00
DDuarte
2086ba46cf Scripts/Commands: Add optional reason to server shutdown/restart commands 
Display a "reason" ingame in the server shutdown ingame messages
Fix multiple typos in the .server idlerestart/idleshutdown/restart/shutdown commands

Closes #2671
 2014-08-30 14:07:52 +01:00
Vincent-Michael
1dc8a219a3 scripts/Commands: Sync with 4.3.4 branch (meh nayd) 2014-08-29 21:40:07 +02:00
Vincent-Michael
e8d0de6778 Scripts/Commands: Added for guild info guild level output 2014-08-29 21:09:06 +02:00
joschiwald
01380c66bf Core/Misc: some random changes after recent pull requests 2014-08-29 17:46:55 +02:00
Vincent-Michael
9cb92f93aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Entities/Player/Player.cpp
 2014-08-29 06:24:08 +02:00
Odyssey
8adde791d8 Scripts/Commands: Implement .guild info command 
Displays a information summary about the selected player guild or a given guildId or Name

Closes #12949

Signed-off-by: DDuarte <dnpd.dd@gmail.com>
 2014-08-28 23:04:52 +01:00
Vincent-Michael
80d4647e78 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-08-28 22:13:00 +02:00
jackpoz
9cceb458d9 Merge branch 'Rochet2/ahbot' into master 
Close pull request #12917
 2014-08-28 22:01:58 +02:00
Vincent-Michael
741f3dde2e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/Spells/Auras/SpellAuras.cpp
 2014-08-26 19:21:22 +02:00
jackpoz
4d9f8b926a Scripts/Commands: Change "few" commands to target current Player by default 2014-08-25 22:00:04 +02:00
Blipi
a7d1394c2e Core/AHBot: Implemented AHBot based on MaNGOS code 
Warning: CMake must be rerun

Apply if you have crashes

Rewrite Seller prices, add random properties and implement some suggestions on price calculations

Core/AHBot: Update to latest suggestions

Fix SQLs after merge, split the AH bot to spearate headers and cpps, fix the config default values

Remove case 8 from GetBuyModifier. It was not correct

Fix Gray Grey GRAY typos

Change message config name

Fix non pch build

Fix switch ident, also earlier removed whitespace. Add missing include for non pch build

Fix possible crash: if (forplayer || GetOwnerGUID()) changed to if (forplayer)

Apply Nayd.diff - Code style fixes

Fix leftovers from nayd

Correct SQL transaction and change one SQL query to C++ instead

Make loot items distinct
 2014-08-25 22:15:59 +03:00
Vincent-Michael
547115476f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
	src/server/scripts/Spells/spell_warrior.cpp
 2014-08-24 02:11:33 +02:00
jackpoz
7fe7f30521 Core/Misc: Fix some -Wconversion warnings 2014-08-23 19:56:41 +02:00
Shauren
d0176f985d Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/shared/Database/Implementation/WorldDatabase.cpp
 2014-08-15 20:13:34 +02:00
joschiwald
ccfa82e7d5 Core/Creature: update creature_template and some other small things 
http://www.trinitycore.org/f/topic/9572-creature-damage/
 2014-08-14 16:09:14 +02:00
Shauren
4a741258f1 Merge branch 'master' of https://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/Zones/BattlegroundAB.h
	src/server/game/Battlegrounds/Zones/BattlegroundAV.h
	src/server/game/Battlegrounds/Zones/BattlegroundEY.h
	src/server/game/Battlegrounds/Zones/BattlegroundIC.h
	src/server/game/Battlegrounds/Zones/BattlegroundSA.h
	src/server/game/Battlegrounds/Zones/BattlegroundWS.h
	src/server/game/Entities/Creature/Creature.h
	src/server/game/Entities/DynamicObject/DynamicObject.h
	src/server/game/Entities/Item/Item.h
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.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/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/World/World.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp
	src/server/scripts/Kalimdor/zone_orgrimmar.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
	src/server/scripts/Spells/spell_dk.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/shared/Packets/ByteBuffer.h
 2014-08-12 00:45:24 +02:00
DDuarte
df3b08d140 Core/Server: Use nullptr instead of 0 where pointers are expected 2014-08-09 21:32:26 +01:00
Vincent-Michael
893d58fa87 Scripts/Commands: Fix static analysis issues 2014-08-09 19:18:05 +02:00
Vincent-Michael
55eafa247d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/authserver/Server/AuthSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Server/WorldSocket.h
 2014-07-27 12:09:32 +02:00
Subv
a03c879565 Core/PreparedStatements: Fixed a change I missed in the World prepared statements for waypoints. 2014-07-25 20:18:43 -05: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
leak
aedb824e99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost 2014-07-16 17:53:33 +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
Vincent-Michael
6dba04c0cc Scripts/Commands: Fix warnings vs2014 ctp (no support) 2014-07-14 10:53:49 +02:00
Subv
dfdc19f3bc Merge branch master into boost 
Conflicts:
               BattlegroundMgr.h
 2014-07-13 16:52:38 -05:00
Vincent-Michael
0f5c481cd4 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/SkillHandler.cpp
 2014-07-12 18:08:30 +02:00
Shauren
6d8dbb5c4a Core/Misc: Renamed a few spell and skill line related methods to follow tc coding standards 2014-07-12 17:28:35 +02:00
Shauren
d91964912e Core/Skills: Fixed spells automatically learned from skill lines adding more skill lines 2014-07-12 17:27:26 +02:00
Vincent-Michael
3f0ce25d5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-12 05:09:46 +02:00
Shauren
de82146df8 Core/Commands: Fixed crashes caused by using .account lock ip and .account lock country commands from console - these commands apply to currently logged account so they cannot be used from console 2014-07-12 01:17:46 +02:00
Vincent-Michael
79062dd5ae Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/World/World.cpp
 2014-07-09 21:09:47 +02:00
joschiwald
7a67d816d9 Core/Battleground: 
* added a possibility to reload battleground templates
* cleaned up the template structure
* use mapids from BattlemasterList.dbc to calculate random bg
 2014-07-09 16:43:56 +02:00
leak
da3f6e923a Completely remove ACE as dependency for TC - kkthxbye 2014-07-06 01:42:35 +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
Subv
151785b9ce Merge branch 'master' of github.com:TrinityCore/TrinityCore into boost 
Conflicts:
	src/server/game/World/World.cpp
 2014-07-03 15:57:47 -05: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