Spp
1f162fb7c0
Fix some merge problems
2012-08-22 10:42:05 +02:00
Spp
610a8609db
Core/Logging: Correct Log Level after merge
2012-08-22 03:15:38 +02: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
Shauren
cbe6375850
Core/Auras: Implemented scaling auras with target's level
2012-08-21 15:16:49 +02:00
Shauren
9985493dde
Core/PacketIO: Fixed SMSG_ACTION_BUTTONS sent before talent spec swap
2012-08-21 13:29:55 +02: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
Vincent-Michael
d11e71b098
Fix more non PCH build and code style
2012-08-20 23:37:33 +02:00
Vincent-Michael
9df6c4dd70
Fix more non PCH build
2012-08-20 23:12:31 +02: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
Vincent-Michael
16a0813c1b
Fix non PCH build
2012-08-20 22:48:26 +02:00
Faq
9a59dcb285
Core/Questhandler: Fix qsharing. Thnx Chaplain for idea
2012-08-20 23:35:44 +03:00
Kandera
b9f60fe56c
Core/Wintergrasp: finish implementation for battlefields. this is highly experimental enable at you're own risk. will almost definatly cause issues with the wintergrasp patch floating around
2012-08-20 16:23:24 -04:00
Kandera
c428675048
Cmake: fix cmake file for use with wintergrasp
2012-08-20 14:11:38 -04:00
Kandera
e56ff2e93a
Core/Battlefield: fix crash (thx joschiwald) closes #6726
2012-08-20 14:00:04 -04:00
Kandera
8dfbff7b15
fix build
2012-08-20 14:00:03 -04:00
Kandera
e4bf9d5cd4
cleanup merge and some unneeded selects in functions
2012-08-20 13:58:58 -04:00
Kandera
87c50a4ec3
Core/Battlefield: specify correct npc for vehicle teleportations.
2012-08-20 13:52:04 -04:00
Kandera
d6de7dec34
Core/Battlefield: few more updates to wintergrasp vehicle stuff.
2012-08-20 13:52:02 -04:00
Kandera
2d45e26012
Core/Battlefield: codystyle/whitespace cleanup. fix a stupid typo. attempt to get team using the vehicle creator instead of the vehicle
2012-08-20 13:52:01 -04:00
Kandera
483f0a6a4e
Core/Battlefield: attempt to fix vehicle counter when vehicle is killed. finish correcting alliance/horde siege engine
2012-08-20 13:52:00 -04:00
Kandera
81ba249c79
Core/Battlefield: correct siege vehicle faction types. attempt to fix vehicle creation cast time.
2012-08-20 13:52:00 -04:00
Kandera
aa0ff294d2
Core/Battlefield: Correct previous commit
2012-08-20 13:51:58 -04:00
Kandera
9dd3789719
Core/Battlefield: correct wintergrasp faction for horde (thx kirkita), added grab passenger spell as per sniffs.
2012-08-20 13:51:58 -04:00
Kandera
17e2c3a800
Core/Battlefield: cleanup a magic number
2012-08-20 13:50:51 -04:00
Warpten
094f98d3a9
Battlefield/Wintergrasp:
...
* Use correct spells on losing and winning factions
* Enums renaming, lowerCamelCase wherever applicable
* Rename some methods and class attributes for them to sound more English and less Engrish or even Frenglish (\o/)
* Use correct spells when trying to build mechanical units at the Workshops.
2012-08-20 13:50:49 -04:00
Kandera
d31902d858
Core/Battlefield: Fix issue with previous commit. codestyle cleanup and attempt to fix vehicle issues with worldstates.
2012-08-20 13:49:22 -04:00
Kandera
9c5b1b2bb6
Core/Battlefield: Correctly cast the teleport spell (data from sniffs). codestyle cleanup
2012-08-20 13:49:21 -04:00
Kandera
b700f545c5
Core/Battlefield: fix issues with vehicles. return correct vehicle data when using getdata. small cleanups. codestyle
2012-08-20 13:49:19 -04:00
Subv
5ec5bc1721
Battlefields/Wintergrasp: Fixed a crash when leaving a capture point.
...
Fixed the worldstate counters
Signed-off-by: Subv <s.v.h21@hotmail.com >
2012-08-20 13:49:19 -04:00
kandera
6639347d37
Core/Battlefield: Fix build. closes #5707
2012-08-20 13:49:18 -04:00
thomas33
7988edda1c
Core/Battlefield: Cleanup
2012-08-20 13:49:17 -04:00
thomas33
c44a723ca0
Core/Battlefield: more cleanup
2012-08-20 13:49:17 -04:00
thomas33
7b0a7ef4f3
Core/Battlefield: cleanup
2012-08-20 13:49:16 -04:00
thomas33
2a4b976e41
Core/Battlefield: pPlayer -> player
2012-08-20 13:49:15 -04:00
thomas33
547bb47575
Core/Battlefield: plr -> player
2012-08-20 13:49:14 -04:00
Kandera
b04ad4401d
Core/Battlefield: Cleaned up all incrementquest functions as this is a hacky way to do it
2012-08-20 13:48:53 -04:00
Kandera
07c8eec963
Core/Battlefield: remove handling for aura application when entering water. handled by liquid data.
2012-08-20 13:48:53 -04:00
Kandera
7491926e0c
Core/Battlefield: fix stupid mistakes. sorry!
2012-08-20 13:48:52 -04:00
Kandera
00f8858838
Core/Battlefield: attempt to correctly fix again.
2012-08-20 13:48:51 -04:00
Kandera
e9323b2c2d
Core/Battlefield: revert part of previous commit and correctly fix .bf stop crashing
2012-08-20 13:48:50 -04:00
Kandera
29343947e9
Core/Battlefield: attempt to fix crashes. please test and confirm
2012-08-20 13:48:50 -04:00
Subv
f9c9622f86
Battlefields/WG: Refactored duplicated code
2012-08-20 13:48:49 -04:00
Manuel Carrasco
ce17607595
BF/Battlefield: Small improvement, thanks to Subv.
2012-08-20 13:48:48 -04:00
Manuel Carrasco
27bfafe0e1
BF/Wintergrasp: Removed harcoded Workshops related spawns, db data is used now.
2012-08-20 13:48:47 -04:00
Manuel Carrasco
d7a7a9800b
Battlefield: Make sBattlefieldMgr a pointer. By Subv.
2012-08-20 13:48:47 -04:00
Manuel Carrasco
1f6eec4754
BF/Wintergrasp: Implemented better support for Wintergrasp phasing. It has been done by checking player's distance to the Caputre Point on every tick. Now it is performed using spell_area.
...
P.D: Reverted my last commit, it was wrong (my apologies)
2012-08-20 13:36:38 -04:00
Manuel Carrasco
efcfdc4c39
BF/Wintergrasp: It's not necessary to remove Spell Spiritual Immunity manually.
2012-08-20 13:36:38 -04:00
