Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-21 01:37:37 +01:00
Code Issues Packages Projects Releases Wiki Activity
20,184 Commits 4 Branches 146 Tags
a50eec9439cb5003546a6abe9d8b8a9cb3b5ce4c
Commit Graph

2809 Commits

Author SHA1 Message Date
Shauren
a50eec9439 Fixed merge errors 2013-05-30 21:23:11 +02:00
Shauren
adb78862da Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_misc.cpp
 2013-05-30 20:57:07 +02:00
Spp
9664c0ab5c Core/Misc: Another batch of fixes for issues found by static analysis 2013-05-30 13:18:29 +02:00
Shauren
80226fb38f Scripts/Halls of Reflection: Fixed a possible crash 2013-05-28 15:18:37 +02:00
Pitcrawler
379d41735c DB/Quests: Fix some remaining issues from aaa1d9b749 
For example the missing floating visual and prevent the script from being started more than once.
 2013-05-27 14:29:46 +02:00
Gacko
583d865c24 Script/Gundrak: Codestyle 2013-05-26 21:58:03 +02:00
Shocker
dc81fa0d57 CMake: Include AreaTrigger directory in CMake files 2013-05-26 05:07:49 +03:00
xjose93
5a7cebe114 Scripts/Gundrak: Fix Gal'darah door. 2013-05-24 22:27:34 +02:00
Shauren
b688fc0ed5 Compile fix 2013-05-24 20:36:29 +02:00
Shauren
b8d75db4f1 Scripts/Halls of Reflection: Fixed gauntlet event 2013-05-24 20:06:58 +02:00
Shauren
bda68d3f9d Core/Commands: Fixed wrong field types used in db queries for pinfo command and output alive state if target is offline 2013-05-24 18:31:19 +02:00
Shauren
fd0397cbd2 Scripts/Halls of Reflection: Fixed a few possible crashes and cleaned up the code a bit 2013-05-24 18:03:07 +02:00
Vincent-Michael
a00d61485c Core: Fix warnings 2013-05-24 17:39:30 +02:00
Vincent-Michael
76e7ba886b Core: Fix logic fail in 77743ea13e 2013-05-24 17:28:17 +02:00
Vincent-Michael
77743ea13e Core: Fix non pch build 2013-05-24 17:12:06 +02:00
Aokromes
1136d90bac Scripts/Halls of Reflection: Falric/Marwyn 
This is a Work in Progress script by WishToDie based on the work found at http://www.trinitycore.org/f/topic/7192-patch-halls-of-reflections/
 2013-05-24 10:09:00 +02:00
Shocker
03aa05a799 Actually fix compile 
(sorry about the multitude of commits)
 2013-05-22 02:26:21 +03:00
Shocker
0ae066254d Another missing include 2013-05-22 01:39:22 +03:00
Shocker
0b8ad579df Compile fix after recent merge 2013-05-22 01:29:04 +03: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
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
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
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
00c1168897 Core/Misc: Remove trailing whitespace, compile warnings and minor cosmetic changes 2013-05-21 08:37:28 +02: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
joschiwald
95d2ad32f7 Core/Spells: Fix spell script "spell_yogg_saron_malady_of_the_mind" 
Closes #9813
 2013-05-20 00:13:36 +02: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
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
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
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
Nay
60dae46462 Core: Fix compiler warnings 2013-05-16 01:10:53 +01:00
horn
cd8e6d12fd Scripts/Ulduar: Fix warnings 2013-05-14 18:25:58 +02:00
Shauren
823924c061 Merge pull request #9799 from xjose93/DamageGO 
Core/Commands: Improve .damage command, now can damage destructible gameobjects => ".damage go <guid> <damage>"
 2013-05-14 09:09:07 -07:00
xjose93
e858057eff Core/Commands: Improve .damage command, now can damage destructible gameobjects => ".damage go <guid> <damage>" 2013-05-14 18:07:13 +02:00
horn
0a0698b1d4 Scripts/Ulduar: Yogg-Saron 
Known issues:
- encounter doesn't start immediately after you enter the room, you need to go closer
- players standing outside of the room are not turned Insane after 15 seconds
- encounter resets if the last living player is gripped by Constrictor Tentacle or encased in Hodir's Flash Freeze
- Hodir won't freeze multiple players when they die at the same moment
- Flash Freeze missile (64176) won't hit anybody, probably cast too soon (cosmetic issue)
- there are some unused spells, don't know when or why they should be cast
- some spell animations hit multiple players, but they shouldn't do that
 2013-05-14 17:52:37 +02:00
Spp
d1677b2db0 Core/Logging: Performance-related tweaks to logging system 
All sLog->out* functions (except outCommand atm) are replaced with TC_LOG_* macros.
    Memleak fix
 2013-05-13 15:07:36 +02:00
Spp
243c325ca4 Core: Declare some functions const and remove use of "using" directive in a couple of files 2013-05-13 15:04:05 +02:00
illusion
f4b83273ec Core/Tickets 
* Fixed .ticket complete command not marking tickets as completed
* Fixed "Need more help" button functionality after ticket has been answered by a GM

Closes #9383
 2013-05-11 11:19:57 +02:00
xjose93
f2b6b2f95e Core/Commands: Improve .character rename [name], now can force rename .character rename [name] [newName] 2013-04-29 11:26:54 +02:00
Aokromes
e486cd7623 Merge pull request #9662 from xjose93/GuildRename 
Guild rename
 2013-04-27 05:02:07 -07:00
Shauren
4537d4082e Scripts/Commands: Corrected queried database for ip2nation in .pinfo command 2013-04-22 17:37:13 +02:00
Shauren
bd69c9ad49 Merge branch 'pr/n9655_Bezo' 2013-04-22 15:54:46 +02:00
Bezo
7542049eba [Ip2nationLock] Implement the ip2nation lock country. 2013-04-22 15:53:48 +02:00
xjose93
678cade116 Core/Commands: rename guilds (.guild rename "old guildname" "new guildname") 2013-04-19 23:21:23 +02:00