josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,012 Commits 1 Branch 0 Tags
25d1be5a75acdbc7988b477522a5953c85c5d869
Commit Graph
22012 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
DDuarte 25d1be5a75 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Battlefield/Battlefield.cpp
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Chat/Chat.cpp
	src/server/game/Chat/Chat.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Texts/CreatureTextMgr.cpp
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_halazzi.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
	src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp
	src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.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_thousand_needles.cpp
	src/server/scripts/Kalimdor/zone_ungoro_crater.cpp
 2014-01-10 06:13:26 +00:00
DDuarte 86107a0296 Merge branch 'master' into 4.3.4 2014-01-10 03:16:59 +00:00
Shauren 107af52853 Core/Chat: Refactored building chat packets 
* Moved everything into one specialized method instead of being scattered all over the place
* Allow localizing creature names in chat messages (when using $N)
* Send SMSG_GM_MESSAGECHAT for gm messages
 2013-12-23 14:23:49 +01:00
Malcrom 6402fa02ac Scripting/Storm Peaks: A little work on Quest 13010 Krolmir, Hammer of Storms 2013-12-23 01:31:30 -03:30
Malcrom 8dd3c764fc DB/SAI: Fix a few linking errors. 2013-12-22 22:05:23 -03:30
Malcrom d741335a02 DB/Creature_text: Updated more text from sniff. 2013-12-22 20:18:07 -03:30
Malcrom 8aef1748bf DB/Creature text: Added some missing text from sniff. 2013-12-22 18:38:46 -03:30
Malcrom dde35888f9 DB/Misc: Cleanup some more dup aura errors and fix an SAI. 2013-12-22 15:20:02 -03:30
Malcrom 5055a8fde4 Scripting/Bloodmaul Brute: CombatAI moved to cpp for quest 10512. 2013-12-22 14:41:37 -03:30
Malcrom bc9961ec5c DB/Misc: Fix Typo 2013-12-22 13:06:59 -03:30
Malcrom fe2d21b0ae DB/Creature: Remove double spawn of Talonpriest Skizzik 2013-12-22 13:06:04 -03:30
Malcrom b2c0a3d6d9 DB/quest_template: [FIX] Wrong Previous quest for 12836 Expression of Gratitude from DRJ 
Closes #11334
 2013-12-22 13:01:21 -03:30
Malcrom f29c50ab36 DB/Misc: Moved npc Axle gossip to db. No npc's left with AIName & Scriptname. 2013-12-22 12:57:31 -03:30
Malcrom 34ce605a2c Scripting/DB: Fixed some npcs so they wouldn't have AIName & scriptname. 2013-12-22 11:43:10 -03:30
Malcrom ff1773dedf DB/SAI: Converted a few SAI to use CMC and converted all using Caster Template. 2013-12-22 10:46:56 -03:30
jackpoz d190228112 Merge branch 'master' of github.com:TrinityCore/TrinityCore 2013-12-22 14:00:46 +01:00
jackpoz b0ffbb2179 Core/Auth: Fix expiring account bans 
Fix a database race condition in authserver that would delay the account ban expiry by 1 login because the query that would have removed the ban was executed asynchronously.
 2013-12-22 14:00:14 +01:00
Discover- 42a365af8b DB/SAI: Fix a typo for all comments of smart_scripts using SMART_ACTION_INC_EVENT_PHASE (9ac96fd702). It now properly prints with how much the phase was incremented, instead of always saying it incremented by zero. 2013-12-21 21:03:29 +01:00
Vincent_Michael f31baacb10 SQL: LQS elif emaneR 2013-12-20 23:04:13 +01:00
Vincent_Michael 52a5213e46 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-20 17:26:42 +01:00
Vincent_Michael 736093e91b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/scripts/Kalimdor/zone_silithus.cpp
 2013-12-20 17:26:27 +01:00
Discover- 9ac96fd702 DB/SAI: Convert 28.236 smart_scripts (almost all, like 20 left behind) to proper commenting. Used this tool: https://github.com/Discover-/SAI-Comment-Converter 2013-12-20 14:19:41 +01:00
Malcrom eb57c4fed0 DB/Conditions: Fix a condition in earlier commit 2013-12-20 08:03:47 -03:30
Malcrom b2724cfeba DB/Misc: Fix bad data from sniff parser 2013-12-20 01:58:28 -03:30
Malcrom 06d42afba0 DB/Misc: Update Wintergrasp Battle-Mages 2013-12-20 01:14:14 -03:30
Malcrom 0b7a9a4559 DB/Misc: Three more creature moved to SAI only. 2013-12-19 22:14:24 -03:30
Malcrom d89a3b2fb2 DB/Gossip: Moved Highlord Demitrian gossip to db. 
npc had SmartAI and cpp script.
 2013-12-19 21:23:51 -03:30
