Commit Graph
100 Commits
Author SHA1 Message Date
Nay 3fd52c4736 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Handlers/GroupHandler.cpp
2012-08-27 00:13:23 +01:00
Nay 974310ffe6 Core/Groups: Update to group opcode related structs
- Should fix group creation.
- Enabled/fixed opcodes: CMSG_GROUP_RAID_CONVERT, CMSG_REQUEST_PARTY_MEMBER_STATS, MSG_RAID_READY_CHECK_CONFIRM, SMSG_GROUP_DESTROYED, SMSG_GROUP_LIST, SMSG_GROUP_UNINVITE, SMSG_PARTY_MEMBER_STATS(_FULL) and SMSG_RAID_GROUP_ONLY
- Based on WPP and the work of Zakamurite
2012-08-27 00:12:53 +01:00
Nay 30e41724e4 Core/Groups: Fix a typo when sending pet auras 2012-08-27 00:41:02 +02:00
Nay e118a7fcc5 Core: Fix compiling on Fedora (G3D related)
Thanks F3st and Gamera

Closes #7477
2012-08-26 21:45:15 +01:00
Nay 03cfc732b4 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-26 14:33:13 +01:00
Nay 99749b3e88 Core/Loading: Move a log from DBError to info 2012-08-26 00:24:50 +01:00
Nay 48a37ec4ed Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-25 14:45:00 +01:00
Nay 337d07c86c SQL: Add missing changes to character_base.sql
Thanks to Chevron for reminding
2012-08-23 18:49:43 +02:00
Nay fdf662803a Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-23 17:25:52 +01:00
Nay d82d258578 Merge pull request #7486 from Tuxity/auctionHouse434
[434] Auction House
2012-08-23 09:06:35 -07:00
Nay da9480557b Core: Fix a typo and whitespace cleanup 2012-08-22 22:56:31 +01:00
Nay 7ab976034c Merge pull request #7480 from Tuxity/charPosition434
[434] Fix CMSG_REORDER_CHARACTERS
2012-08-22 14:26:17 -07:00
Nay 4ee7558aa2 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/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-22 15:05:45 +01:00
Nay fb3e446e4d Core: Fix compiling on Fedora (G3D related)
Thanks F3st and Gamera

Closes #7477
2012-08-22 14:38:29 +01: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 b007fd70c0 Misc/WG: Fix conditions 2012-08-21 22:58:26 +01:00
Nay df2d42e5c7 Tools: Use correct flags in mkdir 2012-08-21 22:23:45 +01:00
Nay 5a812562f3 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-21 13:57:57 +01:00
Nay 5a324ff036 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-20 23:44:35 +01:00
Nay 542521a026 Scripts/Achievements: Remove a duplicated achievement script 2012-08-20 23:43:12 +01:00
Nay 61b0e289df Merge pull request #7449 from Tuxity/gilneasbattle_twinpeak_434
[434] Basic structure and code for Battle for Gilneas and Twin Peaks
2012-08-20 14:08:58 -07: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
Nay b6eae0c6a7 Merge pull request #7461 from Faq/QuestShare
Core/Questhandler: Fix qsharing. Thnx Chaplain for idea
2012-08-20 13:42:06 -07:00
Nay afd9c28d8e - Rename scriptnames to keep naming consistent;
- Template updates and spells to WG vehicles;
- Cleanup SQL files a bit.
2012-08-20 13:29:22 -04:00
Nay b1a300545c Missed changes on previous commit. 2012-08-20 13:28:52 -04:00
Nay 1e8814c8fa Moved SQL and TXT files to Wintergrasp_temp;
Clean-up and split up SQL files;
Fixed SQL import errors;
Add template updates for most creatures and GOs
2012-08-20 13:28:51 -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
Nay c161da9207 Merge pull request #7448 from Faq/db
DB/Loot: Some loot contents imported from UDB. Author Helias
2012-08-19 09:57:13 -07:00
Nay 56495da72e Merge pull request #7446 from Tuxity/druid_models
[434] Add new druid forms for trolls and worgens.
2012-08-19 06:28:28 -07:00
Nay df88034854 Merge pull request #7445 from Tuxity/direbear_form
[434] Dire Bear Form was removed in 4.0.1
2012-08-19 06:27:55 -07:00
Nay 6c14a51fe4 Core/Quests: Split Flags and SpecialFlags 2012-08-18 21:08:21 +01:00
Nay c43bba98a3 Core: Fix build and cleanup whitespace and double semicolon 2012-08-18 17:56:09 +01:00
Nay 19bafce5b8 Core/Vendor: Verify if the player has enough currency when buying items/currency with extendedcost 2012-08-18 17:47:27 +01: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
Nay aa5949ff1a Core/Loading: Do not validate fields QuestGiverPortrait nor QuestTurnInPortrait
These fields do not have to exist server-side
2012-08-18 15:18:57 +01:00
Nay ee3a229adf Merge pull request #7435 from zorix/PR1
Core/Spells: Check for Bane spells should be before check curse because Bane have dispel type Curse
2012-08-18 07:14:02 -07:00
Nay 346be644ca Merge pull request #7430 from Tuxity/banecurse_434
[434] Banes and Curses
2012-08-18 06:03:01 -07:00
Nay 69c74bb3c5 Core/Logging: Change a few more logging messages to LOG_FILTER_SERVER_LOADING
consistency!
2012-08-16 21:37:46 +01:00
Nay 21fb427ffc Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Events/GameEventMgr.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Spells/SpellMgr.cpp
	src/server/worldserver/worldserver.conf.dist
