Commit Graph
100 Commits
Author SHA1 Message Date
Nay 2542c307bc Merge pull request #9027 from Xanvial/TV
[4.3.4] Scripts/Paladin: Templar's Verdict
2013-01-24 06:42:41 -08:00
Nay b1cdb5bb68 Core/Chat: Fix parse handler for CMSG_MESSAGECHAT_ADDON_GUILD and CMSG_MESSAGECHAT_ADDON_BATTLEGROUND 2013-01-24 02:25:00 +00:00
Nay 3a4bb8fae0 TDB 434.03 2013-01-23 05:10:56 +00:00
Nay 11c1eeceed Tools/vmap4_extractor: do not add gcc/clang compile flags when using MSVC and fix a little warning 2013-01-23 00:36:05 +00:00
Nay 61582701f3 Merge pull request #9024 from Xanvial/4.3.4
Scripts/Creature: Hira Snowdawn no longer sells Tome of Cold Weather Fli...
2013-01-22 10:38:09 -08:00
Nay d258c12d73 DB: Rename a sql file since it's a 434 sql file
Note: Please append "_434" to all sql files that are especific to the 4.3.4 branch
2013-01-22 17:07:25 +00:00
Nay 5f5ae0a286 Merge pull request #9015 from NorthStrider/alizabal
Alizabal
2013-01-21 15:11:00 -08:00
Nay 5844ad55ea DB/Schema: rename ip2nationcountries to ip2nationCountries (Linux)
Closes #8947
Thanks Vincent
2013-01-14 14:37:07 +00:00
Nay d4398eaafe TDB 335.50 - 2013/01/14 2013-01-13 18:53:32 +00:00
Nay bc0646e190 DB/Conditions: Fix DB startup errors
Thanks @vlad852
Related to d77904e0af
2013-01-13 18:18:26 +00:00
Nay 03df612645 DB/Wps: Fix one last DB startup error related to waypoint_scripts 2013-01-13 03:02:36 +00:00
Nay 9d1e5a013e Core/Ticket: Fix unassigned message not showing who was assigned to ticket
Thanks to @Bezo
Closes #8923
2013-01-12 18:16:02 +00:00
Nay efa094e893 Merge pull request #8581 from Butterfly69/patch-9
Core/Spells:Beacon of Light
2013-01-10 23:29:51 -08:00
Nay 471cae1251 Merge pull request #8903 from joschiwald/spellscripts_reorder
Misc: Reorder scripts in some script files and some cosmetic stuff
2013-01-10 23:26:21 -08:00
Nay 9da1ff45b7 DB/Addon: Delete 1026 creature_addon rows and overwrite 98 creature_template_addon (phase 2.1)
Conversion done with https://gist.github.com/4505135 (C#)
Thanks to Aokromes for the idea
2013-01-10 19:42:24 +00:00
Nay 0ee5170552 DB/Addon: Delete 4012 redundant creature_addon rows (phase 2)
Conversion done with https://gist.github.com/4504839 (C#)
Thanks to Aokromes for the idea
2013-01-10 19:13:22 +00:00
Nay fd4767bcd0 DB/Addon: Convert 43637 creature_addon rows to 2429 creature_template_addon rows
Conversion done with https://gist.github.com/4504302 (C#)
Thanks to Aokromes for the idea
2013-01-10 18:11:29 +00:00
Nay fff86b7729 DB/SAI: Remove some redundant creature_texts using SMART_ACTION_CALL_FOR_HELP 2013-01-10 15:41:10 +00:00
Nay 8274e42e3d Core/SAI: Add 2nd parameter to SMART_ACTION_CALL_FOR_HELP to say "%s calls for help!" if enabled
Similar to SMART_ACTION_FLEE_FOR_ASSIST "%s attempts to run away in fear!"
2013-01-10 15:09:12 +00:00
Nay d0e4e20265 Merge pull request #8825 from joschiwald/vmapspelligno
Core/VMaps: drop "vmap.ignoreSpellIds" in config
this is not longer necessary since we use SPELL_ATTR2_CAN_TARGET_NOT_IN_LOS
2013-01-07 07:36:40 -08:00
Nay 5f28502c0a Merge pull request #8738 from joschiwald/spell_proc_conditions
Core/Conditions: implement CONDITION_SOURCE_TYPE_SPELL_PROC and use it i...
2013-01-06 18:29:55 -08:00
Nay facefe0909 Merge pull request #8870 from Valcorb/PetSpeedFix
Make sure that "guardians" also gain the owner's speed (such as water elemental)
2013-01-06 16:40:57 -08:00
Nay 82555a444c Core/Spline: Fix typo, I blame not enough Ctrl+S 2013-01-04 23:44:25 +00:00
Nay a509aea659 Core/Misc: Fix a couple of warnings, some of them performance related
Errors were found using Cppcheck, open-source static analysis tool
2013-01-04 23:14:14 +00:00
Nay 8ac5b3b7d6 Core/Player: Prevent a crash in CastedCreatureOrGO and add an assertion to KilledMonster 2013-01-04 21:15:18 +00:00
Nay e5945402ad Core/Misc: Use ASSERT (custom, better macro) instead of the C macro assert() 2013-01-04 20:59:24 +00:00
Nay 9394dc10b4 Core/Scripts: Drop gameobject_scripts table - empty, deprecated and no longer needed 2013-01-03 19:18:26 +00:00
Nay 3375f56bf8 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/scripts/Kalimdor/thousand_needles.cpp
2012-12-28 17:31:39 +00:00
Nay 7ccef51c8c Merge pull request #8518 from ille/goreset
scripts/gameobject: correct reset of gameobjects (cages/prisons), move command out of if statement
2012-12-27 18:50:35 -08:00
Nay 91136ea55f Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Battlegrounds/Battleground.h
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/Commands/cs_reload.cpp
2012-12-27 17:52:11 +00:00
Nay 7fe2d7309a DB/Schema: Rename and change types of a few fields in locales_creature_text and locales_npc_text
locales_creature_text.textGroup -> locales_creature_text.groupid
locales_npc_text.entry -> locales_npc_text.ID
2012-12-27 16:42:05 +00:00
Nay 29f3476947 Merge pull request #8791 from AliveShiro/icehowl
Scripts/Trial of the Crusader: Fix Icehowl Script closes #8539
2012-12-27 08:07:17 -08:00
Nay b530602b96 DB/Schema: Rename locales_quest.entry to locales_quest.Id for consistency with quest_template table 2012-12-27 14:29:05 +00:00
Nay 81fee56bfe Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.h
2012-12-24 22:20:17 +00:00
Nay 368e7113ce DB/Players: Fix message sent when DND is enabled
Closes #8428

