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
b8bca936e8
Merge pull request #7524 from Trista/master
...
[Core/Scripts] Defending Wyrmrest Temple
2012-08-27 05:49:47 -07:00
Stefo
e0e636577f
Core/Scripts: Fix target error
...
*Forgot to change targets
2012-08-26 14:22:57 +03:00
Subv
97c3e2e6c1
Core/Movement: Make MovementGenerators use pointers instead of references. cleanup
2012-08-25 22:57:55 -05:00
Vincent-Michael
50bed7eb4b
Core/Spells: Cleanup in 71ca106814 /slap me
2012-08-26 05:05:05 +02:00
Vincent-Michael
71ca106814
Core/Spells: Implement visual spells for priest shadowform
2012-08-26 04:44:41 +02:00
thesensei
cc416592b9
Core/Scripts: Defending Wyrmrest Temple
2012-08-26 02:55:14 +03:00
Nay
48a37ec4ed
Merge remote-tracking branch 'origin/master' into 4.3.4
2012-08-25 14:45:00 +01:00
Vincent-Michael
26bc57733a
Core/outdoorPvP: Remove outdoor pvp eastern plaguelands (thx projectfreya)
2012-08-25 02:09:15 +02:00
Subv
76a3a7738f
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
2012-08-24 15:34:29 -05:00
Vincent-Michael
2041ff2562
Core/Battlefield:
...
* Fix correct faction for Wintergrasp
* Remove hack for vehicle faction
* Fix gameobject ai for go_wg_vehicle_teleporter
* Fix some warnings and code style
2012-08-24 20:25:18 +02:00
Kandera
b11de3eac0
Scripts/Wintergrasp: enable script and add it to spell_script_names
2012-08-23 13:29:54 -04:00
Kandera
f6ab6d3fca
Scripts/Wintergrasp: fix defender portal teleporting and clean up vehicle teleporter code
2012-08-23 13:21:27 -04:00
Subv
dc95ce61b4
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
...
Conflicts:
dep/PackageList.txt
src/server/game/Movement/MotionMaster.cpp
src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
src/server/game/Movement/Spline/MoveSplineInit.h
src/server/game/World/World.h
2012-08-22 17:26:53 -05:00
Nay
da9480557b
Core: Fix a typo and whitespace cleanup
2012-08-22 22:56:31 +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
Spp
984493108b
Core/Logging: Fix incorrect error level for some warden messages
...
Core/Logging: Fix incorrect filter type for many network messages
Core/Logging: Use OPCODE filter type for network messages related to wrong packets
2012-08-21 22:12:55 +02:00
Vincent-Michael
9f8ea0da1e
Core/Battlefield:
...
* Update Logs filter
* Fix typo in worldserver config (thx filo)
* Fix some code style
2012-08-21 19:40:21 +02:00
Shauren
7dc26c7ff7
Core/Misc: Warning fixes
2012-08-21 18:20:42 +02:00
Shauren
7ccd254fdc
Scripts/Commands: Added .quest reward command - this will reward player's quest, similar to finishing it at quest ender, requires quest to be completed, rewards all items and first choice item (if quest has choice rewards)
2012-08-21 17:45:10 +02:00
Vincent-Michael
129e0e2f49
Core/Misc: Add missing cmake for cs_bf.cpp
2012-08-21 16:30:47 +02:00
Stalker-Riddick
a84ac50f1c
Core/Scripts: Improvements to Trial of the Crusader
...
*Fixed creature_text errors.
*Icehowl now works properly
*Fixed waypoints so creatures don't enter the arena through the wall,
Lich King now spawns at a proper place, after you start a new fight
corpse of a the previous boss despawns (chest also after you start
valkyries).
Closes #7415
2012-08-21 15:19:42 +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
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
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
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
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
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
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
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
Manuel Carrasco
d7a7a9800b
Battlefield: Make sBattlefieldMgr a pointer. By Subv.
2012-08-20 13:48:47 -04:00