2012-08-16 20:17:29 +01:00
Nay 137d973e5d Merge pull request #7411 from Tuxity/4.3.4
[434] Correct 2 typos
2012-08-16 04:23:16 -07:00
Nay 7dbacc278a Core: Fix build 2012-08-16 01:11:16 +01:00
Nay b651b352ed Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/DataStores/DBCStores.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/worldserver/worldserver.conf.dist
2012-08-16 00:36:50 +01:00
Nay 60e608417e Core/Spell: Update some comments in SpellEffect enum 2012-08-16 00:29:05 +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 fe0edb08f0 Merge pull request #7407 from Tuxity/4.3.4
[434] Haste
2012-08-15 13:53:37 -07:00
Nay ca2bc35713 Misc: CRLF to LF, whitespace cleanup and tabs to spaces 2012-08-15 21:30:55 +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 9fcaeda097 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/shared/Logging/Appender.h
	src/server/worldserver/worldserver.conf.dist
2012-08-15 21:14:21 +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
Nay efdaf2a300 Core/Items:
- Update some ItemPrototype enums
- Merge armor and weapon vellum into a single subclass
- Fix tackler bags
2012-08-15 16:31:34 +01:00
Nay d1eaf219c4 Merge pull request #7403 from Tuxity/4.3.4
[434] Attack power formula and druid typos
2012-08-14 16:51:08 -07:00
Nay fcdadcd455 Core/Opcodes: Fix compiler error in GCC
Thanks Nevan

