josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,406 Commits 1 Branch 0 Tags
adc4b3b46b0dd9bf7684ce292270b00e4c4fd8a6
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent_Michael adc4b3b46b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/ChatHandler.cpp
 2014-02-04 17:28:31 +01:00
Vincent_Michael 6b4e476111 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-02-01 21:18:28 +01:00
Vincent_Michael 822092ea15 DB/Creature: Fix warnings with creature_formations loading 2014-02-01 18:04:54 +01:00
Vincent_Michael 224da47952 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/scripts/Spells/spell_dk.cpp
 2014-01-31 23:51:07 +01:00
Vincent_Michael a7c15e7368 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-01-27 23:13:53 +01:00
Vincent_Michael 4567faa34b SQL: Rename in correct name 2014-01-27 23:12:45 +01:00
Vincent_Michael df6f300542 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Spells/spell_paladin.cpp
 2014-01-27 18:44:07 +01:00
Vincent_Michael ec020ea048 SQL: Rename in correct name 2014-01-27 06:26:48 +01:00
Vincent_Michael 7cc4828554 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Spell.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warrior.cpp
 2014-01-26 18:22:06 +01:00
Vincent_Michael 79a2a0c434 Core/Spell: Fix logic fail in 96ae4caf62 2014-01-26 16:42:02 +01:00
Vincent_Michael 96ae4caf62 Core/Spells: Fix typo in 955fb907c5 2014-01-26 03:56:41 +01:00
Vincent_Michael 955fb907c5 Core: Fix warnings 2014-01-26 03:48:33 +01:00
Vincent_Michael c6650ecc71 Core/Spells: Move Pilgrims Bounty BuffFood in AuraScript (mimimi) 2014-01-25 16:28:29 +01:00
Vincent_Michael bdc150ebbd Core/Spells: Move Pilgrims Bounty BuffFood in AuraScript 2014-01-24 19:48:15 +01:00
Vincent_Michael a5ade26fa0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp
	src/server/scripts/Spells/spell_rogue.cpp
 2014-01-24 19:36:32 +01:00
Vincent_Michael 9531073b77 Scripts: Gossip can crash with null instance 2014-01-24 17:08:17 +01:00
Vincent_Michael abc1effd80 Core: Fix non pch build 2014-01-24 06:19:52 +01:00
Vincent_Michael 46e1b93c2b Scripts: A lots of changes here and there (maybe useless?!?) 2014-01-23 22:54:01 +01:00
Vincent_Michael b61bf8f01f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jeklik.cpp
 2014-01-23 19:23:17 +01:00
Vincent_Michael f1e1a5cad0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-01-22 14:28:40 +01:00
Vincent_Michael 516a6344fe Misc: Fix warnings 2014-01-22 07:31:37 +01:00
Vincent_Michael 3f99890b12 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Unit/Unit.h
 2014-01-21 21:58:30 +01:00
Vincent_Michael 7c4a16e6c2 Core/Mail: Fix SMSG_SHOW_MAILBOX opcode 
thx to Zori
 2014-01-21 21:51:39 +01:00
Vincent_Michael 101ac7f511 Misc: Minor cosmetic changes here and there 2014-01-21 20:20:38 +01:00
Vincent_Michael d4479d9413 Missing changes in 313b294d6b 2014-01-19 21:10:41 +01:00
Vincent_Michael 7e527f9075 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.h
	src/server/game/Server/Protocol/Opcodes.cpp
 2014-01-19 20:52:16 +01:00
Vincent_Michael 313b294d6b Core/RBAC: Fix difference problems with 4.3.4 2014-01-19 20:48:15 +01:00
Vincent_Michael 93a97a9922 Core: Fix warning 2014-01-18 21:31:47 +01:00
Vincent_Michael e26dcbe2f5 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_misc.cpp
 2014-01-18 20:43:06 +01:00
Vincent_Michael 20c3eebfa7 Fix revert fail in ad8c046916 2014-01-18 20:31:41 +01:00
Vincent_Michael ad8c046916 Core/Revert: ... 2014-01-18 01:36:12 +01:00
Vincent_Michael 3276a786cc Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-01-18 01:03:24 +01:00
Vincent_Michael 4027686b5b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Handlers/ItemHandler.cpp
 2014-01-18 01:01:11 +01:00
