Commit Graph
100 Commits
Author SHA1 Message Date
Nay 19b400761d Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/Entities/Unit/Unit.cpp
2012-09-07 03:36:47 +01:00
Nay 21d43781ac Tabs to spaces... 2012-09-07 03:33:16 +01:00
Nay 340dc33b52 Fix some code style issues in previous PR merge 2012-09-06 19:59:27 +01:00
Nay 334c078184 Core/SmartAI: Tiny tiny optimization in an if 2012-09-06 19:58:43 +01:00
Nay c66d254a39 Merge pull request #7658 from e000/creature-interrupt
[Core, Creature] Implement Creature/Pet Interrupts
2012-09-06 11:58:27 -07:00
Nay 15086e92f1 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-06 17:55:37 +01:00
Nay b81dbf0837 Core/CUF: Fix 2 typos
Thanks ste1s and chipsi
2012-09-06 17:52:39 +01:00
Nay f44ddb3355 Tabs to spaces 2012-09-05 20:15:20 +01:00
Nay cc28161670 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Commands/cs_reload.cpp
2012-09-05 20:09:48 +01:00
Nay 7da92908b8 Scripts/Commands: Fix .reload creature_template # (4.3.4 branch) 2012-09-05 19:55:55 +01:00
Nay ca440756a8 Scripts/Commands: Fix .reload creature_template # 2012-09-05 19:50:09 +01:00
Nay 3b91bf8932 Core: Some comment corrections to previous commit 2012-09-05 19:13:22 +01:00
Nay db819bbdbe Core/Player: Implement server-side loading/saving of CUF profiles
CompactUnitFrames / RaidProfiles / GroupUI

There are unknown fields added to DB, received and sent in packets
   that should be renamed
