Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 10 Packages Projects Releases Wiki Activity
29,917 Commits 2 Branches 1 Tag
b2ae2653f73fed2b1015d615cd6acb13064da170
Commit Graph
29917 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Aokromes e5bdb8f90a Merge pull request #9842 from Bezo/Arena 
Core/Command: Implement .arena commands
 2013-05-21 15:11:06 -07:00
Bezo 178cb300d1 Implement .arena commands - add new commands to the core to handle with arena teams. 
*.arena create [player] "arena name" [type]
	*.arena create "arena name" [type]
	*.arena disband [TeamID]
	*.arena rename "oldName" "newName"
	*.arena captain [TeamID] [Player]
	*.arena info [TeamID]
	*.arena lookup [name]
 2013-05-22 00:50:51 +03:00
Aokromes 195196361d Merge pull request #9840 from Ascathor/master 
Core/Command: Remove excess parameter in LANG_PINFO_PLAYER
 2013-05-21 11:03:56 -07:00
Ascathor cef217a2fa Core/Command: Remove excess parameter in LANG_PINFO_PLAYER 
Should fix the command on linux servers
 2013-05-21 19:59:00 +02:00
Vincent-Michael 75c4f28442 Core: Fix warnings 2013-05-21 19:18:55 +02:00
Aokromes 1cec36790c Merge pull request #9822 from wowpsp/master 
Support 1.12.3 (build 6141)
 2013-05-21 09:46:31 -07:00
Aokromes 78840516f1 Merge pull request #9827 from Ascathor/master 
Core/Command: Rework .PInfo and give more output and add Gender to trinity_string
 2013-05-21 09:41:18 -07:00
Aokromes fa5ab46d87 Merge pull request #9808 from xjose93/ImproveLog12 
Core/Logs: Added more info for .send mail command.
 2013-05-21 09:39:51 -07:00
Spp 6c5529a5a0 Minor correction to merge 2013-05-21 11:46:52 +02:00
Spp ec0688ade3 Merge branch 'master' into 4.3.4 (Added SQL to fix trinity_string conflict) 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Miscellaneous/Language.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.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_jindo.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_kilnara.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_marli.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_wushoolay.cpp
 2013-05-21 11:27:12 +02:00
Spp 86afccc8ff Merge branch 'master' into 4.3.4 (Only the Logging System One) 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaTeam.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Entities/DynamicObject/DynamicObject.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Updates/UpdateData.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/BattlefieldHandler.cpp
	src/server/game/Handlers/CalendarHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Instances/InstanceScript.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/game/Tools/PlayerDump.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
 2013-05-21 09:55:09 +02:00
Spp 1b6fb2b695 Merge branch 'master' into 4.3.4 [NOTE: There are parts of code marked as "REVIEW - MERGE" That needs some review) 
Conflicts:
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Movement/Spline/MovementTypedefs.h
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp
	src/server/scripts/Spells/spell_generic.cpp
 2013-05-21 09:41:13 +02:00
Spp 82dc639882 Core/Misc: Reduce the scope of ReadMovementInfo (Unit -> Player) 2013-05-21 08:53:44 +02:00
Spp 00c1168897 Core/Misc: Remove trailing whitespace, compile warnings and minor cosmetic changes 2013-05-21 08:37:28 +02:00
Spp d3c2af0f66 Core/Build: Fix compile under Ubuntu 13.04 and openSUSE 12.3 (and probably other new distros) 
Closes #9832
Closes #9740
 2013-05-21 08:36:52 +02:00
Kinzcool 0dc9353746 DB/Triggers: Added "anti-exploration" teleport for Scholomance. 2013-05-19 22:06:09 -04:00
Ascathor 051d6ef925 Core/Command: Rework PInfo and give more output and add Gender to trinity_string 
* Prints out in several strings instead of few
* Leaves unnecessary ones out (e.g. phase for GMs)
* Some code documentation included (including doxygen)
* Cleaner code (partly)
* Prints more content, e.g.:
** Localized Class- and Race names
** Localizable Gender names
** Current experience, required experience
** And more

Shoutouts to @Nay, @Subv, @Shauren and several others from the irc

Core/Command: Rework PInfo and give more output and add Gender to trinity_string
 2013-05-20 03:09:34 +02:00
Gacko b88133b366 DB: Several runtime error fixes 2013-05-20 01:35:02 +02:00
joschiwald 95d2ad32f7 Core/Spells: Fix spell script "spell_yogg_saron_malady_of_the_mind" 
Closes #9813
 2013-05-20 00:13:36 +02:00
