josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,334 Commits 1 Branch 0 Tags
fc6c93d0c4dc15f06c60619fb96a395589d8e67d
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nay f4602811d5 Merge pull request #8483 from kkhugs/4.3.4 
Small levelup health fix with heirlooms
 2012-11-27 08:32:53 -08:00
Nay 5c21480431 Merge pull request #8435 from Warpten/434 
434: Enable a few opcodes
 2012-11-25 06:27:38 -08:00
Nay 0591c468ac Core/SAI: Add more details to an error log 2012-11-24 23:49:48 +00:00
Nay 12c9d0d466 Merge pull request #8359 from Warpten/calendarRo 
Core/Calendar: Minor change.
 2012-11-19 13:59:56 -08:00
Nay 27cf98dac1 Scripts/AQ: Fix non PCH build 2012-11-19 01:02:31 +00:00
Nay 4294ccf95d Misc: Whitespace and tabs cleanup 2012-11-19 01:00:47 +00:00
Nay 47fcf4ce58 Merge pull request #8330 from MrSmite/PetAI_TargetSelect 
[Core/Pet] PetAI_TargetSelect
 2012-11-18 13:52:58 -08:00
Nay bb8e31d1bd Merge pull request #8259 from Warpten/supLion 
Scripts/Ruby Sanctum: Tweaks and stuff.
 2012-11-18 13:51:58 -08:00
Nay 6f0a8040d8 Core/SpellMgr: Replace magic number by constant 
Thanks 2010phenix
 2012-10-13 17:36:19 +02:00
Nay c25a0bac72 Merge pull request #8053 from tibbi/rep_fix 
renaming GetBaseReputation used for offline players
 2012-10-12 16:29:13 -07:00
Nay d67adf0c9e Merge pull request #8066 from Warpten/halionUpdate 
Scripts/Ruby Sanctum:
 2012-10-12 16:28:08 -07:00
Nay e60aafcf35 Merge pull request #8065 from MrSmite/PetAI_Cleanup_1 
PetAI Cleanup
 2012-10-12 16:27:35 -07:00
Nay abe81119b4 Core/Script: Fix item unusual compass. 
By Kaelima and Retriman

Closes #8039
 2012-10-12 01:28:37 +02:00
Nay 5e1b744261 Merge pull request #8048 from Tuxity/battlegrounds_stuff 
[434] Battlegrounds
 2012-10-11 16:24:21 -07:00
Nay a3aebf7790 Merge pull request #8005 from tibbi/sota 
correcting SotA demolisher spawn, adding preparation buff to 2nd round t...
 2012-10-08 16:35:05 -07:00
Nay e7a4a316c9 Merge pull request #8025 from gigatotem/4.3.4 
[4.3.4] PVP Trinkets
 2012-10-08 16:34:39 -07:00
Nay bd8f953020 Merge pull request #8023 from Nexflame/4.3.4 
Fix Compile
 2012-10-08 12:59:15 -07:00
Nay 0fe1c10484 Merge pull request #8000 from gigatotem/master 
Spells/Hunter: Readiness
 2012-10-07 17:55:21 -07: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
Nay 99175e066c Core/Utils: Add asserts to irand, urand and frand 
max should always be higher or equal than min
notice that SFMT was already covering these cases and it would return 0, -1 or min
 2012-10-07 12:55:51 +01:00
Nay d641775a1f Core/Traps: Remove hardcoded cooldown value of 1 and use startDelay instead, as per Kaelima suggestion 
startDelay is 1 for all hunter traps

Fix non PCH build (boss_elder_madox.cpp)
Remove a double parentheses in LFGGroupScript
 2012-10-06 17:01:29 +01:00
Nay d27a3955f0 Core/Misc: Tabs to spaces and whitespace cleanup 2012-10-06 16:55:01 +01:00
Nay 6497bea601 Merge pull request #7987 from CeIa/master 
Core/Script: Iron assemby encounter
 2012-10-06 08:46:45 -07:00
Nay e369742dc7 SQL: Rename SQLs from 65c6b89d01 2012-10-06 16:44:35 +01:00
Nay 65c6b89d01 Merge pull request #7970 from Retriman/DungeonsSII 
Core/Script: Dungeon Ahnkahet Boss Elder Nadox.
 2012-10-06 08:42:32 -07:00
Nay 0edd7f4459 Merge pull request #7981 from Retriman/SpellTi 
Core/Spell: Traps Hunter.
 2012-10-06 08:41:13 -07:00
Nay bf9fa12314 Merge pull request #7984 from Retriman/DungeonFinderTI 
Core/DF: Fix deserter in Dungeon Finder
 2012-10-06 08:40:37 -07:00
Nay 880a9d5cda Merge pull request #7954 from Retriman/Nexus 
Core/Script: Dungeon Nexus Boss Anomalus
Closes #7946
 2012-10-03 04:43:22 -07:00
Nay 469291166c Merge pull request #7919 from Retriman/master 
DB: Fix SounID in Herald Volazj
 2012-09-30 09:13:01 -07:00
