Commit Graph

19500 Commits

Author SHA1 Message Date
Shocker
a0cb102538 Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2013-02-10 20:21:18 +02:00
Shocker
82f7b337b2 Core/Opcodes: Prevent invalid memory access with custom opcodes 2013-02-10 20:20:36 +02: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
Shauren
985de41421 Core/SAI: Rewrite SmartAI::RemoveAuras in a safer way 2013-02-09 17:57:27 +01:00
Gacko
a7eef6a598 Script/Quest: Kodo Roundup
Closes #943
2013-02-09 16:24:31 +01: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
Kinzcool
8066e43dd8 DB/Triggers: Added areatriggers in Shadowfang - when you'll try to jump out of the dungeon walls, you will be teleported 2013-02-08 17:51:55 -05:00
Nay
c4d285828a Merge pull request #9166 from thomas33/typo
Core/Scripts: Coding style
2013-02-08 10:07:05 -08:00
Shauren
97e876209e Core/Players: Fixed crash when mute expired while player was ingame 2013-02-08 18:18:26 +01:00
Shauren
d6c0afa71c Core/AI: Fixed merge error 2013-02-08 14:15:24 +01:00
Shauren
b6e56e42ea Core/Auth: Reverted part of fb43a92cc2 - session key is still needed after logging in to be able to switch realms 2013-02-08 01:03:56 +01:00
Shauren
fb43a92cc2 Core/Accounts: sessionkey field in account table is only a temporary storage to pass data from authserver to worldserver and should only be used as such. Clearing sessionkey from database after a successful login to prevent possible exploits. 2013-02-07 16:15:23 +01:00
thomas33
82c31e50bb typo 2013-02-07 16:10:10 +01:00
Vincent_Michael
5b45a87da5 Core: More clean up whitespace 2013-02-07 00:24:00 +01:00
click
75994b3dd3 Core: Clean up whitespace, and remove a silly warning in boss_lurker_below.cpp 2013-02-07 00:19:19 +01:00
Vincent_Michael
943c866da9 Core: Whitespace cleanup 2013-02-07 00:02:22 +01:00
Shauren
fdffb3ebd0 Core: Fixed some compile warnings 2013-02-06 22:18:41 +01:00
Vincent_Michael
1fbc25766f Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 2013-02-06 21:49:12 +01:00
Shocker
443ea12827 Fix build 2013-02-06 22:42:37 +02:00
Shocker
be07a7d481 Core/Spells: Fix SPELL_AURA_MOD_POWER_COST_SCHOOL and SPELL_AURA_MOD_POWER_COST_SCHOOL_PCT 2013-02-06 22:27:53 +02:00
w1sht0l1v3
f27a83e98f Fix up previous commit. 2013-02-06 18:39:09 +02:00
w1sht0l1v3
d42dac4cee DB/Misc: Fixup quest Hot On The Trail (A:24849 H:24851) 2013-02-06 18:32:28 +02: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
Gacko
32546a64c9 Add comment to f205613eb5 2013-02-06 09:08:56 +01:00
Kinzcool
2fa8d06b25 DB/Items: Added Heart-Shaped Box, missing for Love in the Air event
Closes: #9130
2013-02-05 22:30:34 -05:00
Warpten
6a0b7950a7 Core/Spells: Fixed Molten Core's proc. 2013-02-06 00:30:40 +01:00
click
00d299f12f Core/SQL: Explicitly set the auth.account-table to use the INNODB-engine (to allow foreign keys and transactions)
If you have an OLD database (auth), and RBAC SQL-alterations, make SURE that it's InnoDB, otherwise run this (it can be run multiple times anyway)
(The only change added is to alter the table to explicitly be an InnoDB-table)
2013-02-05 22:20:55 +01:00
Gacko
f205613eb5 DB/Disable: Ignore LOS for Krakles Thermometer
Closes #5560
2013-02-05 19:40:20 +01:00
Gacko
745eb9732e Core/Spell: Consider disables for LOS check 2013-02-05 19:39:51 +01:00
click
ede65fb60c Core/Remote: Adjust logentries to accomodate separation of info- vs debug-output, using Info-level as default unless it's REAL debugoutput 2013-02-05 15:45:18 +01:00
Spp
dd0658e675 Warning fix 2013-02-05 11:12:00 +01:00
Spp
f7c7f0f0f6 Merge branch 'master' into 4.3.4
Conflicts:
	src/server/scripts/Kalimdor/zone_durotar.cpp
2013-02-05 09:57:14 +01:00
Spp
fedc26a115 Typo fix 2013-02-05 09:26:52 +01:00
Spp
f210ab0d47 Core/RBAC: Allow custom security levels for commands. (Before this change any command with seclevel > 3 had the same permissions than player commands)
Note: This is still a workaround till command system is moved to RBAC
2013-02-05 09:11:56 +01:00
Subv
c4d3b83191 Implemented use of graveyard_orientation - You can test it by clicking on "Return to Graveyard" button 2013-02-04 22:38:20 -05:00
Kinzcool
630ad4b0b5 DB/Creature: Updated Unseen template 2013-02-04 20:03:04 -05:00
m7nu3l
f9654d52e0 Core/AI: Removed Scripted_NoMovementAI which has become obsolete. Use ScriptedAI::SetCombatMovement(false); to get the same functionality. 2013-02-04 19:18:48 -03:00
w1sht0l1v3
1e8bf1aad1 DB/Misc: Fix achievement Flirt With Disaster. 2013-02-04 23:39:04 +02:00
Vincent_Michael
7f2a1ece62 Fix merge fail (fucking saving button -.-) 2013-02-04 22:17:23 +01:00
Vincent_Michael
12c8cdc26c Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Conflicts:
	sql/base/auth_database.sql
	sql/base/characters_database.sql
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Server/WorldSocket.cpp
	src/server/game/World/World.cpp
	src/server/scripts/Spells/spell_generic.cpp
2013-02-04 22:14:56 +01: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
Spp
fb7a544d84 Correction to previous commit (Use proper way to delete from spell_script_names) 2013-02-04 17:04:40 +01:00
Spp
61979f8591 Scripts/Player: Add OnMapChanged to PlayerScripts (after map changed)
Core/Dungeon Finder: Use OnMapChanged script to cast/remove Luck of the draw
- Also move code to force party update to LfgPlayerScript
- Remove some obsolete Lfg code after recent commits
2013-02-04 16:52:43 +01:00
Gacko
30e1516387 Rename sql files of 760d62e934 2013-02-04 16:43:12 +01:00
Aokromes
6d8a69d640 Merge pull request #9099 from Bezo/mutenew
Add Mute reason and mute by to the db so you can get this info from the ...
2013-02-04 06:55:26 -08:00
Spp
67f686106d Fix compile without PCH 2013-02-04 10:10:15 +01:00
Spp
683de1d624 Core/RBAC: Add SQL to remove bad data from account_access, otherwise other sqls will fail due to use of FOREIGN KEYS
- Also add missing files from previous commit
2013-02-04 09:39:01 +01:00