Closes #7404
2012-08-15 00:49:02 +01: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
Nay a768bba3c6 Core: Add enum for currency flags, update MAX_VENDOR_ITEMS and fix build 2012-08-14 02:56:45 +01: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
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
Nay 6dabeb0b31 Merge pull request #7388 from Chevron/4.3.4
Core/AI: Removed EventAI handling. is not needed more for cataclysm.
2012-08-13 16:59:43 -07:00
Nay db00a9fd2c Missing changes to previous commit 2012-08-14 00:03:18 +01: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
Nay aa25336602 Core/Loading: Re-enable validation for quest_template currency loading 2012-08-13 23:31:21 +01:00
Nay 64bf663ecd Merge pull request #7386 from Sovak/4.3.4
Core/Totems: In cata totem items are no longer needed
2012-08-13 15:22:45 -07:00
Nay a0aecdb8cd Merge pull request #7385 from Vincent-Michael/tocr
Scripts/Trial Of The Crusader:
* Fix typo
* Fix creature_text group id for King Varian Wrynn / Garrosh Hellscream
2012-08-13 15:04:31 -07:00
Nay 07a2de0393 Merge pull request #7383 from Vincent-Michael/tocrCreatureText
Scripts/Trial of the Crusader: Convert script_texts in creature_text
2012-08-13 13:19:31 -07:00
Nay 59225bb6a6 Merge pull request #7379 from Vincent-Michael/warning
Core: Fix warnings
2012-08-13 10:34:04 -07:00
Nay f7fd5da963 Core: Fix a few compile errors with some "weird" compilers 2012-08-13 14:46:37 +01:00
Nay 12e0f93eef Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-13 13:09:54 +01:00
Nay a3940f5310 Core/Spline: Add missing includes 2012-08-12 21:16:31 +01:00
Nay a09369991a Merge pull request #7369 from Vincent-Michael/kalimdorQuestPart1
Scripts/Some: Cleanup for old scripts, not exist Quest and etc. in Cata.
2012-08-12 09:31:11 -07:00
Nay bd37e73fdf SQL: Rename 2 PR'ed SQL files 2012-08-12 17:19:47 +01:00
Nay 706f3fa7d7 Merge pull request #7346 from cyberbrest/pull11
[434][Object] Fix Freezes at loading chars and at teleportation (and by transport too;))
2012-08-12 09:10:38 -07:00
Nay 4396df127c Merge pull request #7359 from cyberbrest/pull12
[434][Spell]: add new effects and auras.
2012-08-12 09:02:51 -07:00
Nay 6f6475a72e Merge pull request #7357 from zorix/PR
[4.3.4] Core/Spells: Implemented Spell attributesEx8 Remove custom flag spell scalable and apply flag SPELL_ATTR8_AURA_SEND_AMOUNT
2012-08-12 09:02:16 -07: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
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
Nay 274a54c152 Core: Cleanup whitespace, fix build and enable 1 opcode 2012-08-10 16:58:39 +01:00
Nay cf2d235c72 Core/PacketIO: Enable 2 opcode handlers, remove legacy HandlePageQuerySkippedOpcode 2012-08-10 16:09:32 +01:00
Nay 90d7620adc Core/Misc: Use ByteBuffer's WriteString where possible/needed 2012-08-10 16:06:13 +01:00
Nay 55171001ee Core/PacketIO: Enable most arena related opcodes 2012-08-10 15:41:55 +01:00
Nay e0410e21c2 Core/PacketIO: Enable few more opcode handler (fixes mailing and others) 2012-08-10 15:13:34 +01:00
Nay d2dc60dc05 Core: Add missing include 2012-08-10 14:03:02 +01:00
Nay ca5b4227a8 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-10 13:43:27 +01:00
Nay 5e1e9bb4dd Core: Fix build and proper deinitialization in HandleTransmogrifyItems (by using vectors instead of new/delete) 2012-08-10 02:57:16 +01:00
Nay 260782f316 Core/ChatAddon: Implement server side addon communication filtering 2012-08-10 02:01:25 +01:00
Nay 0b10cc40c2 Core: Fix some bad casts when reading bytebuffer data 2012-08-09 21:20:05 +01:00
Nay 081acfde53 Merge pull request #6520 from Vincent-Michael/shadowstep
Core/Spell: Fix not using Shadowstep while rooted
2012-08-09 11:40:26 -07:00
Nay bb838307ea Core/PacketIO: Enable SMSG_LOOT_RESPONSE
TODO: Implement currency looting (on it)
2012-08-09 18:54:24 +01:00
Nay 512f850e40 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-09 13:48:32 +01:00
Nay 4d465f78da Core: Add missing FlushBits and fix some typos (/slap subv) 2012-08-09 12:57:55 +01:00
Nay d904fd54b0 Core/PacketIO: Enable few more opcode handlers 2012-08-09 02:58:31 +01:00
Nay 10c9c55700 Core/Quests: Fix and enable all quest related opcodes 2012-08-09 00:58:04 +01:00