Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-25 11:21:58 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,253 Commits 4 Branches 146 Tags
63df41b6b24f09996905cea4b582ea27991fc262
Commit Graph

11906 Commits

Author SHA1 Message Date
Carbenium
63df41b6b2 Merge commit '805be8ebba07c3280089a128f1764d49f6f84ab6' into 4.3.4 
Conflicts:
	sql/updates/world/2014_10_21_00_world.sql
 2015-07-21 18:17:08 +02:00
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
1c0cf6021b DB/Misc: Other branches fixes 2015-07-19 23:02:24 +02:00
Aokromes
88cbf569a2 Fix another typo 2015-07-19 20:37:25 +02:00
Aokromes
8164d51071 Fix typo 2015-07-19 20:33:59 +02:00
Aokromes
d3fec662dd DB/World: Backport schema changes from 6.x branch (renames) 2015-07-19 20:01:43 +02:00
Aokromes
5775457fb4 Fix Compile 2015-07-19 18:42:24 +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
Nyeriah
c4ad70e7f4 Scripts/Stonecore: Prevent Slabhide from dying during air phase 2015-04-24 14:11:13 -03: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
MitchesD
a3a7d65c20 Core/SAI: fix typo 
(cherry picked from commit 9ed21eb5b1)
 2015-04-02 21:28:44 +02:00
Rat
037fd1b1bb Core/Phases: backported 6.x phase fixes 2015-04-02 20:32:09 +02:00
MitchesD
1103f0889d Core/SmartScripts: added SMART_ACTION_SET_COUNTER and SMART_EVENT_COUNTER_SET 
as per request of DB developers

(cherry picked from commit 23b1c042ad)

Conflicts:
	src/server/game/AI/SmartScripts/SmartScript.h
 2015-04-02 18:52:19 +02:00
Rushor
5ebf89ce16 Scripts/Grizzlyhills: Spell: Infected Worgen Bite - Apply Spellscript and Transformation 
closes #12165

(cherry picked from commit 6080234e98)
 2015-03-25 16:35:15 +01: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
Shauren
8460c40c6f Core/DataStores: Corrected field names in SpellPowerEntry 2015-03-08 13:16:30 +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 ea9eccae85)

Conflicts:
	src/server/game/Entities/Item/ItemPrototype.h
 2015-02-22 06:06:34 +00:00
Gooyeth
b68768e984 Core/Spells: Correction Stuck effect (4.3.4) 
The player dies if heathstone is in cooldown, else the player is teleported to home.

Thanks @F03SD and @Kinzcool.
 2015-01-27 14:01:45 -06:00
Gooyeth
3d49285c39 Core/Spells: Update Stuck effect 4.3.4 
The stuck effect in Cataclysm and MoP the player dies, in WoD the player is teleported to home.

Closes #13939
 2015-01-26 20:23:08 +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
Mihapro
9a941ae125 Scripts/Instance: The Stonecore updates 
Stonecore Teleporters scripted. Some corrections, better handlings, fixed Travis warnings ...

Closes #13626
 2014-12-28 17:52:16 +00:00
Rat
708b09e9f7 Core/Logs: fixing typos 2014-12-28 10:44:10 +01:00
Aokromes
4e668f9d4b Core/Logs: Move runtime log to debug 
because it's already checked at startup.
 2014-12-28 10:23:21 +01:00
Gooyeth
2a307f685c Hide Battleground List window 
The Battleground List window never showed on retail.

Blizzlike.
 2014-12-19 17:04:55 -06:00
Aokromes
de44a3250c Update worldserver.conf.dist 2014-12-12 20:33:02 +01:00
Aokromes
5c2768bf7b Core/Misc: Better unknown account log 
By Warpten.
 2014-12-10 12:01:54 +01:00
Gooyeth
75f0c7967c Fix Battleground List window. 
Hide window after level 10, show only in level 10
 2014-11-10 08:30:20 -06:00
Rat
323f80c801 Core/Phases: Mmaps now use the swapped terrain's mmtiles for all units if available 
- Needs more testing!
 2014-11-08 23:00:12 +01:00
Rat
34553afa95 Core/Zmq: Added 50ms wait in the Run() loop to get rid of excessive cpu usage 
(cherry picked from commit cbb6ca0339)
 2014-11-08 13:11:53 +00:00
Nyeriah
a7c781a02d Scripts/ToC: Simplify the code for "A Tribute to Immortality" achievement 
* also fixes the achievement being still awarded if players die indirectly during boss fights (Anub'arak adds, for example)

(cherry picked from commit 9838cbda1a)
 2014-11-06 22:18:02 -02:00
Aokromes
dfa99455ab Merge pull request #13368 from Mihapro/4.3.4-TheStonecore 
Scripts/Instance: The Stonecore
 2014-11-05 00:28:08 +01:00
Mihapro
50bf6cad6a Scripts/Instance: The Stonecore 2014-11-05 00:09:16 +01:00
Gecko32
5d6de9a821 Core/Spells: Prevent Divine Intervention from removing death persistent auras 
Such as Dungeon Deserter, Resurrection Sickness, etc

(cherry picked from commit fbcd180716)
 2014-11-04 14:33:35 -02:00
Rat
e7a248523a Core/Phases: Load all phaseable mmtiles (yet unused) when loading the phase's root map 2014-11-02 20:41:45 +01:00
Rat
cbb6ca0339 Core/Zmq: Added 50ms wait in the Run() loop to get rid of excessive cpu usage 2014-11-02 16:49:45 +01:00
Nyeriah
9ed8dc0263 Scripts/ToC: Remove a safe-measure call that caused issues 
Closes #11874

(cherry picked from commit 3f094b9116)
 2014-11-02 01:20:41 -02: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
Nyeriah
33aaacb2e8 Scripts/ToC: Few codestyle changes and clean ups 
(cherry picked from commit f6896c9a3a)
 2014-11-01 02:06:44 -02:00
Nyeriah
2a1ad10b80 Scripts/ToC: Twin Val'kyr 
- Script rewritten to EventMaps
- Implemented random special ability sequence
- Adjusted timer for special abilities to 45 seconds
- Misc clean up.
Closes #7546

(cherry picked from commit e5da0dccfa)
 2014-11-01 00:47:15 -02: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
d77bb02e88 Core/Phases: some error checking at db loading 
- implement .debug phase command
 2014-10-30 21:20:04 +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