Commit Graph

4380 Commits

Author SHA1 Message Date
NTX 7bd358f5a0 Core/Opcodes: Fix CMSG_REORDER_CHARACTERS 2012-08-22 23:18:06 +02:00
Nay e3ea3b28bd Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Groups/Group.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/worldserver/worldserver.conf.dist
2012-08-21 23:40:38 +01:00
Nay 5a812562f3 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-21 13:57:57 +01:00
Faq e550f24ec4 rename 2012-08-21 11:01:19 +03:00
Faq 291b0899c5 Merge remote-tracking branch 'upstream/master' into SpellMasks_0 2012-08-21 10:58:15 +03:00
Nay 354e46d9e0 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/tools/vmap4_extractor/mpq_libmpq04.h
2012-08-20 22:04:57 +01:00
Nay 9e0907874e Core: Fix 4 warnings / SQL: Rename two SQL files 2012-08-20 21:54:36 +01:00
Shocker ff85ebe632 Fix Didn't Stand a Chance achievement 2012-08-20 13:29:52 -04:00
Kandera 09192e23c1 Sql/Wintergrasp: add sql files for wintergrasp implementation 2012-08-20 13:21:53 -04:00
Nay 11652278df Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/tools/vmap4_extractor/vmapexport.cpp
2012-08-20 16:08:27 +01:00
Nay 30933a7f50 SQL: Rename a wrong file 2012-08-20 16:06:17 +01:00
Nay 460f42849f DB/Schema: Increase size of quest_template.RequiredRaces to mediumint
needed because Worgen race is 1 << (22-1)
2012-08-20 14:58:22 +01:00
Faq 28c0874873 Core/Spells: Fixed Libram of Wracking. thnx Vincent-Michael
Closes #7094
2012-08-20 10:59:35 +02:00
Vincent-Michael 3a25fdeade DB/Spells:
* Fix spell target for 68184
* Add missing 'Resilience Will Fix It - achievement credit marker' (spell id 68620) to spell_dbc
2012-08-19 20:06:15 +02:00
Faq 453158fe9d DB/Loot: Some loot contents imported from UDB. Author Helias 2012-08-19 19:54:46 +03:00
Nay 4e46f7ced6 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Item/ItemEnchantmentMgr.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Loot/LootMgr.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/worldserver/worldserver.conf.dist
2012-08-18 17:13:46 +01:00
Vincent-Michael 19cec23f39 DB/Spells: Fix a typo in 7b9ed5afdd (thx Destalker) 2012-08-17 15:43:42 +02:00
Vincent-Michael 7b9ed5afdd DB/Spells: Add missing Invisibility (spell id 35009) to spell_dbc 2012-08-16 21:42:00 +02:00
Greymane 759e73c78f Core/Spells:
* Implemented aura 328 SPELL_AURA_PROC_ON_POWER_AMOUNT.
* Added eclipse power energize handling.

Closes #7417
2012-08-16 19:55:01 +01:00
Nay a465a43da0 SQL: Move all world sql updates to /old/ directory. Base DB is available in https://github.com/TrinityCore/TrinityCore_4.3.4_DB_Alpha
From now on, this repository should only contain core related sqls
Aforementioned repository will be synced with this one from time to time and will include DB related content
2012-08-16 00:07:29 +01:00
Nay ca879e96b0 Core/Loading: Fix a field type when loading reputation_spillover_template
Also whitespace cleanup
2012-08-15 21:22:29 +01:00
Nay 0289f2e1bb DB/Schema: Change RewardFactionValueIdOverride to int(11)
Core change is not needed, it's reading an Int32 already
2012-08-15 20:51:28 +01:00
Nay 1cca24440b DB/Schema: Remove a meaningless index in quest_poi, update PKs for npc_vendor tables 2012-08-15 19:11:45 +01:00
Nay a29a79e6d7 SQL: Comment out a sql file that would error with sql-mode strict 2012-08-15 18:12:18 +01:00
Nay 53a2b86228 Core&DB: Increase the size of MinLevel and MaxLevel to int16 2012-08-15 18:00:41 +01:00
Nay c29eb1f87a Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-15 16:33:00 +01:00
Vincent-Michael 0f40869627 DB/Creature: Add Missing spawn for Mistcaller Soo-gan 2012-08-14 20:15:27 +02:00
Nay c0adf370e5 Core/Vendors: Add currencies to vendors
npc_vendor table gets a new field, type (1 is item, 2 is currency)
for type 1 fields still mean the same, for type 2 maxcount is buycount (without any "precision")

