Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 10:26:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
25,324 Commits 4 Branches 146 Tags
e17af4b0982164eabff2d10ebb527a2125cd036a
Commit Graph

19585 Commits

Author SHA1 Message Date
Carbenium
e17af4b098 Fix merge fail 2015-07-21 19:11:36 +02:00
Carbenium
c0ee4ceac4 Merge commit '251a347190485d57c8e2e9d821f66a5063270f5f' into 4.3.4 
Conflicts:
	sql/base/auth_database.sql
	src/server/game/Accounts/RBAC.h
	src/server/scripts/Commands/cs_modify.cpp
 2015-07-21 19:02:53 +02:00
Carbenium
fc13ce42df Merge commit '40bb5743acc0d117db3a5b0e0b1919793d25c392' into 4.3.4 
Conflicts:
	sql/updates/world/2014_11_05_00_world.sql
 2015-07-21 18:53:04 +02:00
Carbenium
8d47083319 Merge commit '64e34cdec837f9375d6d2ba6b12def8a534e08e7' into 4.3.4 
Conflicts:
	sql/base/dev/world_database.sql
	src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/boss_twin_valkyr.cpp
 2015-07-21 18:51:30 +02:00
Carbenium
1940583e36 Fix merge error 2015-07-21 18:38:49 +02:00
Carbenium
68fd138476 Merge commit '799bdc17105c566a705cb93b4f1d1813c23f2ba2' into 4.3.4 
Conflicts:
	sql/updates/world/2014_10_27_00_world.sql
	sql/updates/world/2014_10_27_01_world_335.sql
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
 2015-07-21 18:30:05 +02:00
Carbenium
9f1d71a53f Merge commit 'a951af7b52992b47d6bf02a0f44561dcc079da6b' into 4.3.4 
Conflicts:
	src/server/scripts/EasternKingdoms/zone_hinterlands.cpp
 2015-07-21 18:22:27 +02:00
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
586f08a923 Tools: Remove mesh_extractor, missed stage 2015-07-19 14:18:20 +02:00
Aokromes
5e6cd5a6f7 Tools: Remove mesh_extractor 
mesh_extractor is not ready for production
 2015-07-19 14:13:38 +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
cr4st
669d59992b Core/Player: Fix Cosmetic Auto-Repeat Bug 
Closes #13532
Fixes #12436
 2014-11-11 12:52:27 +00:00
Heihachi
3e03e546d3 Scripts/Commands: mod xp command 
Closes #13476
 2014-11-11 00:45:30 +00:00
ShinDarth
fd0b961781 Core/Commands: implement .pvpstats command 
Shows number of battleground victories in the last 7 days

Closes #13460
 2014-11-10 22:30:20 +00:00
Appled
502a7e6a2e DB/Spells: Cleaned playercreateinfo_spell_custom table and added WoTLK class spells only 
Current playercreateinfo_spell_custom table has very weird spells in it. I emptied table, created new character for each class, logon each class, learned every spell from trainer and then added rest spells from quests (for example, hunters' Tame Beast). After that I did a PHP script to get character's spells from character_spell table and insert them into playercreateinfo_spell_custom table.

This has all trainer spells and quest spells (if any) for 3.3.5!

Fixes #13509
Closes #13516
 2014-11-10 21:04:37 +00: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
jackpoz
064b47eccf Core/LFG: Allow group bound to LFG instance to re-queue if someone leaves the party 2014-11-09 20:41:22 +01: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
jackpoz
c2a69e748e Core/LFG: Fix being unable to re-queue after leaving queue 2014-11-08 22:52:09 +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
jackpoz
1802fb3e1e Core/LFG: Fix party members not being able to vote to kick Leader 2014-11-07 22:17:04 +01: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
Nyeriah
9838cbda1a 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)
 2014-11-06 22:13:13 -02:00