Nico/Viano-Core
1
0 Fork 0
Code Issues Pull Requests Actions 16 Packages Projects Releases Wiki Activity
20,105 Commits 2 Branches 1 Tag
f976c730a0da936647b79eea6440159266bc2d54
Commit Graph
2785 Commits
Author SHA1 Message Date
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
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
Gacko e9d7b53e6d Fix some creature text runtime errors 2013-04-16 20:29:24 +02:00
Shauren efaa29dac7 Merge pull request #9632 from joschiwald/scriptfix 
Scripts/Quest: Fix "Massacre At Light's" after recent vehicle changes an...
 2013-04-12 12:49:11 -07:00
joschiwald c0303c82bf Scripts/Quest: Fix "Massacre At Light's" after recent vehicle changes and drop some silly code 
Closes #9448
 2013-04-12 21:21:30 +02:00
Shauren 24a7a6f965 Scripts/Pit of Saron: Changed Overlord's Brand script to be safer 
Closes #9125
 2013-04-12 17:54:40 +02:00
Gacko 852e8e720c Script: Remove unnecessary constant 2013-04-12 17:36:47 +02:00
Gacko 96ad520ea3 Script/Spell: Apply Frost Imbued Blade only in 25 man mode 
Note: Quest credit spells are already casted in 25 man mode only.
 2013-04-12 17:36:47 +02:00
Pitcrawler 6521b1aad6 DB/SAI: Convert a core script to SAI. Fixes issues when abandoning the quest. 
Thanks @dr-j for the initial work.
 2013-04-11 02:14:49 +02:00
Warpten 65ecb27a6e Merge pull request #9009 from Souler/fix_mage_rof 
[4.3.4] Spells/Mage: Ring of Frost
 2013-04-09 16:11:45 -07:00
Shauren 12a828fdbc Core/Movement 
* Implemented a generic way of sending movement packets depending on who controls the unit (player or server controlled)
* Added possibility to specify extra elements in movement packets (such as speed, extra passenger guid, collision height and similar) without having to add a special element only for these
* Removed Unit::SendMovementFlagUpdate as it was something working only in 3.3.5a and earlier (no serverside HEARTBEAT opcode exists now)
 2013-04-09 17:24:39 +02:00
Souler 895a4dd352 Spells/Mage: Ring of Frost 2013-04-08 21:37:57 +02:00
Shauren 3e32caa593 Scripts/Ulduar: Fixed crashes with Kologarn using Stone Grip 2013-04-07 16:02:00 +02:00
kandera abbe692d72 Core/Cleanup: cleanup tabs and change them to spaces 2013-04-03 18:22:22 -04:00
Shauren 1ba6d0ce6f Core/Units: Started work on updating movement (main goal: remove SendMovementFlagUpdate()) 2013-04-03 20:13:33 +02:00
kandera ad38ecaf98 Core/Battlefield: Fix the invisible wall at the end of wintergrasp Closes #9422 
DB/Strings: fix the error messages from the spirit guides Author Nastrand #9035
 2013-04-03 09:03:19 -04:00
kandera 9aebfaf722 DB/Commands: fix the use of gobject info when used with a game object entry 2013-04-03 03:37:56 -04:00
Pitcrawler 294fac60a0 DB/Quests: Fix It Was The Orcs, Honest! Closes #2037 2013-04-02 01:06:19 +02:00
Gacko d89626f767 Script/Event: Fix warnings in Children's Week script 2013-04-01 17:52:20 +02:00
Spp c97c381ea0 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Object/Object.h
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/shared/Packets/ByteBuffer.h
 2013-03-25 14:34:22 +01:00
Spp 1a6a23ec96 Core/Misc: Minor optimizations (+code changes to reduce differences with 4.3.4 branch) 
Core/Logging: Create new logger type "Cheat". Will be used to log all cheat attempts
 2013-03-25 13:26:48 +01:00
Spp 7c36e3a298 Core/Misc: Minor optimizations (+ code changes to reduce differences with 4.3.4 branch) 2013-03-25 10:36:30 +01:00
Gacko ccb95c7462 Script/Spell: Apply Shadow's Fate to Sindragosa 
Sindgragosa is summoned in instance script and would not pass the modified check otherwise

Related to: #9487
 2013-03-22 21:36:25 +01:00
Vincent_Michael 15a249e28c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Pet/Pet.h
	src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Kalimdor/zone_azshara.cpp
 2013-03-21 22:00:01 +01:00
Spp 156fb824a4 Core/Scripts: Removed CAST_CRE define 2013-03-21 13:48:36 +01:00
Spp 355029fb4f Core/Scripts: Removed CAST_PLR define 2013-03-21 13:07:10 +01:00