Also update some sql file names
2012-12-23 17:54:19 +00:00
Nay 28dffbee11 Core/AuctionHouse: Partially revert 3cf2600688 to keep compatibility with the "AHBot patch"
Note: Trinity needs/wants an auction house bot in the core but for that to happen AHBot needs to be rewritten (possibly using Mango's implementation as a base)
2012-12-18 23:25:31 +00:00
Nay 1bd820e50f Core/Player: Fix build 2012-12-17 01:28:38 +00:00
Nay 377d6c7862 Merge pull request #8131 from flippy84/master
Core/Script: Heigan phase 2
2012-12-16 17:03:26 -08:00
Nay 352ed3ec53 Merge pull request #8667 from Kirkhammett/engi_fix
Core/Script: Fix Dimensional Ripper spell learning
2012-12-16 17:01:48 -08:00
Nay 815742f44d Merge pull request #8681 from xomachine/master
Core/PetAI: Emote and autocast fixes
2012-12-16 16:56:18 -08:00
Nay 388bb43610 DB/World: Correct some waypoint_data and properly add PK to this table 2012-12-14 01:16:14 +00:00
Nay 8798daca0e DB/World: Create a new sql with the code fixed in 294d7c0707, also fix typo 2012-12-14 00:10:54 +00:00
Nay 294d7c0707 DB/World: Fix a typo in file 2012_11_24_03_world_varius_fixes.sql
>ERROR 1264 (22003) at line 359: Out of range value for column 'ConditionTarget'

The above error is only present when using MySQL strict mode (and that is **recommended**)
To enable strict mode add `sql_mode=STRICT_ALL_TABLES` to my.init MySQL configuration file
2012-12-14 00:07:28 +00:00
Nay b9b14652e8 DB/World: Add missing primary keys to 5 tables
Initial patch by @thebillkidy - ref #8646
2012-12-13 00:48:22 +00:00
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