Commit Graph
100 Commits
Author SHA1 Message Date
Nay 8ef1bda36b SQL: Update 2013_02_18_00_world_misc_equip.sql
Fix "column `id` in field list is ambiguous"
Thanks Guybrush

*Should* not have caused any issues but warnings are bad.
2013-03-07 01:48:34 +00:00
Nay 37101c82d3 Fix typo introduced in previous commit 2013-03-02 16:54:19 +00:00
Nay 943610cbca Core/Loading: Fix CreatureLoadTemplates and add missing fields to WORLD_SEL_CREATURE_TEMPLATE 2013-03-02 16:41:04 +00:00
Nay 1a1c53d889 Core/Loading: Fix LoadCreatureTemplates 2013-02-27 08:05:51 +00:00
Nay 4ea31ce886 Core&SQL: Fix typos (RBAC and equips related) 2013-02-26 23:49:21 +00:00
Nay 3b1410e798 Core/Player: Rename PLAYER_FLAGS_UNK19 to PLAYER_FLAGS_UBER 2013-02-26 20:58:13 +00:00
Nay b10aa126c7 Core/BossAI: Fix a typo in CheckBoundary
Method was using "me" (the boss) instead of the function's argument

Props to @Horn for finding the 4 year's old error

Ref #7194
2013-02-26 02:34:45 +00:00
Nay b00f6a981e Merge pull request #9295 from horn/summons
Script/Commands: Make creature_summon_groups table reloadable.
2013-02-25 17:17:53 -08:00
Nay cf58f5a075 Core: Fix a comment in LoadConfigSettings
Closes #9292
2013-02-24 16:54:02 +00:00
Nay 65258666e0 Core/NPCs: Fix some equipment issues introduced with 028c72a9f2
Also changed equips defaults to 0 (no equipment) instead of 1.

It seems that some parts of the original commit were reverted locally, my bad.
2013-02-20 01:17:27 +00:00
Nay 4e59dab703 Core/DBLayer: Comment out MySQL client/server version mismatch warning
MySQL version above 5.1 IS required in both client and server and there is no known issue with different versions above 5.1
2013-02-20 01:17:26 +00:00
Nay 4540a1d24b Merge pull request #9168 from Kirkhammett/Ebonroc_Bwl
Npc/Core: Was using Onyxia's Wing Buffet spell which can 1 shot lowbies...
2013-02-19 15:11:27 -08:00
Nay 03f97f75ec Core/Startup: Write current and expected maps version when there's a version mismatch 2013-02-19 01:16:24 +00:00
Nay 037c912bb5 Core/ObjectMgr: Fix a logic error in GetEquipmentInfo
Thanks @Shauren
2013-02-19 00:18:00 +00:00
Nay e7dbb4296c Scripts/Spells: Fix Winter Veil PX-238
Ref #9238
Thanks @joschiwald
2013-02-18 22:15:58 +00:00
Nay 0d5dece43a Merge pull request #9244 from Ascathor/master
SQL Fix after 933381f
2013-02-18 14:14:02 -08:00
Nay 028c72a9f2 Core/NPCs: Refactor equipments
- creature_template.equipment_id deleted
- creature_equip_template.entry == creature_template.entry
- id field added to creature_equip_template -> PK(entry, id)
- id field in creature_equip_template starts at 1
- creature.equipment_id references id of creature_equip_template
- creature.equipment_id = 0 means no equipment at all (default 1)
- creature.equipment_id = -1 means pick a random equipment from creature_equip_template
- add equipment info to .npc info command

While table creature_equip_template got bigger in size, this system is easier to mantain and allows creatures to have a random template from a group of equipments
2013-02-18 12:24:18 +00:00
Nay 87d4e8c067 Core/Config: Change CONFIG_EVENT_ANNOUNCE from int to bool
Also correct the description of BeepAtStart, it works in Windows as well
2013-02-18 12:20:00 +00:00
Nay fab33f0774 SQLs: Rename some old SQL files to match standards 2013-02-17 21:11:45 +00:00
Nay f2b48ba008 Merge pull request #9220 from roc13x/master
Core/Items: Fix logic in Player::AddItem
2013-02-17 06:32:54 -08:00
Nay a126259a39 Merge pull request #9234 from ak47sigh/patch-1
declared WEATHER_STATE_FOG
2013-02-17 06:32:15 -08:00
Nay 2d861b71ce Core/SAI: Add actions to set/add/remove (104/105/106) gameobject flags 2013-02-16 18:42:26 +00:00
Nay f95ce01b15 Scripts/BWL: Fix build 2013-02-16 17:12:10 +00:00
Nay a614dd775c Say NO to whitespace 2013-02-16 17:04:44 +00:00
Nay e448d24f2b Merge pull request #9228 from gigatotem/BWLv2
Scripts/Blackwing Lair: Broodlord Lashlayer clean-up.
2013-02-16 08:58:26 -08:00
Nay 2277f6db44 TDB 434.04 2013-02-15 17:10:24 +00:00
Nay f086ee0b96 SQL: Rename files since they are 4.3.4 only 2013-02-15 17:09:03 +00:00
Nay 82ff367be8 Merge remote-tracking branch 'origin/master' into 4.3.4 2013-02-15 17:07:50 +00:00
Nay e685b7bd9e TDB 335.51 - 2013/02/14
Ref #8947
Closes #9077
2013-02-15 17:00:09 +00:00
Nay db0b81e8e7 Core/RealmSocket: Remove a not required #ifndef MSG_NOSIGNAL / #define MSG_NOSIGNAL 0
Somewhere in ACE overloads of send(), flags are default'ed  to 0 if not provided
2013-02-11 03:33:02 +00:00
Nay 12359b993d DB/NPCs: Set trigger flags_extra to a bunch of quest credit markers
God damn Aokromes, always making me do work and stuff...
2013-02-11 03:10:02 +00:00
Nay 42e660e2a2 Core/Sockets: Always try to send MSG_NOSIGNAL in peer().send()
Fixes RASocket::authenticate crash