2012-09-05 19:01:28 +01:00
Nay 4366dd7d83 Merge pull request #7657 from e000/master
[Spell::CleanupEffectExecuteData] Remove this confusing and potentially worthless function, use memset instead.
2012-09-04 19:43:04 -07:00
Nay 41cf99f1d9 Core/Misc: Rename void storage related prep. statements to comply with standards 2012-09-05 02:55:42 +01:00
Nay 459454cbe4 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Handlers/BattleGroundHandler.cpp
2012-09-04 23:01:06 +01:00
Nay b4bc78e24b Corrections to previous merged in PR 2012-09-04 19:48:29 +01:00
Nay 0ba06342dc Merge pull request #7644 from e000/master
[Unit::SetCharm] Restore original walking state when removing charm. Fixes mind control + walk bug.
2012-09-04 11:46:11 -07:00
Nay 5ee22a8006 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Commands/cs_misc.cpp
2012-09-04 19:08:22 +01:00
Nay 73172c67f0 Misc: Convert from CRLF to LF in cs_misc.cpp
Also cleanedup whitespace
2012-09-04 16:14:15 +01:00
Nay 3b02ea37ee Corrections to 'Merge pull request #7635' 2012-09-04 01:23:41 +01:00
Nay 2a13eb3d0e Merge pull request #7635 from cyberbrest/pull23
[Core/Currency] perfom saving all currencies to db and some cap fixes.
2012-09-03 17:16:21 -07:00
Nay fa29f1bb27 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-09-04 01:04:31 +01:00
Nay b2bcc52fda Revert "Core: Blood Furnace - Broggok event"
This reverts commit 153e88a16b.
2012-09-04 01:03:06 +01:00
Nay b979e81dde Merge pull request #7634 from Gacko/blood_furnace
Core: Blood Furnace - Broggok event and fix OnUnitDeath hook use
2012-09-03 13:30:27 -07:00
Nay 2fe8c2f41e Dependencies/G3D: Fix build on x64 (change already included in TC's diff) 2012-09-03 18:24:35 +01:00
Nay 25cc49b489 Core: Fix x64 compile and GCC compile 2012-09-03 18:16:04 +01:00
Nay 6acb7f85f4 DB/GOs: Correct flags of GO 186371
Thanks Joshh
Closes #6846
2012-09-03 17:15:32 +01:00
Nay f76b961562 Merge pull request #7491 from NorthStrider/pull-1
[4.3.4] Core/Players: updated health regeneration to cataclysm.
2012-09-03 08:24:36 -07:00
Nay 874ddcb0ae Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	dep/PackageList.txt
	src/tools/map_extractor/System.cpp
2012-09-03 16:11:46 +01:00
Nay 0db5573d4d Core/Dependencies: Update G3D to version 8.01 2012-09-03 15:39:07 +01:00
Nay 5f6e190a96 Core/Dependencies: Update zlib to version 1.2.7 2012-09-03 15:37:39 +01:00
Nay 531e16e5b8 Core/Dependencies: Update utf8-cpp to version 2.3.2 2012-09-03 15:36:36 +01:00
Nay 6cde35955d Core/Dependencies: Update bzip2 to version 1.0.6 2012-09-03 15:35:28 +01:00
Nay c8a91e2559 Tools/Extractors: Fix build under GCC 4.7 2012-09-03 15:21:52 +01:00
Nay dba602ea16 Core/BFs: Fix GCC (?) compile
Closes #7629
2012-09-03 13:33:21 +01:00
Nay 80b61fa584 Core/Spells: Hard-limit the number of hit and miss targets sent in SMSG_SPELL_GO to 255 (each), fixes client crashes
Closes #3873
2012-09-03 02:45:27 +01:00
Nay 77c8e0a2a4 Merge pull request #7625 from Elron103/pull-requests
Scripts/MoltenCore: Fix boss Golemagg enrage behaviour
2012-09-02 17:05:34 -07:00
Nay 1a49554af8 Misc: Correct a SQL, update PackageList.txt and remove an uneeded file (soap) 2012-09-02 22:52:22 +01:00
Nay 1731ff5ca1 SQL: Rename SQL file after PR 2012-09-02 15:50:29 +01:00
Nay 40c22de0b7 Merge pull request #7587 from acrathos/master
DB/SAI: Thorim and Lok'lira the Crone
2012-09-02 07:47:57 -07:00
Nay ce003baea9 Merge pull request #7614 from Elron103/pull-requests2
Core/Scripting: Add missing entry in ScriptLoader for boss Ouro
2012-09-01 16:32:51 -07:00
Nay 2e1de60593 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/scripts/Commands/cs_misc.cpp
	src/server/worldserver/worldserver.conf.dist
2012-09-01 22:19:13 +01:00
Nay 107bd5f5a3 Scripts: Fix non pch build 2012-09-01 00:11:44 +01:00
Nay 6b0c2a307b Merge pull request #7599 from gacko28/zuluhed
Core/Spell: Unlocking zuluhed chains
Closes #996
Fixes quest Zuluhed the Whacked
2012-08-31 15:58:34 -07:00
Nay 8bfdfd18cd Scripts: Fix a merge issue, thanks cyberbrest 2012-08-31 19:48:26 +01:00
Nay 5ab5cbcd2c Core/Loading: Fix a typo when loading creature_template 2012-08-31 17:48:05 +01:00
Nay 1a5df2b72e SQL: Rename SQL 2012-08-31 01:29:18 +01:00
Nay d61f3131fb Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Server/Protocol/Opcodes.h
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
	src/server/scripts/Kalimdor/silithus.cpp
	src/server/shared/DataStores/DBCFileLoader.h
	src/server/shared/Database/Implementation/WorldDatabase.cpp
	src/tools/map_extractor/System.cpp
	src/tools/map_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/adtfile.cpp
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/wdtfile.cpp
2012-08-30 23:06:19 +01:00
Nay e3d9768a50 Core: Fix many "errors"/warnings and coding style (3)
Game

Errors were found using Cppcheck, open-source static analysis tool
2012-08-30 22:44:33 +01:00
Nay abbb896cfb Core: Fix many "errors"/warnings and coding style (2)
Scripts; also reverted a change to AuthSocket

Errors were found using Cppcheck, open-source static analysis tool
2012-08-30 22:44:03 +01:00
Nay 5f1977cb1d Core: Fix many "errors"/warnings and coding style (1)
Extractors, worldserver, authserver, shared and collision affected

Errors were found using Cppcheck, open-source static analysis tool
2012-08-30 19:07:59 +01:00
Nay 902d48811e Merge pull request #7571 from daniik/master
Remove duplicated code in FleeingMovementGenerator
2012-08-30 06:31:25 -07:00
Nay e909e5515b Scripts/Hellfire: Add missing include 2012-08-29 22:36:04 +01:00
Nay 872c239dbe Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-29 22:29:06 +01:00
Nay b89b8ff277 Core/Loading: Change info/error messages to printf when config is not loaded 2012-08-29 20:02:55 +01:00
Nay 3d1f8fd292 Core/Groups: Enable SMSG_GROUP_LIST and correct position of petauramask 2012-08-29 15:47:30 +01:00
Nay 4070f5ac84 Merge pull request #7487 from drskull/master
Core/Spells: Sentry Totem Aura remove fix and some minor fix in totem.cpp

Closes #4376
2012-08-29 06:08:13 -07:00
Nay adb6ae7770 Core: Add missing include to BfHandler (thanks Chevron) and a typo in HandleRequestPartyMemberStatsOpcode (thanks Kaelima) 2012-08-29 14:06:52 +01:00
Nay aa9f2e9f18 Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-29 14:01:38 +01:00
Nay f50811f3a9 Core/Group: Code style corrections and logic fixes 2012-08-28 21:42:49 +01:00
Nay 568e7eb3ea Core/Groups: Simplify some GroupUpdateFlags handling and fix a typo 2012-08-28 21:21:05 +01:00
Nay 49532cd220 Core/Groups: Fix some failures when building stats
Thanks Zakamurite and Kaelima
2012-08-28 21:02:48 +01:00
Nay d533c950cb Scripts: Fix code style after PR 2012-08-28 19:31:15 +01:00
Nay a9e6f5453b Merge pull request #7553 from Trista/master
Core/Spells: Destabilizing Azure Dragonshrine
2012-08-28 11:26:48 -07:00
Nay 449e577b70 Core/Authserver: Fix previous merge 2012-08-28 14:12:17 +01:00
Nay 9bb198d170 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/authserver/Authentication/AuthCodes.cpp
	src/server/authserver/Authentication/AuthCodes.h
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Player/Player.cpp
2012-08-28 14:11:04 +01:00
Nay 154aaa0ad5 Core/Quests: Fix quest honor reward
Based on the patch of Tassader
Closes #1356
2012-08-28 00:25:49 +01:00
Nay e4aacd3f86 Merge pull request #7543 from gigatotem/4.3.4
Spells/Shaman: Heroism and Bloodlust
2012-08-27 15:17:54 -07:00
Nay e09591b8a7 Merge remote-tracking branch 'origin/master' into 4.3.4
Conflicts:
	src/server/scripts/EasternKingdoms/ZulGurub/boss_mandokir.cpp
2012-08-27 22:43:07 +01:00
Nay 9a11dc5ea6 Config/worldserver: Rename references to the old realmd database to auth 2012-08-27 20:42:56 +01:00
Nay 09821b4953 SQLS: Fix a typo 2012-08-27 17:24:48 +01:00
Nay 9b7b8152e7 DB/SAI: Fix opening the door before Broggok in Blood Furnace
Based on the fix of oneblizz
Closes #350
2012-08-27 15:38:50 +01:00
Nay fc16106823 Scripts/Spells: Fix a typo in spell_q12372_cast_from_gossip_trigger and cleanup whitespace 2012-08-27 14:40:12 +01:00
Nay f8c01739df Scripts/Spells: Remove a not needed cast in spell_q12372_cast_from_gossip_trigger 2012-08-27 14:29:00 +01:00
Nay c157e2643a Merge remote-tracking branch 'origin/master' into 4.3.4 2012-08-27 14:11:57 +01:00
Nay 846fc6a7fd Rename SQLs after PR 2012-08-27 13:52:54 +01:00
Nay b8bca936e8 Merge pull request #7524 from Trista/master
[Core/Scripts] Defending Wyrmrest Temple
2012-08-27 05:49:47 -07:00
Nay f7a0c3c263 Merge pull request #7539 from Tuxity/groups434
[434] Groups: Fix CMSG_GROUP_SET_ROLES and SMSG_GROUP_SET_ROLE
2012-08-27 05:47:20 -07:00
Nay b26a7337f6 Core/Groups: Correction to comment of GROUP_UPDATE_FLAG_PHASE 2012-08-27 00:26:02 +01:00
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