Carbenium
38027226ff
Merge commit '1a075f0454fcfc1fb23432e6853af4a36730de98' into 4.3.4
...
Conflicts:
src/server/game/Handlers/CharacterHandler.cpp
src/server/game/Server/WorldSession.h
2015-07-21 18:04:43 +02:00
Carbenium
1350a08ee4
Merge commit '183a0c59e0b4ad63158b04dd62d76d20d8bfc24e' into 4.3.4
2015-07-21 17:54:19 +02:00
Aokromes
7680c90abd
Update (C) date
2015-07-19 13:37:44 +02:00
Your Name
dc9c3362ab
Core/Players: Fix being able to water walk after being revived
...
By IvanVojtko, closes #10950 , closes #11323
2015-07-19 10:19:23 +02:00
Northstrider
b5393d4b9b
Core/Creatures: remove virtual mounts from creatures on death
...
Closes https://github.com/TrinityCore/TrinityCore/pull/14396
2015-04-19 14:56:54 +02:00
Rat
037fd1b1bb
Core/Phases: backported 6.x phase fixes
2015-04-02 20:32:09 +02:00
AriDEV
f4a83fc08a
Server/Entities: Should Fix Compile Error Under GCC 4.8+
...
Signed-off-by: AriDEV <aridev666@gmail.com >
2015-03-15 21:08:27 +01:00
Duarte Duarte
a324ee8a22
Typo
2015-02-22 06:06:58 +00:00
Shauren
6cc38ad7d2
Core/Spells: Restored totem category check
...
Revert "Core/Totems: In cata totem items are no longer needed"
This reverts commit 45e0cae7be
(cherry picked from commit ea9eccae8596d440c372b0d9709d4def4b46e648)
Conflicts:
src/server/game/Entities/Item/ItemPrototype.h
2015-02-22 06:06:34 +00:00
Rat
e6cc39258d
Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into phases
...
Conflicts:
sql/updates/world/2014_10_30_00_world.sql
2014-12-30 10:22:55 +01:00
Rat
1f4d52b2ff
Core/Phases:
...
- Added terrain swap info to .gps command (todo: move text to db)
- RebuildTerrainSwaps when adding a Unit to world
2014-11-01 20:36:24 +01:00
Rat
50228fc9da
Core/Phases:
...
- Implemented CONDITION_SOURCE_TYPE_PHASE (26)
- Implemented phase_area DB table to link phases to specific areas using conditions
- updated logic to correctly handle phases gained from auras and areas (they should not remove each other's phases)
2014-11-01 19:36:05 +01:00
Shauren
5781119c4b
Core/Entities: Fixed data sent in movement packets - time3 in transport block is actually the id of a vehicle we are passenger on
2014-11-01 00:24:10 +01:00
Rat
9690b54f75
Core/Phases: handle empty phaselist as always visible
2014-10-31 19:23:29 +01:00
Rat
79af33a508
Core/Phases:
...
- redone how default terrain swaps are handled
- added new table for worldmaparea data
- only send terranswaps for player's current map
- always send all valid worldmaparea swaps for ingame worldmap
- added Hyjal's terrain swap as example, after turning in quest 25372, the Inferno area will change to Regrowth, both the terrain and the worldmap changes
2014-10-31 18:42:02 +01:00
Rat
03fed3c7a4
Core/Phases: implemented usage of default terrain swaps
...
- added example for Gilneas (from sniff)
2014-10-31 00:05:13 +01:00
Rat
2583661703
Core/Phases:
...
- fixed packet structure, thanks to Shauren for the notice
- fixed .mod phase command
- implemented world map area swaps for swapped terrain
2014-10-30 23:08:23 +01:00
Rat
8ba89d2311
Core/Phases: implemented new commands:
...
.npc set phase
.npc set phasegroup
- implemented saving creature phasing to database
2014-10-30 16:18:11 +01:00
Rat
5993b946c9
Core/Phases: some cleanup
...
- implemented CopyPhaseFrom(obj)
2014-10-30 13:35:12 +01:00
Rat
2f48b5fb59
Core/Phases: gamemasters should see all phases with gm on
2014-10-30 11:45:01 +01:00
Rat
b91c8c76b6
Core/Phases: fixed corpse phase deleting
2014-10-30 11:28:10 +01:00
Rat
517369a3df
Core/Phases: more work on corpse phasing
...
- moved all sql queries to prepared statements
- implemented corpse phases saving, loading, cleaning
2014-10-29 21:47:25 +01:00
Rat
9f33e02a85
Core/Phases: removed phaseMask from corpse queries
2014-10-28 20:16:05 +01:00
Discover-
dc9ff5260b
Core/Phases: Get rid of IsInSamePhase
2014-10-28 17:40:57 +01:00
Subv
44c14799f3
Core/Phases: Removed some of the usages of phasemask in the Pet code.
2014-10-28 11:35:40 -05:00
Discover-
66a40f5e91
Core/Phases: Rebuild the terrain swaps when a quest is removed as well (and some other scenarios)
...
Thanks to @joschiwald
2014-10-28 16:48:32 +01:00
Discover-
45f81bcf44
Core/Phases: Rebuild the terrain swaps whenever a quest's status changes.
...
Author: @Subv
2014-10-28 16:03:21 +01:00
Discover-
cea5a909df
Core/Phases:
...
* Implement CONDITION_TERRAIN_SWAP
* Get rid of CONDITION_SOURCE_TYPE_PHASE_DEFINITION
* Implement CONDITION_SOURCE_TYPE_TERRAIN_SWAP and also throw it in WorldObject::RebuildTerrainSwaps
2014-10-28 15:58:16 +01:00
Subv
f86b8aa573
Core/Phases: Added a new table, terrain_map_info, where you can bind a specific terrain swap to a map, and it will be sent to the player when he enters the map.
...
ToDo: Add conditions support for this.
ToDo: This data is already in the DBC (parentMapId) but is it complete? This way allows us an extra degree of freedom if / when we need to add extra information to this table.
2014-10-27 21:36:16 -05:00
Subv
84c3165067
Core/Phases: Some minor changes, added SQL structure.
...
You can now bind terrainswaps to specific phase ids, these phaseids are applied by spells.
Still ToDo: Free terrainswaps.
2014-10-27 19:52:57 -05:00
Rat
001e1ce935
Core/Phases: fix logic in SetInPhase()
...
- we should not remove the terrain swap if another phase still use it
(cherry picked from commit 299c693b8420d81951ef67b8481e4ad6b192473f)
2014-10-27 23:08:23 +00:00
Rat
8b1e546ce9
Core/Phases: some commenting, more cleanup and compile fix
...
(cherry picked from commit 8b536fdf9d38a3e0c94dc9c1184ea8582495064f)
2014-10-27 23:08:02 +00:00
Subv
07a515f960
Core/Phases: Some changes to how phasing works
...
(cherry picked from commit e4f6cb39a2652455b78ae2416627954956c8964f)
2014-10-27 23:07:46 +00:00
Aokromes
4fde97407b
Merge pull request #13454 from ShinDarth/434_fix
...
Code/Quests: Fix QUEST_FLAGS_PLAYER_CAST quests
2014-10-25 10:22:10 +02:00
ShinDarth
02a107731e
Fix #13351
2014-10-25 10:00:47 +02:00
Aokromes
6da0beed0c
Core/Quests: quests which have been added with no questgiver (like spells) will now also show a icon in the quest log
...
By Northstrider and Malcrom
2014-10-21 23:43:36 +02:00
joschiwald
1a075f0454
Core/Misc: fixed a scenario when character factionchange create unexpected results, also moved packet generating code into unique methods
2014-10-19 15:30:35 +02:00
jackpoz
2cd4ea9b6b
Core/Misc: Remove dead code
...
Remove a double check on result of same function, with the 2nd being always true.
(cherry picked from commit e2c2bce90f1713136c2a256e423e5d136dab2389)
2014-10-19 14:39:36 +02:00
DDuarte
5bf55eacfd
Merge remote-tracking branch 'origin/3.3.5' into 4.3.4
...
Conflicts:
sql/base/auth_database.sql
src/server/game/Instances/InstanceScript.h
src/server/scripts/Northrend/isle_of_conquest.cpp
src/server/shared/Database/Implementation/LoginDatabase.cpp
src/server/shared/Database/Implementation/LoginDatabase.h
2014-10-19 00:18:06 +01:00
Golrag
5ede64260c
Core/BattlegroundIC:
...
* Fixed Catapults
* Fixed Graveyards
* Fixed Cannons on Gunships
* More Blizzlike Teleport to Gunship
* Fixed Gunship Teleport to Hangar
* Fixed Teleporters
Closes #13052
Fixes #12323 and #9557
2014-10-18 21:33:21 +01:00
mik1893
ef4043436b
Core/Spells: Grounding Totem: - correctly magnet spells and dies - let missile spells fly on it and destroys all spells during the travel time of first one
...
Thx @amsjunior1
Closes #13147
Fixes #5611
2014-10-18 21:13:37 +01:00
trickerer
47359a1ae2
Core/Spells: Trigger extra attacks on proper target
...
Ref #6892
Closes #11001
2014-10-18 20:51:00 +01:00
ShinDarth
e806fc8a02
Core/Quest: implement Quest Tracker
2014-10-18 18:37:39 +02:00
Vincent-Michael
35bd935779
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
...
Conflicts:
src/server/game/DungeonFinding/LFGMgr.cpp
src/server/game/Handlers/ChatHandler.cpp
src/server/game/Handlers/GroupHandler.cpp
src/server/game/Handlers/LFGHandler.cpp
src/server/game/Handlers/PetitionsHandler.cpp
2014-10-18 00:32:39 +02:00
jackpoz
ee5eaab598
Core/Players: Fix players not being notified if on loading screen
...
Fix packets not being sent to players on loading screen even if the system supports these packets to be queued and sent till the player is in world.
There might be additional cases where this applies, please report back if you find any.
Fixes #11339
2014-10-17 22:35:28 +02:00
jackpoz
86e3737d11
Core/Movement: Fix evade issue
...
Fix evade issue happening when an evading creature assists another one, causing it to stay in evading state forever.
Fix #4943
2014-10-13 22:38:59 +02:00
Vincent-Michael
63d7b348bb
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-10-10 05:29:06 +02:00
Shauren
2e455eee86
Core/Entities: Removed the possibility to teleport non-player objects to different maps
2014-10-08 20:24:55 +02:00
DDuarte
0fb9ba4f28
Core/Players: Update gold cap
...
> As of Patch 4.0.1, the gold cap is 999,999
2014-10-06 21:59:56 +01:00
Shauren
46acf64d0f
Core/GameObjects: Fixed possible crashes if transport objects don't have entries in TransportAnimation.dbc
2014-09-30 22:48:04 +02:00