Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 8 Packages Projects Releases Wiki Activity
18,159 Commits 2 Branches 1 Tag
a0c8193ee7be188a0951ce6ee0bdafb1dee41e71
Commit Graph
299 Commits
Author SHA1 Message Date
Spp a0c8193ee7 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Handlers/BattleGroundHandler.cpp
 2012-11-16 08:51:15 +01:00
kaelima 3c3d4f4c99 Script/Commands: Reimplemented ".lookup map" command. 2012-11-13 15:56:15 +01:00
Spp f53a04add0 Core/Scripts: Added Worgen and Goblin races to .pinfo command. 2012-11-12 10:31:56 +01:00
Spp 333b8e5159 Core/Build: Enable Clang PCH support and OS X specific features 
Core: Fix warnings here and there
 2012-11-09 13:13:45 +01:00
Spp c97fc99e16 Merge branch 'master' into 4.3.4 
Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Guilds/GuildMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
 2012-10-30 10:30:05 +01:00
Spp 9074c11a90 Core/Dungeon Finder: Update "Current group roles" according to people in queue. 
Core/Dungeon Finder: Properly update internal lfg group structure at server load
 2012-10-29 20:13:42 +01:00
Spp 14027262ee Core/Dungeon Finder: Add some more debug msgs and restore LFG group structure at server load. 2012-10-29 13:58:48 +01:00
Spp 876ad50dcd Core/Misc: Tweaked ThreatContainer internals 
(and many cosmetic changes here and there)
 2012-10-26 14:31:19 +02:00
Spp 013fb1f4d9 Core/Misc: reduced amount of string memory allocations (Step I) 2012-10-24 15:34:48 +02:00
Spp 60d4343d8e Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Spells/Spell.cpp
	src/server/shared/Logging/Appender.h
 2012-10-23 14:16:05 +02:00
Spp 1be638e731 Core/Dungeon Finder: Add debugging commands 2012-10-23 11:44:02 +02:00
Spp 67118c6999 Fix compile under windows 2012-10-16 18:43:21 +02:00
Spp 14dab1f893 Fix compile without pch 2012-10-16 09:35:15 +02: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
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 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
tibbi 5896da6689 some optimization + adding level to CharacterNameData 2012-10-08 17:21:09 +01:00
Nay 44c2edee51 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Spells/SpellMgr.cpp
 2012-10-07 14:57:18 +01:00
kaelima 8c013955ac Core/Misc: Fix some possible issues detected by static code analysis 2012-10-07 01:31:43 +02:00
Spp f570383fba Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Transport/Transport.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.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/SpellInfo.cpp
 2012-10-04 13:33:04 +02:00
Spp 7831ecdb18 Core: "Initial support for C++11 compilers" 2012-10-02 15:06:19 +02:00
Spp f8846cdeaf Core/Utilities: Do not expose internal store structure in Tokens and rename it to Tokenizer 2012-10-02 11:54:41 +02:00
Shocker 993fb5b4a6 Core/Spells: Fix SPELL_AURA_MOD_CURRENCY_GAIN 2012-09-21 01:02:18 +03:00
Spp 761060e1f1 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Spells/Spell.cpp
 2012-09-18 14:38:44 +02:00
Spp 8c5f011e79 Core/Achievements: Force all calls to AchievementMgr be done through Player functions (Remove GetAchievementMgr) 
Note: No real use in 3.3.5 but will be used in 4.3.4
 2012-09-18 14:29:53 +02:00
Nay 966283168c Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Globals/ObjectMgr.cpp
 2012-09-15 19:50:11 +01:00
Shauren 130cc423d2 Scripts/Commands: Fixed crashes in unstuck command 
Closes #7754
 2012-09-13 23:58:45 +02:00
Nay 528b9d4f7d Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/Entities/Item/ItemPrototype.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/shared/Packets/ByteBuffer.h
 2012-09-13 17:24:37 +01:00
Myran2 13e140cfac Core/Commands: Added a command that shows what cheat commands you have active 
Closes #7721

(Modified)
 2012-09-13 15:32:33 +01:00
Nay 68e0ef8039 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.h
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Object/ObjectDefines.h
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Groups/Group.h
	src/server/game/Guilds/Guild.h
	src/server/game/Instances/InstanceScript.h
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/Spline/MoveSplineFlag.h
	src/server/game/OutdoorPvP/OutdoorPvP.h
	src/server/game/Quests/QuestDef.h
	src/server/game/Spells/Spell.h
	src/server/game/Spells/SpellInfo.h
 2012-09-11 01:11:14 +01:00
Spp 358c6a26d6 Core: Warning fixes (Also some -pedantic under game folder) 2012-09-10 13:04:31 +02:00
Warpten 917ffc030e Core/Guilds: Implemented GuildFinder. 2012-09-10 12:41:42 +02:00
Nay 7c4e7a9ebc Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/CharacterHandler.cpp
 2012-09-09 02:18:58 +01:00
Nay d04f155b65 Corrections to previous merged in PR 2012-09-09 00:10:23 +01:00
Myran2 c243185a3a Removed a line of debug code 2012-09-08 19:01:33 -04:00
Myran2 5cd9910463 Core/Commands: Replaced .start with a new command, .unstuck. Usage information can be found by typing .unstuck in-game 2012-09-08 18:59:06 -04:00
Nay 7da92908b8 Scripts/Commands: Fix .reload creature_template # (4.3.4 branch) 2012-09-05 19:55:55 +01:00
Nay ca440756a8 Scripts/Commands: Fix .reload creature_template # 2012-09-05 19:50:09 +01:00
Nay 73172c67f0 Misc: Convert from CRLF to LF in cs_misc.cpp 
Also cleanedup whitespace
 2012-09-04 16:14:15 +01:00
Shauren 10c9f0d0ed Scripts/Commands: Fixed compile 2012-09-02 18:40:08 +02:00
Nay 2e1de60593 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/worldserver/worldserver.conf.dist
 2012-09-01 22:19:13 +01:00
Myran2 908ae08a0a Scripts/Commands: Create a new group of commands, .cheat, and add new and move old commands to it: 
Changes:
- .explorecheat is now .cheat explore
- .waterwalk is now .cheat waterwalk
- .taxicheat is now .cheat taxi

New commands:
- .cheat god
- .cheat casttime
- .cheat cooldown
- .cheat power

(Descriptions available in the SQL file / in-game)

Inspiration on ArcEmu commands
Closes #7569
 2012-08-31 01:26:21 +01:00
Nay d61f3131fb Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
	src/server/scripts/Kalimdor/silithus.cpp
	src/server/shared/DataStores/DBCFileLoader.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/wdtfile.cpp
 2012-08-30 23:06:19 +01:00
Nay abbb896cfb Core: Fix many "errors"/warnings and coding style (2) 
Scripts; also reverted a change to AuthSocket

Errors were found using Cppcheck, open-source static analysis tool
 2012-08-30 22:44:03 +01:00
Nay e3ea3b28bd Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/worldserver/worldserver.conf.dist
 2012-08-21 23:40:38 +01:00
Spp 984493108b Core/Logging: Fix incorrect error level for some warden messages 
Core/Logging: Fix incorrect filter type for many network messages
Core/Logging: Use OPCODE filter type for network messages related to wrong packets
 2012-08-21 22:12:55 +02:00
Shauren 7dc26c7ff7 Core/Misc: Warning fixes 2012-08-21 18:20:42 +02:00