Vincent_Michael f2fd1e3b2a Revert "Build/CMake: Enabled c++11 on gcc for testing purposes." 
This reverts commit 0e58f5ad24.
 2014-01-13 21:14:03 +01:00
Vincent_Michael cc85d1b5b7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/World/npcs_special.cpp
	src/server/worldserver/worldserver.conf.dist
 2014-01-13 20:34:21 +01:00
Vincent_Michael a73e8511f9 Fix non pch build 2014-01-12 02:02:02 +01:00
Vincent_Michael 0214db9bf5 Fix build 2014-01-12 00:59:05 +01:00
Vincent_Michael e773c9a693 Update more copyright note for 2014. 
I have no excuse for my fail :/
 2014-01-01 18:20:16 +01:00
Vincent_Michael 20004050bc Update copyright note for 2014. 
Happy new year.
 2014-01-01 00:07:53 +01:00
Vincent_Michael f31baacb10 SQL: LQS elif emaneR 2013-12-20 23:04:13 +01:00
Vincent_Michael 8658b5338c Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw 
Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/PathGenerator.cpp
 2013-12-20 17:39: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
Vincent_Michael 2ded11354d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-18 23:48:20 +01:00
Vincent_Michael f7aedaef33 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Spells/SpellInfo.h
	src/server/game/World/World.cpp
 2013-12-15 03:47:21 +01:00
Vincent_Michael 506ddbbf40 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-12 19:36:48 +01:00
Vincent_Michael bb62a9180d Core: Fix build 2013-12-11 20:48:40 +01:00
Vincent_Michael 07024d3ea8 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCEnums.h
	src/server/scripts/Commands/cs_wp.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo.cpp
 2013-12-11 20:34:44 +01:00
Vincent_Michael fb26e18523 Core: Fix warnings 2013-12-11 20:30:15 +01:00
Vincent_Michael ee5c47f1af Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-09 23:48:41 +01:00
Vincent_Michael b76d141ce0 Core: Fix warning 2013-12-08 20:53:06 +01:00
Vincent_Michael 89f381b1ff Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-12-08 20:28:12 +01:00
Vincent_Michael e8be55aa8b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/CoreAI/TotemAI.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/Guild.h
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.cpp
	src/server/game/Movement/Spline/MovementPacketBuilder.h
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp
	src/server/scripts/Kalimdor/zone_mulgore.cpp
	src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
 2013-12-08 20:27:46 +01:00