Nay 990bef2bff SQL: Rename SQL merged in PR 2012-09-30 16:34:06 +01:00
Nay 97163a2496 Merge pull request #7918 from Retriman/master 
Core/Script:  Update creature_text for boss Herald Volazj
 2012-09-30 08:32:59 -07:00
Nay 94c8c7ec4e Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Battlefield/BattlefieldMgr.h
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
 2012-09-30 15:46:00 +01:00
Nay 8ac05aff2d SQL: Rename SQL merged in PR 2012-09-30 15:43:05 +01:00
Nay 39dba3f22f Merge pull request #7891 from tibbi/title_converter 
adding Title converter to faction converter, original author Silinoron
 2012-09-30 07:40:51 -07:00
Nay 0eb86ac370 Merge pull request #7896 from tibbi/wsg 
some WSG improvements
 2012-09-30 07:38:20 -07:00
Nay 8a18449a74 SQL: Rename file merged in PR; Core: cleanup whitespace and tabs 2012-09-30 15:33:56 +01:00
Nay 31901e57b9 Merge pull request #7911 from Retriman/master 
Core/Script: Update creature_text for boss Elder Nadox
 2012-09-30 05:10:31 -07:00
Nay 35412ddc3c Merge pull request #7892 from Tuxity/holyPower434 
[434] Holy power handler
 2012-09-30 05:10:08 -07:00
Nay b5b9bb52d2 Merge pull request #7909 from durotar/master 
Core/Script: update creature_text for boss Mimiron
 2012-09-29 12:20:28 -07:00
Nay 460fd87eef Merge pull request #7904 from Sovak/compile_2 
Core/Build: Fix compile
 2012-09-29 04:47:24 -07:00
Nay a7fd0825f7 Merge pull request #7890 from durotar/master 
Core/Script: update creature_text for Custodian of Time (quest 10277)
 2012-09-27 13:07:21 -07:00
Nay 8fc42b16ec Merge pull request #7886 from tibbi/transport_visibility 
Correctly update visibility for transports, author GriffonHeart
Closes #7132
Closes #6395
 2012-09-27 02:53:17 -07:00
Nay 9004580ee6 DB/Misc: fix the fix of the fix of her fix 2012-09-26 21:25:14 +01:00
Nay a83af13ded Fix bad characters in a sql file 2012-09-26 16:50:12 +01:00
Nay 424ac73766 Core/Spells: Properly (hopefully) merge 335's Beacon of Light + 434 changes (also fixes build) 
Closes #7871
Closes #7872
 2012-09-25 19:58:18 +01:00
Nay 15c05ed771 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2012-09-25 09:26:48 +01:00
Nay 1f79ac8c30 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-23 22:17:12 +01:00
Nay a7386bd1b3 Scripts: Fix some code style issues in scripts 2012-09-23 22:16:28 +01:00
Nay 91fd408446 Merge pull request #7842 from Elron103/pull-requests2 
Core/GameObject: Implement method GetDisplayId, use it for GameObjectModels
 2012-09-23 07:49:18 -07:00
Nay e4d08c1186 Merge pull request #7555 from Gacko/quest11648 
Core: Quest - The art of persuasion
 2012-09-23 07:48:40 -07:00
Nay 6576d1a93c Merge pull request #7854 from Gacko/utgarde 
Core: Utgarde Keep - Last corrections
 2012-09-23 07:47:10 -07:00
Nay 95d713ac6f Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-22 10:56:41 +01:00
Nay 5faa9d37b4 Merge pull request #7835 from Geodar/master 
[DB/GameEvents] Correct length of Brewfest event
 2012-09-22 02:41:36 -07:00
Nay 53cd8cf684 Rename SQL after PR merge 2012-09-22 02:07:19 +01:00
Nay 435a240a9f Merge pull request #7551 from Gacko/utgarde 
Utgarde Keep
 2012-09-21 18:05:11 -07:00
Nay 7090197c6a Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Spells/Auras/SpellAuras.cpp
 2012-09-22 02:02:57 +01:00
Nay 1f03439fc2 Merge pull request #7820 from Trista/master 
DB/Achievements: Dwarfageddon (10/25) repair previous fix
 2012-09-19 11:16:05 -07:00
Nay 139cdf5254 Small correction to readme file 2012-09-18 23:58:39 +01:00
Nay 92119c9c38 Small correction to readme file 2012-09-18 23:49:35 +01:00
Nay 6568b0624d Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Object/Updates/UpdateFields.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_druid.cpp
 2012-09-17 23:49:13 +01:00
Nay 2e21fa6b92 Core/Dependencies: Update ACE to v6.1.4 (Windows only) 
Tested in multiple configurations
.diff with TC changes added
 2012-09-17 23:21:01 +01:00
Nay e3add09fb7 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
 2012-09-17 00:03:12 +01:00
Nay d6b60ce51c Merge pull request #7782 from Trista/master 
DB/Skettis: Remove uneeded additions from previous commit and add con…
 2012-09-15 14:16:13 -07:00
Nay e7155144df Merge pull request #7781 from Sovak/resists 
Core/Auras: Fix some spells with effect
 2012-09-15 13:57:29 -07:00
