6ca7a7b78d
Core/Guilds: Implemented basic guild leveling (no player statistics/reputation)
2012-09-07 14:39:19 +02:00
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
21d43781ac
Tabs to spaces...
2012-09-07 03:33:16 +01:00
0709d67e08
Merge pull request #7678 from Aokromes/master
...
Scripts/Scarlet Monastery: Final boss kill credit closes #7341
2012-09-06 19:08:29 -07:00
6970a28f24
Scripts/Scarlet Monastery: Final boss kill credit closes #7341
...
When Scarlet Commander Mograine dies and High Inquisitor Whitemane appears, if she is downed very quickly, then she will not perform the ressurection on Mograine and will not stun anyone, thus Mograine wont give the achievement nor loot. She should be invincible till she has ressurected Mograine.
2012-09-07 05:01:04 +03:00
f685e9fb2a
Core/Vehicle: Correction to 5eb22e5b64. Thanks joschiwald (and slap some others) for noticing
2012-09-07 03:31:46 +02:00
5eb22e5b64
Core/Vehicles:
...
- Send proper triggering flag when casting spellclick spells on vehicles (should not be fully triggered)
- Only compute non-transport positions when not finalized. (Fixes changing seat on vehicles, or changing vehicle from vehicle)
2012-09-07 03:17:04 +02:00
6f38fb1011
Core: Fix some code style
2012-09-07 02:21:38 +02:00
ce42faafd9
DB/Spells: Fix Flamecap Fire damage
2012-09-07 02:02:35 +02:00
d1b2f23078
Core/Movement: Fix & enable CMSG_MOVE_NOT_ACTIVE_MOVER and CMSG_DISMISS_CONTROLLED_VEHICLE
...
Enables vehicles exit
2012-09-06 22:15:06 +01:00
82efe7e505
Core/Stats: Fixed spellpower display and implemented gaining spellpower from intellect.
2012-09-06 22:45:21 +02:00
aed0ecd2e4
Core/Conditions: Allow multiple condition for spellclick source type
...
Currently unused in 335 but required for some 434 spellclicks
2012-09-06 20:03:21 +01:00
340dc33b52
Fix some code style issues in previous PR merge
2012-09-06 19:59:27 +01:00
334c078184
Core/SmartAI: Tiny tiny optimization in an if
2012-09-06 19:58:43 +01:00
c66d254a39
Merge pull request #7658 from e000/creature-interrupt
...
[Core, Creature] Implement Creature/Pet Interrupts
2012-09-06 11:58:27 -07:00
15086e92f1
Merge remote-tracking branch 'origin/master' into 4.3.4
2012-09-06 17:55:37 +01:00
b81dbf0837
Core/CUF: Fix 2 typos
...
Thanks ste1s and chipsi
2012-09-06 17:52:39 +01:00
9f09713b3e
Core/Spells: fix extra damage from crits for talents and equipment effects Closes #6647
2012-09-06 11:14:37 -04:00
fb3a360575
Core/Spells: fix intervening dead targets Closes #2090
2012-09-06 11:05:45 -04:00
5954011a90
Core/Spells: clean up some code and move to spell script. Closes #7195
2012-09-06 11:00:37 -04:00
f44ddb3355
Tabs to spaces
2012-09-05 20:15:20 +01:00
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
7da92908b8
Scripts/Commands: Fix .reload creature_template # (4.3.4 branch)
2012-09-05 19:55:55 +01:00
ca440756a8
Scripts/Commands: Fix .reload creature_template #
2012-09-05 19:50:09 +01:00
3b91bf8932
Core: Some comment corrections to previous commit
2012-09-05 19:13:22 +01:00
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
bf84a0a97a
Core/Misc: Fix typo from 7c971be3c5. Thanks Shauren
2012-09-05 17:34:25 +02:00
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
7c971be3c5
Core/Misc: Fix some warnings and logic mistakes found by static code analysis
2012-09-05 17:18:05 +02:00
8fe7fd4bd5
Core/Units: Updated mana regen and removed 5 second rule
2012-09-05 16:40:42 +02:00
0f21634eab
Config: Cosmetic changes
2012-09-05 16:01:05 +02:00
147920c464
Merge pull request #7664 from Elron103/pull-requests
2012-09-05 06:40:56 -07:00
6a701af13d
Scripts/PitOfSaron: Fix Krick not casting Toxic Waste and Shadow Bolt
2012-09-05 15:34:07 +02:00
68a54e6d91
Core/SAI: Add condition to run SMART_ACTION_SET_INVINCIBILITY_HP_LEVEL code
2012-09-05 14:04:09 +03:00
89d6900f4b
[CombatAI::SpellInterrupted] Fix Typo
2012-09-05 01:48:25 -04:00
98f5d4ef4a
[Core, Creature] Implement Creature/Pet Interrupts
2012-09-04 23:04:59 -04:00
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
f9a1fabc7b
[Spell::CleanupEffectExecuteData] Remove this confusing and potentially worthless function, use memset instead.
2012-09-04 22:38:59 -04:00
41cf99f1d9
Core/Misc: Rename void storage related prep. statements to comply with standards
2012-09-05 02:55:42 +01:00
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
b8d55cc019
Core/BG: Refix cf711ffbe5 Thanks Kiddie
2012-09-05 00:08:22 +02:00
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
ed6b58b17d
Core/Spells: Avoid unnecessary code execution for SPELL_ATTR3_NO_DONE_BONUS
2012-09-05 00:13:43 +03:00
de15f70501
Core: Fix build
2012-09-04 22:39:04 +02:00
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
b4bc78e24b
Corrections to previous merged in PR
2012-09-04 19:48:29 +01:00
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
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
8afecc6572
Core/Gameobject: fix collision for gameobjects
2012-09-04 14:04:47 -04:00
1695f78c9f
Fix codestyle per Vincent-Michael
2012-09-04 13:04:30 -04:00
Shauren