"MSG_NOSIGNAL:
If you send() to a remote host which is no longer recv()ing, you'll typically get the signal SIGPIPE. Adding this flag prevents that signal from being raised."

Closes #5040
Thanks to @derex for the hint
2013-02-11 02:59:37 +00:00
Nay 984e1feadf Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Server/WorldSocket.cpp
2013-02-09 20:33:30 +00:00
Nay e33f70c002 DB/Quests: Fix quest The Collapse and Deploy the Shake-n-Quake
Ref #1005
Ref #2034
Ref ae30704847
Closes #3595
2013-02-09 15:13:49 +00:00
Nay f902362ad1 Core/DBLayer: Avoid a crash when calling mysql_get_server_version if connection was not open 2013-02-08 23:06:25 +00:00
Nay c4d285828a Merge pull request #9166 from thomas33/typo
Core/Scripts: Coding style
2013-02-08 10:07:05 -08:00
Nay 0b3170c228 Core/Player: Fix a query that was wrongly deleting items
CHAR_DEL_ITEM_INSTANCE deletes by item guid but in Player::DeleteFromDB the guid being used was player's guid.
That means that if player with guid 100 was deleted, the item with guid 100 would also be deleted. This item could or could not belong to the player.

Closes #8883
Closes #9136

Thanks to @vlad852 for finding the issue
2013-02-06 13:17:21 +00:00
Nay 8f6e9dc85c DB/Commands: Fix RBAC commands (remove an extra dot) 2013-02-04 20:25:18 +00:00
Nay 2a69143cec DB/Characters: Update sql/base/characters_database.sql 2013-02-04 16:22:43 +00:00
Nay 735419965c DB/Auth: Update sql/base/auth_database.sql 2013-02-04 16:08:45 +00:00
Nay 7eb3c36dba Merge pull request #9132 from Regigicas/crashlog
Update WheatyExceptionReport to printf Windows 8
2013-02-03 05:52:26 -08:00
Nay 55fc0c58af DB/Schema: Change engine and collation of world.lfg_entrances
latin1 -> utf8_general_ci
InnoDB -> MyISAM
(defaults for all `world` DB tables)
2013-02-03 01:37:23 +00:00
Nay 0e945613d0 Core/Spells: Correct a check in IsLootCrafting, allows Prismatic Black Diamond to be fixed (a very peculiar spell...)
The following conversation led to this fix: http://paste2.org/p/2816385 (for reference)
2013-02-01 04:52:06 +00:00
Nay 261e482a66 Merge pull request #9103 from Norfik/authdb
DB/Auth: Fix typo in sql/base/auth_database.sql
2013-01-30 06:05:17 -08:00
Nay 5151c57b18 Merge remote-tracking branch 'origin/master' into 4.3.4 2013-01-30 01:33:46 +00:00
Nay 92d92df809 Core/Object: Re-add a line that somehow got removed in a merge
Thanks Warpten for noticing
2013-01-30 01:33:12 +00:00
Nay 0281497573 DB/Loot: Fix 9 drop chance in gameobject_template (7 quests should be fixed by this)
If a GO with flags 4 drops a quest item, ChanceOrQuestChance for that items needs to be negative