Nay a95511f35e (TDB 335.49) Also move 4.x-only SQLs to the old directory 2012-09-15 21:18:23 +01:00
Nay 06f96f47e7 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/old/3.3.5a/2012_08_06_00_world_command.sql
	sql/old/3.3.5a/2012_08_07_00_characters_characters.sql
	sql/old/4.3.4/2012_08_06_00_world_command_434.sql
	sql/updates/characters/2012_08_07_00_characters_characters.sql
	sql/updates/characters/2012_08_07_00_characters_characters_434.sql
	sql/updates/world/2012_08_06_00_world_command.sql
 2012-09-15 21:13:35 +01:00
Nay 0d3554d4bf TDB 335.49 - 2012/09/15 2012-09-15 21:03:40 +01: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
Nay 7b3ea36c8c Merge pull request #7777 from Trista/master 
Scripts/Oculus: Support for achievements Ruby, Emerald and Amber Void
 2012-09-15 07:44:49 -07:00
Nay 01139ecd38 Merge pull request #7768 from MacWarrior/master 
Fields ID description in GameEventMgr.cpp
 2012-09-14 11:16:05 -07:00
Nay b9b344eb88 Merge pull request #7766 from Faq/Misc0 
DB/SAI: correct Fix npc Scrapped Fel Reaver. thnx Expecto
 2012-09-14 09:05:51 -07:00
Nay 8249a43cf2 Fix build 2012-09-13 18:29:32 +01: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
Nay b9434b6377 Merge pull request #7753 from Faq/ScrollOfRecall 
Core/Spells: Scroll of Recall
 2012-09-13 07:03:57 -07:00
Nay b34d6f5784 DB&Scripts: Corrections to pull request #7750 
Closes ##7750
 2012-09-13 15:01:19 +01:00
Nay 97a7775c9b Merge pull request #7747 from Elron103/pull-requests 
Core/Mail: Fix merging of items taken from mail leading to invalid entries in item_instance
 2012-09-13 06:28:04 -07:00
Nay 7b08ea5df7 Core/PacketIO: Correct status for SMSG_VOID_* opcs, thanks Horn for noticing it 2012-09-12 18:00:15 +01:00
Nay cfb7ec0efb Merge pull request #7734 from AFROM/patch-1 
Update src/server/game/Events/GameEventMgr.cpp
 2012-09-11 15:14:34 -07:00
Nay b015ed0a99 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-11 22:38:59 +01:00
Nay 64cadf9470 Merge pull request #7733 from CrYser/4.3.4 
[4.3.4]Core/Spells: Glyph of might
 2012-09-11 14:38:01 -07:00
Nay f83ae98a39 Merge pull request #7732 from Tuxity/defenseWeaponSkills434 
[434] Defense and weapon skills
 2012-09-11 14:37:50 -07:00
Nay 78d0fac217 Merge pull request #7731 from w1sht0l1v3/ToCr2 
Core/Scripts: Anub'Arak encounter changes and fixes.
 2012-09-11 13:19:34 -07:00
Nay b075d8cca7 Core/Loot: Re-fix structure of SMSG_LOOT_MONEY_NOTIFY 2012-09-11 01:40:58 +01:00
Nay f236db6b26 Fix build, thanks Vincent 2012-09-11 01:31:55 +01:00
Nay 6a1f4f1da0 Resolve merge issues and cleanup whitespace 2012-09-11 01:19:11 +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
Nay 21a4f8e088 Rename SQL and update characters_database.sql 2012-09-10 11:56:37 +01:00
Nay 4fb6101c6e Merge pull request #7693 from Warpten/guildFinder 
Core/Guilds: Implemented guild finder.
 2012-09-10 03:44:08 -07:00
Nay 1458a006b8 Siigh 2012-09-10 02:11:21 +01:00
Nay 0a81824772 DB/Guilds: Add missing reward table 2012-09-10 02:10:28 +01:00
Nay d97d125618 Move a SQL file 2012-09-10 02:04:21 +01:00
Nay d6743c7c95 Merge remote-tracking branch 'origin/master' into 4.3.4 
Conflicts:
	sql/updates/world/2012_09_09_02_world_spell_script_names.sql
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
 2012-09-10 00:52:35 +01:00
Nay 5963d02750 SQL: Update characters_database.sql 2012-09-10 00:41:35 +01:00
Nay de0c9dac00 Core/Guild: pakcet -> packet 2012-09-10 00:31:15 +01:00
Nay 5226f53b8a Core/Guilds: Corrections to guild news & rewards commit, fixed build and added missing sql 
Closes #7708
 2012-09-10 00:06:47 +01:00
Nay 6bc3d113a9 Merge pull request #7706 from Sovak/bgs_2 
Core/Battlegrounds: Fixed 2 more structures
 2012-09-09 04:21:50 -07:00
Nay 8a88994a82 Fix a merge failure, I need to sleep... 2012-09-09 03:05:45 +01: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
Nay 8f853095f4 Merge pull request #7703 from myran2/PR1 
Core/Commands: .unstuck command
 2012-09-08 16:03:15 -07:00