Vincent-Michael 1eac9c2944 DB/Creature: Fix startup error (thx Runico) 2013-05-19 23:57:03 +02:00
Nay 383ed042b3 MMAPS: Update mmaps_generator readme.txt with thread info 2013-05-19 20:56:52 +02:00
Nay c33a198f62 Cmake: Fix typo in msvc/settings.cmake 2013-05-19 17:04:57 +02:00
wowpsp 897d5dadff Merge pull request #1 from TrinityCore/master 2013-05-19 04:31:56 -07:00
Shauren 695c8cd7b4 Core/Misc: Another batch of fixes for issues found by static analysis 2013-05-19 11:31:17 +02:00
Shauren 7da33b6bce Core/Misc: Another batch of fixes for issues found by static analysis 2013-05-19 11:15:54 +02:00
Shauren 933f50558b Core/Spells: Fixed channeling spells with infinite duration 2013-05-19 10:55:29 +02:00
Shauren 8633452f8d Scripts/Misc: Fixed many scripts not executing one of their actions because of an event with id = 0 2013-05-19 10:52:39 +02:00
Shauren 8e339e8558 Reverted part of 60a88a08f5 
All 8 bytes must be read from file to match output from vmap4extractor
 2013-05-18 21:33:03 +02:00
Shauren 7058d8bb4c Core/Collision: Corrected logic for closing source file in WorldModel_Raw::Read, fixes resource leak if method succeeds and prevents double free if it fails. 
Closes #9823
 2013-05-18 21:25:26 +02:00
wowpsp 529e8fba82 support 1.12.3 (build 6141) 2013-05-18 22:03:18 +08:00
Shauren d6709ed610 Reverted part of 8be181c7e6 that was not supposed to be pushed 2013-05-18 11:49:46 +02:00
click 612ead5094 Buildsystem/MSVC: Fix a minor issue with /Zm heap allocation parameters not being used 32-bit environment 2013-05-18 10:24:04 +02:00
Subv 6ce9e7f185 Core/Build: Fixed the build 2013-05-17 23:20:47 -05:00
Subv 98ad7309c9 * Another small batch of fixes from static analysis tool. 2013-05-17 23:08:28 -05:00
Subv 60a88a08f5 * Some more static analysis issues fixed. 2013-05-17 22:29:58 -05:00
Subv 1c3121b9cf * Another issue found by static analysis fixed. 2013-05-17 21:56:31 -05:00
Subv 25acef2572 * Batch of fixes for issues found by static analysis. 2013-05-17 21:11:18 -05:00
Nay 7c18bbb95f Merge pull request #9815 from Ascathor/master 
Core: Add "GetRaceNameByID" and "GetClassNameByID" to get localized class and race string.
 2013-05-17 17:52:35 -07:00
dr.skull 4c041ead35 Core/Spells: Added fuzzyEq(_range, 0) condition to AnyGroupedUnitInObjectRangeCheck 
Fix #189

Signed-off-by: dr.skull <dr.skull@centrum.sk>
 2013-05-18 00:34:03 +02:00
Shauren 6d0b14d5f5 Core/Vehicles: Fixed a crash that happened during seat changes searching for a previous free seat 
Closes #9609
 2013-05-17 22:25:47 +02:00
Shauren 7d46703413 Core/Misc: Another batch of fixes for issues found by static analysis 2013-05-17 21:30:02 +02:00
Shauren 8be181c7e6 Core/Misc: Fixed a bunch of issues found by static analysis 2013-05-17 20:39:53 +02:00
Ascathor baa1874f57 Core: Add "GetRaceNameByID" and "GetClassNameByID" to get localized class and race names. 
Core: Add "GetRaceNameByID" and "GetClassNameByID" to get localized class and race names.
 2013-05-17 18:27:09 +02:00
Nay 9b84c8fb98 DB/Characters: Remove guildId from characters table (characters_database.sql only) 
This field was dropped long ago in 1a290f17f5

Thanks to Aokromes for spotting the issue
 2013-05-16 23:28:57 +02:00
Shauren 4f43584af8 Merge pull request #9814 from vlad852/master 
Fix startup errors
 2013-05-16 14:08:33 -07:00
Vlad e823f8d1f7 Fix startup errors. 2013-05-16 23:44:01 +03:00
Nay 60dae46462 Core: Fix compiler warnings 2013-05-16 01:10:53 +01:00
xjose93 0cb615f8f9 Core/Logs: Added more info for .send mail command. 2013-05-15 14:53:58 +02:00
Shauren e0c8020a21 Merge pull request #9800 from horn/yogg_saron 
Scripts/Ulduar: Fix warnings
 2013-05-14 09:33:37 -07:00
horn cd8e6d12fd Scripts/Ulduar: Fix warnings 2013-05-14 18:25:58 +02:00