Vincent_Michael 2ed05e487d Core: Fix non pch build 2013-12-08 02:06:55 +01:00
Vincent_Michael c2984e3dbc Core/RBAC: Fix typo 2013-12-04 22:35:44 +01:00
Vincent_Michael 1bb4cf3ab6 Core/Misc: Removed more unused eventAI stuff 2013-12-01 02:06:37 +01:00
Vincent_Michael 59e4be69f4 Core/RBAC: Added missing changes in 6e13263c7a 2013-12-01 01:30:01 +01:00
Vincent_Michael 6e13263c7a Core/AI: Good bye, Good bye my beloved EventAI system :( 2013-12-01 01:27:08 +01:00
Vincent_Michael ff1d9eec02 DB/SAI: Fix db startup error 2013-11-27 20:10:53 +01:00
Vincent_Michael b069ade49b DB/Loot: Fix pilgrims bounty loot for cooking book 2013-11-25 19:50:23 +01:00
Vincent_Michael 7cd21549f6 Core: Fix build 2013-11-24 22:48:47 +01:00
Vincent_Michael d4d4eb3123 Misc/Misc: A mix useless random changes 2013-11-24 20:54:28 +01:00
Vincent_Michael 9fd70663ab SQL: Fix import error 2013-11-15 23:23:21 +01:00
Vincent_Michael cbc9870b4a SQL: Fix import errors 2013-11-14 21:01:03 +01:00
Vincent_Michael 9802c7b891 Scripts/Misc: Coding Style unification? (by Aokromes) 2013-10-22 20:24:05 +02:00
Vincent_Michael 8d6aec608f Core/Spells: Fix warning 2013-10-20 00:40:20 +02:00
Vincent_Michael d0948f572b Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw 2013-10-19 04:23:45 +02:00
Vincent_Michael 5915a220a5 Misc: Removed some whitespace 2013-10-19 03:39:58 +02:00
Vincent_Michael 59caeb8b49 DB/Gossip: Added some missing gossips (Source: 5.4.0 sniffs) 2013-10-19 03:24:59 +02:00
Vincent_Michael 77013aa081 Core: Fix warnings 2013-10-18 13:31:09 +02:00
Vincent_Michael 47741f4fa6 Core/Object: Added more information for MovePosition log 2013-10-18 12:36:54 +02:00
Vincent_Michael 94161a8341 Core/Creature: Added log/change back to default speed for speed walk / run = 0 (Speed is never zero) 2013-10-18 12:35:11 +02:00
Vincent_Michael ddada2d182 Scripted/ScarletMonastery: Fix crash for headless horseman 2013-10-18 12:25:50 +02:00
Vincent-Michael a0b3863bd1 SQL: Update auth base 2013-10-17 12:17:47 +02:00
Vincent-Michael 9128088877 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-10-15 23:35:40 +02:00
Vincent-Michael 6d562b1248 Fix typo (thx to vlad852) 2013-10-10 07:31:42 +02:00
Vincent-Michael cc9671af90 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps_rw 2013-10-09 23:15:53 +02:00
Vincent-Michael 904fa5b47b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-10-09 23:14:16 +02:00
Vincent-Michael 4588294dd8 Fix some db errors ... (Yippie-Ya-Yeah) 2013-10-09 23:13:26 +02:00
Vincent-Michael 3611d82e62 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
 2013-09-23 22:58:29 +02:00
Vincent-Michael 20d070172b Core/Logs: Random changes 2013-09-23 22:55:35 +02:00
Vincent-Michael f2dff3da38 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
 2013-09-22 15:31:21 +02:00
Vincent-Michael 2b9b2a7388 DB/GameObject: Added gameobject "Dark Iron Mole Machine (Minion Summoner Trap)" 2013-09-20 13:16:04 +02:00
Vincent-Michael eab10cc6ae Core/Achievement: Fix warning 2013-09-18 23:47:35 +02:00
blub ded94a41b2 Merge pull request #10874 from zorix/PR1 
Core/Script:
 2013-09-18 14:37:00 -07:00
Vincent-Michael 8af46f1c57 Core: Fix non pch build 2013-09-18 23:15:25 +02:00
Vincent-Michael e740332c0b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-09-15 23:20:13 +02:00
Vincent-Michael b3d7b04714 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-09-14 23:10:32 +02:00
Vincent-Michael 85e49d0d14 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/worldserver/worldserver.conf.dist
 2013-09-13 23:21:50 +02:00
Vincent-Michael 974bf5c427 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Accounts/RBAC.h
	src/server/game/Battlegrounds/ArenaTeam.cpp
 2013-09-11 22:35:45 +02:00
Vincent-Michael 653ff9b243 Core/RBAC: Update RBACPermissions enum with 4.3.4 branch 2013-09-10 19:55:06 +02:00
Vincent-Michael 5583bcfeea Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Commands/cs_misc.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Commands/cs_reload.cpp
 2013-09-10 19:53:43 +02:00
Vincent-Michael a5bcab16a9 DB/Creature: Removed hack in 356ba1e0ce 2013-09-10 18:55:03 +02:00
Vincent-Michael ce742dc7a0 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
	src/server/game/Guilds/Guild.cpp
 2013-09-09 18:26:31 +02:00
Vincent-Michael fab0f461c0 Core/Condition: Added CONDITION_SOURCE_TYPE_PHASE_DEFINITION define for only 4.3.4 branch 2013-09-07 00:16:10 +02:00
Vincent-Michael be75ddc2bd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/scripts/Commands/cs_npc.cpp
 2013-09-06 21:55:19 +02:00
Vincent-Michael bc1a079b6c Core/SAI: Fix typo (i blame germans laziness) 2013-09-06 21:40:04 +02:00
Vincent-Michael d25c2e7f5b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/AI/SmartScripts/SmartScriptMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Spells/SpellMgr.cpp
	src/tools/map_extractor/loadlib.cpp
 2013-09-05 16:46:14 +02:00
Vincent-Michael 458f5b9502 Core/SAI: Added SMART_ACTION_SUMMON_CREA / SMART_ACTION_SUMMON_GO log for has already summon spell 2013-09-05 16:16:23 +02:00
Vincent-Michael 6514e21b7c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/tools/map_extractor/System.cpp
 2013-09-03 21:03:09 +02:00