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
kaelima
bf84a0a97a
Core/Misc: Fix typo from 7c971be3c5. Thanks Shauren
2012-09-05 17:34:25 +02:00
cyberbrest
38dbea7583
Core/Units: Fixed setting power fields from regeneration
...
Signed-off-by: Shauren <shauren.trinity@gmail.com >
2012-09-05 17:18:34 +02:00
kaelima
7c971be3c5
Core/Misc: Fix some warnings and logic mistakes found by static code analysis
2012-09-05 17:18:05 +02:00
Shauren
8fe7fd4bd5
Core/Units: Updated mana regen and removed 5 second rule
2012-09-05 16:40:42 +02:00
Vincent-Michael
0f21634eab
Config: Cosmetic changes
2012-09-05 16:01:05 +02:00
Shauren
147920c464
Merge pull request #7664 from Elron103/pull-requests
2012-09-05 06:40:56 -07:00
Elron103
6a701af13d
Scripts/PitOfSaron: Fix Krick not casting Toxic Waste and Shadow Bolt
2012-09-05 15:34:07 +02:00
w1sht0l1v3
68a54e6d91
Core/SAI: Add condition to run SMART_ACTION_SET_INVINCIBILITY_HP_LEVEL code
2012-09-05 14:04:09 +03:00
e
f9a1fabc7b
[Spell::CleanupEffectExecuteData] Remove this confusing and potentially worthless function, use memset instead.
2012-09-04 22:38:59 -04:00
Nay
41cf99f1d9
Core/Misc: Rename void storage related prep. statements to comply with standards
2012-09-05 02:55:42 +01:00
w1sht0l1v3
50cea6638b
Core/SAI: Fix SMART_ACTION_SET_INVINCIBILITY_HP_LEVEL
...
Proper usage of params:
-param1: flat hp value
-param2: percent hp value
Note: only one of these params should be used(in case you set values in both,the script will chose percent)
2012-09-05 04:53:06 +03:00
kaelima
b8d55cc019
Core/BG: Refix cf711ffbe5 Thanks Kiddie
2012-09-05 00:08:22 +02: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
Shocker
ed6b58b17d
Core/Spells: Avoid unnecessary code execution for SPELL_ATTR3_NO_DONE_BONUS
2012-09-05 00:13:43 +03:00
Vincent-Michael
de15f70501
Core: Fix build
2012-09-04 22:39:04 +02:00
kaelima
cf711ffbe5
Core/BG: Prevent players from using macro to exploit leaving BG queues when they already have entered.
...
- Cleanup and add some comments to MSG_BATTLEGROUND_PLAYER_POSITIONS
Closes #7633
2012-09-04 22:37:27 +02: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
Kandera
8afecc6572
Core/Gameobject: fix collision for gameobjects
2012-09-04 14:04:47 -04:00
e
1695f78c9f
Fix codestyle per Vincent-Michael
2012-09-04 13:04:30 -04:00
e
1e2ee2d680
[Unit::SetCharm] Restore original walking state when removing charm. Fixes mind control + walk bug.
2012-09-04 13:00:08 -04:00
Vincent-Michael
a4c115a494
Core: Fix build
2012-09-04 18:21:00 +02:00
Kandera
26af8ac65a
Core/Gameobject: another attempt at fixing collision. chest gameobject initial collision provided by vincent-michael
2012-09-04 12:08:12 -04:00
Nay
73172c67f0
Misc: Convert from CRLF to LF in cs_misc.cpp
...
Also cleanedup whitespace
2012-09-04 16:14:15 +01:00
Kandera
a1e3758484
Core/Reputation: fix forced reputation auras with neutral. closes #5790
2012-09-04 11:11:15 -04:00
Kandera
6d57bf7a75
Core/Battleground: fix unneeded log message
2012-09-04 11:11:14 -04:00
kaelima
a3f9eee4e5
Core/Spells: Fix memory leak when Load() fails from spell/aura-scripts
2012-09-04 17:03:30 +02:00
Shauren
c4466facb1
Properly fixed one warning
2012-09-04 17:00:56 +02:00
Shocker
a005d4a9e3
Core/Spells: Implement SPELL_AURA_MOD_VENDOR_ITEMS_PRICES
2012-09-04 17:52:10 +03:00
Shocker
9c954a0cc4
Core/Spells: Crowd control spells PvP duration has been decreased to 8 seconds (down from 10)
2012-09-04 17:15:37 +03:00
Shauren
1e9fc84a12
Core: Warning fixes
...
C4100: 'x' : unreferenced formal parameter
C4310: cast truncates constant value
C4389: '==' : signed/unsigned mismatch
C4668: 'x' is not defined as a preprocessor macro, replacing with '0' for '#if/#elif'
C4701: potentially uninitialized local variable 'x' used
C4826: Conversion from 'HMODULE' to 'DWORD64' is sign-extended. This may cause unexpected runtime behavior.
C6067: Parameter '3' in call to 'sprintf' must be the address of the string
C6387: 'argument 1' might be '0': this does not adhere to the specification for the function 'CloseHandle'
2012-09-04 14:40:41 +02: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
Mik43l
a47ad2f5e1
Core/Auras: Added minimal delay before Rapture cooldown takes effect to allow all bubbles broken by a single damage source proc mana return
...
Closes #7443
Signed-off-by: Shauren <shauren.trinity@gmail.com >
2012-09-04 00:51:26 +02:00
kaelima
76be70a4dc
Core/Battlefield: Fix some memory leaks
2012-09-04 00:37:40 +02:00
cyberbrest
c969fd1f3a
Core/Currency: codestyle and Doxygen documentation.
2012-09-04 00:22:00 +03:00
cyberbrest
6ab07e81bd
Core/Misc: typo
2012-09-03 23:27:14 +03:00
Gacko
913645d5c7
Core: Blood furnace - Update method header to lastest rev
2012-09-03 22:25:26 +02:00
cyberbrest
dcfaf07054
[Core/Currency] drop conquestPoints and totalHonorPoints columns with porting data to new table.
2012-09-03 22:55:28 +03:00
cyberbrest
0c40fb0fe9
[Core/Currency] save all currencies on special db table.
...
+ fix initialization currencies.
2012-09-03 22:55:13 +03:00
cyberbrest
e9a3d38769
[Core/Currency] not allow add more then week limit.
2012-09-03 22:55:02 +03:00
cyberbrest
9025a86536
[Core/Currency] no needed delta calculations + fix crashes because of it.
2012-09-03 22:54:45 +03:00