changed structure of SMSG_UPDATE_CURRENCY(_WEEK_LIMIT) but not enabled, wrong values are being wrongly calculated
2012-08-14 18:11:06 +01:00
Nay 79a2165e27 Merge pull request #7398 from Vincent-Michael/onyxiaCreatureText
Scripts/Onyxias Lair: Convert script_texts in creature_text
2012-08-14 09:39:50 -07:00
Vincent-Michael a896fa8e76 Scripts/Onyxias Lair: Convert script_texts in creature_text 2012-08-14 18:10:54 +02:00
Nay 731b0cc587 Merge pull request #7390 from Kiperr/2
Core/Player: Now players will able to equip all types of relics when mee...
2012-08-13 17:10:26 -07:00
kiper 12ad39c43c Fix code style. 2012-08-14 02:08:29 +02:00
Nay 2c4de60a66 Merge pull request #7389 from Kiperr/4.3.4
Core/Globals: Add 5th field in reputation_spillover_template for Bilgewa...
2012-08-13 17:00:34 -07:00
kiper cf30a0aaaf Core/Player: Now players will able to equip all types of relics when meet requirements from items and have relic skill. 2012-08-14 01:59:20 +02:00
Venugh c8eeb1f9e6 Core/AI: Removed EventAI handling. is not needed more for cataclysm...
move a sql to correct place.
2012-08-14 01:57:42 +02:00
kiper 0b157c9066 Core/Globals: Add 5th field in reputation_spillover_template for Bilgewater Cartel/Gilneas spillover reputation. 2012-08-14 01:49:18 +02:00
Nay 424d860454 DB&Core/Quests: Change MinLevel to signed since -1 is a valid value for deprecated quests 2012-08-13 23:59:14 +01:00
Vincent-Michael c9f4866648 Scripts/Trial Of The Crusader:
* Fix typo
* Fix creature_text group id for King Varian Wrynn / Garrosh Hellscream
2012-08-14 00:01:39 +02:00
Vincent-Michael d1071d6e81 Scripts/Trial of the Crusader: Convert script_texts in creature_text 2012-08-13 22:15:22 +02:00
Subv 61fcae113b Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	src/server/scripts/Kalimdor/moonglade.cpp
2012-08-12 13:18:19 -05:00
Subv 7d75c2818d Scripts/Quests: Removed some deprecated scripts and fixed quest 26050 2012-08-12 12:20:51 -05:00
Vincent-Michael f61df4d223 Scripts/Some: Cleanup for old scripts, not exist Quest and etc. in Cata. 2012-08-12 18:28:06 +02:00
Nay bd37e73fdf SQL: Rename 2 PR'ed SQL files 2012-08-12 17:19:47 +01:00
Nay b33d41faac Merge pull request #7360 from Vincent-Michael/MalGanis
Scripts/The Culling of Stratholme: Fix quest credit for Mal'Ganis
2012-08-12 08:59:49 -07:00
Vincent-Michael da229008bb Scripts/The Culling of Stratholme: Fix quest credit for Mal'Ganis 2012-08-12 14:12:44 +02:00
Nay a55f00a2ad Update sql/base/auth_database.sql 2012-08-12 04:20:58 +02:00
Nay 95bd562af0 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-11 14:43:53 +01:00
Nay 04ee08acd2 DB/Schema: Add primary keys to quest_poi and quest_poi_points tables 2012-08-11 14:43:26 +01:00
ZxBiohazardZx c8b3812940 Db/Loot: assign lootid to npc 2012-08-11 12:12:51 +02:00
Nay ca5b4227a8 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-10 13:43:27 +01:00