Query used to find the issue:
```
SELECT * FROM `gameobject_loot_template`
    WHERE (`item` IN (SELECT `questItem1` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem2` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem3` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem4` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem5` FROM `gameobject_template` WHERE (`flags` & 4) != 0) OR
           `item` IN (SELECT `questItem6` FROM `gameobject_template` WHERE (`flags` & 4) != 0)) AND
          `ChanceOrQuestChance` > 0;
```
2013-01-29 23:48:39 +00:00
Nay 4aa4fce89a Merge remote-tracking branch 'origin/master' into 4.3.4 2013-01-29 03:34:10 +00:00
Nay 1b180e683e Core&DB/Trainers: Remove trainer_spell from creature_template since it is not longer necessary on Cata 2013-01-29 02:25:24 +00:00
Nay 112c2a8dd0 Core/Misc: Fix a merge failure in SpellAuraEffects.cpp
Thanks Tuxity and Vincent
2013-01-28 12:53:51 +00:00
Nay 98f01c2b12 Core/Misc: Fix compile errors introduced in previous merge
There are probably other merge issues that got through, please report them
2013-01-28 02:54:27 +00:00
Nay b404e0bec1 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	dep/PackageList.txt
	src/server/game/Battlegrounds/Battleground.cpp
	src/server/game/Combat/ThreatManager.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/World/World.cpp
	src/server/game/World/World.h
	src/server/scripts/EasternKingdoms/ZulGurub/boss_arlokk.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
	src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h
	src/server/scripts/Spells/spell_druid.cpp
	src/server/scripts/Spells/spell_mage.cpp
	src/server/scripts/Spells/spell_paladin.cpp
	src/server/scripts/Spells/spell_priest.cpp
	src/server/scripts/Spells/spell_rogue.cpp
	src/server/scripts/Spells/spell_shaman.cpp
	src/server/scripts/Spells/spell_warlock.cpp
	src/server/scripts/Spells/spell_warrior.cpp
	src/tools/map_extractor/CMakeLists.txt
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/loadlib.cpp
	src/tools/map_extractor/mpq_libmpq.cpp
	src/tools/map_extractor/mpq_libmpq04.h
	src/tools/vmap4_assembler/CMakeLists.txt
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/mpq_libmpq.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
2013-01-28 01:04:37 +00:00
Nay 3a6a02547c Update sql/updates/world/2013_01_26_07_world_gameobject_template.sql 2013-01-27 04:06:12 +00:00
Nay 1b551cc157 Scripts/Commands: Add guild info to .pinfo
Original patch by @secharles, modified

Closes #8946
2013-01-26 21:33:13 +00:00
Nay 18f5de77c3 Core/GossipDef: Fix a build error from 9812afe08b
*slaps MrSmite*
2013-01-26 17:48:47 +00:00
Nay 9812afe08b Merge pull request #9063 from MrSmite/QuestLevelsInUi
Option to show quest levels in dialogs
2013-01-26 09:23:58 -08:00
Nay 670f80fa39 Merge pull request #9056 from thomas33/typo
fix typo
2013-01-25 03:48:32 -08:00
Nay a3c9e67731 Merge pull request #8953 from MrSmite/PetAI_PassiveCastFix
Fix passive pets not using spells when commanded to attack
2013-01-24 08:55:31 -08:00
Nay c757d24c5a Merge pull request #8978 from Naios/sai_timed_cond
Core/SmartScripts: Check Conditions also for timed Events
2013-01-24 08:50:51 -08:00
Nay 526bb51696 Merge pull request #9049 from springfieldking/master
Fix crash when wordserver startup
2013-01-24 06:45:51 -08:00
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 40a470c669 Merge pull request #9037 from krofna/crefixes
Fix error when swapping unique equipped weapon on dual wield
2013-01-24 06:39:50 -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 4f3c6b1390 Core: Yet another warning fix
@Kaelima: could you verify MoveCharge?
2013-01-22 20:47:52 +00:00
Nay 6fc17c6b1e Core: Fix compile warnings 2013-01-22 19:34:27 +00:00
Nay bd893b4516 Tools/MeshExtractor: Fix warnings 2013-01-22 18:41:26 +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 7a74f68c0d Tools/MapExtractor: Fix displaying of a few counts in Windows
%zu works fine on GCC/Linux, but fails in MSVC/Windows
2013-01-22 18:14:32 +00: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 864a85b8fc DB/mmaps: Rename mmap commands related sql 2013-01-22 15:03:26 +00:00
Nay 3a256b244d Merge pull request #9008 from krofna/krefixes
Too small buffer fail
2013-01-22 06:54:51 -08:00
Nay 5f5ae0a286 Merge pull request #9015 from NorthStrider/alizabal
Alizabal
2013-01-21 15:11:00 -08:00
Nay 3cb80f206e Core/Config: Set mmaps disabled by default 2013-01-21 20:45:09 +00:00
Nay ebded74eee Merge remote-tracking branch 'origin/master' into mmaps 2013-01-21 20:42:02 +00:00
Nay 3523d84a91 Shooting myself in 3... 2... 2013-01-21 02:34:43 +00:00
Nay 2363552655 Scripts/ZG: Fix a warning and a compile error introduced in previous commit
Personal opinion: BossAI should not have a public field named "instance"
2013-01-21 02:24:25 +00:00
Nay c6c23d67b8 Scripts/ZG: Fix some code style issues and logic errors 2013-01-21 02:10:01 +00:00
Nay f4907e92aa Merge pull request #8961 from joschiwald/spellscripts3
Core/Spells: convert some spells to SpellScripts
2013-01-20 08:45:23 -08:00
Nay 5844ad55ea DB/Schema: rename ip2nationcountries to ip2nationCountries (Linux)
Closes #8947
Thanks Vincent
2013-01-14 14:37:07 +00:00
Nay e6a07076c3 Merge remote-tracking branch 'origin/master' into mmaps
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
2013-01-14 13:58:34 +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 32e08bcd12 Tools/Extractor: Fix yet another typo in ADT. Fixes extracting.
Closes #8900
2013-01-13 02:11:21 +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