josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,881 Commits 1 Branch 0 Tags
1ab65432a62176e57e19eb08e260382354caffdf
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent-Michael 8bc519a308 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_hexlord.cpp
	src/server/scripts/EasternKingdoms/ZulAman/boss_janalai.cpp
	src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/boss_thekal.cpp
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
 2014-07-23 06:32:44 +02:00
Vincent-Michael 946ab3e8b7 Core: Kill again whitespace :( 2014-07-21 18:14:22 +02:00
Vincent-Michael 4e29cf74b3 Scripts/EasternKingdoms: Burn with fire (hihi) 2014-07-20 19:44:26 +02:00
Vincent-Michael 3b32053c59 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/shared/Utilities/Util.h
 2014-07-20 16:35:35 +02:00
Vincent-Michael e108478d62 Core: Fix non build (gcc) 2014-07-20 04:22:20 +02:00
Vincent-Michael e68d3b0937 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/scripts/Northrend/AzjolNerub/Ahnkahet/boss_elder_nadox.cpp
	src/server/scripts/Northrend/zone_dalaran.cpp
	src/server/shared/Cryptography/Authentication/WorldPacketCrypt.cpp
 2014-07-20 03:06:03 +02:00
Vincent-Michael 0531f52008 Core: Fix non pch build (gcc) 2014-07-20 02:54:12 +02:00
Vincent-Michael 5d5cbf04df DB/Creature: Fix startup errors 2014-07-19 14:14:23 +02:00
Vincent-Michael fbccc58f4a Core/Spells: "Black Magic" can no longer remove after dead 2014-07-19 03:18:05 +02:00
Vincent-Michael 9a2d86f6ae Core/Spells: Fix Quest "The Emissary" 2014-07-19 02:43:15 +02:00
Vincent-Michael 345bed25d2 DB/Conditions: Fix typo in conditions "Sealed Chest" 2014-07-17 02:12:16 +02:00
Vincent-Michael 524cc6c2d9 Core/Battleground: Fix typo and small cleanup (again thx @joschiwald) 2014-07-14 21:31:16 +02:00
Vincent-Michael 06d9d33de3 Core/Battleground: Fix merge fail (thx @joschiwald) 2014-07-14 21:16:19 +02:00
Vincent-Michael 13ff07f121 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/scripts/Commands/cs_wp.cpp
 2014-07-14 21:01:55 +02:00
Vincent-Michael f03617cd0f Core/Creature: Fix problems with neutral innkeepers 2014-07-14 14:13:45 +02:00
Vincent-Michael 6dba04c0cc Scripts/Commands: Fix warnings vs2014 ctp (no support) 2014-07-14 10:53:49 +02:00
Vincent-Michael 9506fd77fc Core: Fix warnings vs2014 ctp (no support) 2014-07-14 01:07:54 +02:00
Vincent-Michael c88c1c6848 Core: Fix warning 2014-07-13 17:26:43 +02:00
Vincent-Michael d920463fe5 Core/AreaTrigger: Remove useful check 2014-07-13 04:13:22 +02:00
Vincent-Michael 877fc267df DB/Player: Update player create info skills for 4.3.4 2014-07-13 00:26:03 +02:00
Vincent-Michael ec263868af Core/Aura: Update InvisibilityType for 4.3.4 2014-07-13 00:08:15 +02:00
Vincent-Michael 0f5c481cd4 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/game/Handlers/SkillHandler.cpp
 2014-07-12 18:08:30 +02:00
Vincent-Michael 3f0ce25d5d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-12 05:09:46 +02:00
Vincent-Michael 2f03e04b87 Core/Player: 
- Fix merge fail
- Fix SkillRaceClassInfo structure
 2014-07-12 04:52:26 +02:00
Vincent-Michael 9a47c17889 Core/Player: Improve error log 2014-07-12 00:52:52 +02:00
Vincent-Michael 1bc482d3d6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DungeonFinding/LFGMgr.cpp
	src/server/scripts/Spells/spell_paladin.cpp
 2014-07-12 00:24:23 +02:00
Vincent-Michael 12e44a36c1 Core/LFG: Fix build for gcc 2014-07-12 00:20:57 +02:00
Vincent-Michael 00a8a9ebb4 Core: Fix warnings with other way 2014-07-11 21:50:49 +02:00
Vincent-Michael c8e75073bf Scripts/Misc: Fix some warnings vs2014 ctp (no support) 2014-07-11 20:24:55 +02:00
Vincent-Michael 29e0538624 Core: Fix some warnings vs2014 ctp (no support) 2014-07-11 20:08:35 +02:00
Vincent-Michael b62ee5eea2 Scripts/BlackTemplate: Fix warnings vs2014 ctp (no support) 2014-07-11 19:42:20 +02:00
Vincent-Michael 6797d78c1b Scripts/Misc: Added missing break in 495ca8c2dc (thx to @ccrs) 2014-07-11 17:36:52 +02:00
Vincent-Michael 4f619eb937 Core/LFG: Fix warning with vs2014 ctp (no support) 2014-07-11 17:04:01 +02:00
Vincent-Michael 495ca8c2dc Scripts/Misc: Fix some warnings with vs2014 ctp (no support) 2014-07-11 16:39:44 +02:00
Vincent-Michael 04c2f6ca14 Core/LFG: Move 2 logs in trace 2014-07-11 10:22:27 +02:00
Vincent-Michael cbcfa73e65 Core/Creature: Implement CREATURE_FLAG_EXTRA_IGNORE_PATHFINDING 2014-07-11 03:08:20 +02:00
Vincent-Michael f185077fbf Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-10 23:10:22 +02:00
Vincent-Michael 1ffb986d59 Core: Fix non pch build 2014-07-10 23:09:13 +02:00
Vincent-Michael bb7233baa3 Core/LFG: Added support for display of required item level. for player / group member 2014-07-10 21:45:11 +02:00
Vincent-Michael 44c0eb4418 DB/Misc: Fix startup errors 2014-07-10 01:45:24 +02:00
Vincent-Michael 8b071221df SQL: Fix wpp fail :/ 2014-07-10 00:51:11 +02:00
Vincent-Michael b817515957 SQL: Fix end of line 2014-07-10 00:43:45 +02:00
Vincent-Michael 823acba5cb DB/Creature: Spawn Agatha for first undead quests 2014-07-10 00:41:55 +02:00
Vincent-Michael 79062dd5ae Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/World/World.cpp
 2014-07-09 21:09:47 +02:00
Vincent-Michael c8eb69df10 Core/Player: Added support cast spell for some class spells (Warlock / Hunter pet, "Battle Stance" and "Frost Presence") on first login... 2014-07-09 20:34:39 +02:00
Vincent-Michael a96771aca6 DB/Creature: Update some wrong creature_template_addon 2014-07-09 13:52:54 +02:00
Vincent-Michael 6a6403a54e Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/scripts/EasternKingdoms/CMakeLists.txt
 2014-07-09 10:23:14 +02:00
Vincent-Michael f9b5cea15c SQL: Sync auth_database 
thx to @Wulfr
Close #12443
 2014-07-08 11:45:46 +02:00
Vincent-Michael e5306b973f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-08 09:26:26 +02:00
Vincent-Michael 7462fa63fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-08 00:14:53 +02:00
Vincent-Michael ba2563da5a Core/Spells: Convert "Shaman T10 Elemental 2P Bonus" in spell script 2014-07-07 21:50:18 +02:00
Vincent-Michael 60bcd6c98c Core/GameObject: GAMEOBJECT_TYPE_SPELL_FOCUS serverOnly == 1 are now invisible (only server) 2014-07-07 21:33:58 +02:00
Vincent-Michael e1a3908c85 SQL: rename now correct ... 2014-07-07 16:52:44 +02:00
Vincent-Michael 3604ca83c1 And github editor sucks too :/ 2014-07-07 16:50:30 +02:00
blub e9b06e416a Rename sql/updates/world/ 2014_07_07_02_world_spell_game_event_creature.sql to sql/updates/world_2014_07_07_02_world_spell_game_event_creature.sql 
Aokromes you sucks :P
 2014-07-07 16:43:23 +02:00
Vincent-Michael cb22fe570d Core/Spells: Add function for modify cooldown 
Thx shauren for helping
 2014-07-07 11:47:29 +02:00
Vincent-Michael 9799a88c8d Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-07 09:58:43 +02:00
Vincent-Michael 79286ef743 TDB 434.6 - 2014/07/05 2014-07-06 00:24:01 +02:00
Vincent-Michael 249e08f830 SQL: Rename for 4.3.4 release 2014-07-05 23:48:27 +02:00
Vincent-Michael 1b02c85c17 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-05 23:44:33 +02:00
Vincent-Michael 8edecb0da6 TDB 335.54 - 2014/07/05 2014-07-05 22:50:21 +02:00
Vincent-Michael 722a5ba7ee Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h
 2014-07-05 20:14:14 +02:00
Vincent-Michael 63784fee2a SQL: Fix end of file 2014-07-05 19:44:31 +02:00
Vincent-Michael a1fb24f5ed Core: Remove again whitespace 2014-07-05 16:05:59 +02:00
Vincent-Michael 7008ac98aa Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-07-05 14:29:12 +02:00
Vincent-Michael a508ce1976 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/Globals/ObjectMgr.cpp
 2014-07-05 14:28:58 +02:00
Vincent-Michael 39140fe1cc DB/Locale: Fix some locales problems 
Preparation for tdb release in soon soon (Fix first db errors) :P
 2014-06-29 23:52:19 +02:00
Vincent-Michael 6d93a0a810 Core/Battleground: Fix merge fail 2014-06-29 17:44:32 +02:00
Vincent-Michael 3cb066f6fd Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaScore.h
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/BattlegroundScore.h
	src/server/game/Handlers/MailHandler.cpp
 2014-06-29 17:32:12 +02:00
Vincent-Michael 88a3344c49 Core: Fix more warnings 2014-06-28 23:25:48 +02:00
Vincent-Michael a3e34f5621 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-28 23:06:10 +02:00
Vincent-Michael d15db5f7ea Core: Fix warnings 2014-06-28 22:43:35 +02:00
Vincent-Michael 5562f61b23 Core: Fix non pch build 2014-06-28 21:35:03 +02:00
Vincent-Michael a260454ad6 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-28 21:08:20 +02:00
Vincent-Michael a660247811 Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-28 21:08:06 +02:00
Vincent-Michael 3b1c659b60 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Battlegrounds/ArenaTeam.h
	src/server/game/Battlegrounds/BattlegroundMgr.cpp
	src/server/game/Battlegrounds/BattlegroundMgr.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
 2014-06-28 21:07:41 +02:00
Vincent-Michael f3de6f0284 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-27 19:39:23 +02:00
Vincent-Michael f94fe58f78 Script/MagistersTerrace: Fix fail in 27f2855248 2014-06-26 23:16:56 +02:00
Vincent-Michael 27f2855248 Core: Fix warnings and kill again whitespace ... 2014-06-26 22:50:06 +02:00
Vincent-Michael e97b6e6403 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-26 19:48:16 +02:00
Vincent-Michael 3a63187b47 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	dep/PackageList.txt
	src/server/game/DataStores/DBCEnums.h
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/DataStores/DBCStores.h
	src/server/game/DataStores/DBCfmt.h
 2014-06-26 00:13:34 +02:00
Vincent-Michael 50cf908d78 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/World/World.h
 2014-06-25 19:51:27 +02:00
Vincent-Michael f825d6b738 SQL: Sync auth_database 2014-06-25 18:40:03 +02:00
Vincent-Michael ec59bf5699 SQL: Rename sql after merge pr 2014-06-24 18:31:28 +02:00
Vincent-Michael f0c366141b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuras.cpp
	src/server/scripts/World/action_ip_logger.cpp
 2014-06-24 18:26:52 +02:00
Vincent-Michael 1ed38faeac Core: Fix merge fail 2014-06-24 00:00:58 +02:00
Vincent-Michael 42c497d8e0 Merge branch '4.3.4' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-23 23:48:15 +02:00
Vincent-Michael d8234bed42 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Accounts/AccountMgr.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
 2014-06-23 23:47:48 +02:00
Vincent-Michael aa93a97546 SQL: Remove bom bom bom bom bom bom bom bom bom bom bom bom bom bom bom bom bom 2014-06-23 23:18:36 +02:00
Vincent-Michael 9bac986f35 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2014-06-22 15:38:22 +02:00
Vincent-Michael caf7e16832 DB/Creature: Added more locales_creature female name for more some language 2014-06-22 00:59:31 +02:00
Vincent-Michael e5606c6f6f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Handlers/CharacterHandler.cpp
 2014-06-22 00:58:08 +02:00
Vincent-Michael ac343c72cc DB/Creature: Fix locales_creature for some language 2014-06-22 00:52:57 +02:00
Vincent-Michael 01094be1d7 Core/Creature: Added missing part in ff9cd652e0 2014-06-21 22:46:51 +02:00
Vincent-Michael ff9cd652e0 Core/Creature: 
- Addet support for female creature name
- Fix some name_loc for deDE
- Added some female name loc for deDe
 2014-06-21 22:40:26 +02:00
Vincent-Michael 1d210bc490 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	dep/PackageList.txt
 2014-06-21 00:07:48 +02:00
Vincent-Michael b102c1c979 SQL: Rename for sync and add missing end of line 2014-06-19 23:01:05 +02:00
Vincent-Michael 910f32d48d 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
 2014-06-19 22:57:44 +02:00
Vincent-Michael dc96fb1cee Core: Fix typo in 316d9a5ce8 2014-06-19 18:51:47 +02:00
Vincent-Michael 316d9a5ce8 Core/Misc: Fix coverity analysis issues 2014-06-19 15:58:33 +02:00