Malcrom cc79f279fd DB/SAI: Fix a few more dup aura errors 2013-12-19 17:32:48 -03:30
Malcrom 57332e1d3e DB/SAI: Scripted all ogres in Blades Edge Mountains. 
Sorry I had to remove the awesome cpp script.
 2013-12-19 16:28:08 -03:30
Malcrom 527219e3a9 DB/Misc: Fix a couple capitalization errors 2013-12-19 12:29:04 -03:30
Malcrom 7b5d5ab265 DB/Misc: Two missing paths and two missing Combat AI. 2013-12-19 12:16:15 -03:30
Discover- 61c5857fc6 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore 2013-12-19 10:50:37 +01:00
Discover- c5788de8a4 Core/SAI: Fix another memory leak, thanks to @Xter 2013-12-19 10:50:16 +01:00
Spp 39331ea7b9 Core/Logging: Use logger cache for speed up logger filter search 2013-12-19 10:34:55 +01:00
Discover- e44e932d4d Core/SAI: Fix two memoryleaks in my previous commits. Thanks to @Xter for the notice. 2013-12-19 10:28:45 +01:00
Spp ec62bc6e88 Core/Dungeon Finder: Improve join log message to try to detect cases when one of the selected dungeons is 0 
* Added specialization to all loggers related to lfg (allows to enable "lfg.join" in debug mode and keep all the rest in error)
 2013-12-19 09:39:00 +01:00
Vincent_Michael 2ded11354d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-18 23:48:20 +01:00
Malcrom 18cc075839 DB/Misc: Fixups for Toshley's Station, Blades Edge. 2013-12-18 19:02:22 -03:30
Malcrom cb3825266a DB/SAI: Some SAI updates to remove dup aura errors and some additions. 2013-12-18 18:20:40 -03:30
Malcrom 676baa890f Scripting/Dragonblight: Commander Eligor Dawnbringer now scripted. 
Purely cosmetic but it was a fun thing to script :)
 2013-12-18 18:06:30 -03:30
Discover- e5f7beecf5 Core/SAI: Using SMART_ACTION_FORCE_DESPAWN now despawns the given target_type instead of always the creature itself. 2013-12-18 10:06:19 +01:00
Discover- a0f7fee922 Core/SAI: Fix compile 
Core/SAI: Don't limit SMART_ACTION_SET_INGAME_PHASE_MASK to unit targets only. Thanks to @Shauren for the notice.
 2013-12-17 11:38:29 +01:00
Discover- 154ee466eb Core/SAI: Using the action_type SMART_ACTION_SET_REACT_STATE now sets the react state of the target_type. Won't break any scripts as all current cases of this action_type have target_type 1 (SMART_TARGET_SELF). 2013-12-17 11:10:23 +01:00
Discover- 1f4d585bef Core/SAI: In all npc flag related action_types we now check if the target is a creature instead of an unit (creature/player). 2013-12-17 11:06:07 +01:00
Discover- b5e333255b DB/SAI: Fix two wrong action_types that would make the creature cast the Death Touch spell on no target (SMART_TARGET_NONE) instead of move to given target_x/y/z/o co-ordinates. 
The person who wrote this script accidently used action_type 11 (SMART_ACTION_CAST) instead of 69 (SMART_ACTION_MOVE_TO_POS), and since the action_param1 field of SMART_ACTION_MOVE_TO_POS is the motion id (point id given back to SMART_EVENT_MOVEMENTINFORM), it was set to 5. Ironically, the first parameter of SMART_ACTION_CAST is the spell id and it was spell id 5 is Death Touch.
However this script would do nothing because I changed it so that SMART_TARGET_NONE no longer functioned as SMART_TARGET_ACTION_INVOKER in this commit: 9653576cb4. Before this commit, though, it WOULD cast Death Touch. Fun fun fun.
 2013-12-17 10:23:31 +01:00
Discover- 20a22662df Core/SAI: Using SMART_ACTION_SET_FOLLOW with target_type 0 (SMART_TARGET_NONE) will now stop the following completely. Fixes 6 scripts in a clean TDB already using this functionality even though it wasn't implemented. 2013-12-17 10:12:23 +01:00
Discover- 54b7162f1d Core/SAI: Make SMART_ACTION_SET_INGAME_PHASE_MASK set the phasemask of the target_type instead of always the source calling the action type. 2013-12-17 09:44:06 +01:00
Malcrom 1339d38d4c DB/SAI: Fix some duplicate aura errors and clean up the SAI. 2013-12-16 20:23:29 -03:30
Malcrom b8f9442ec9 Core/Player: Fix logic for questgiver cast spell 2013-12-16 18:50:51 -03:30
jackpoz b3c810a0fb Core/Misc: Fix warning 
Partially revert f0a742a8c4 to fix a warning about unhandled switch case (the same case that Coverity reported as dead code) .
 2013-12-16 19:52:50 +01:00