Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-22 18:15:31 +01:00
Code Issues Packages Projects Releases Wiki Activity
30,709 Commits 4 Branches 146 Tags
cfdf0b2a860249e4a90ee4673a8bd2fba4bc9bda
Commit Graph

5023 Commits

Author SHA1 Message Date
Rat
dcd18eef2a Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x 2015-03-29 17:56:49 +02:00
Gacko
833d57fa27 Fix non-pch build 2015-03-29 16:50:40 +02:00
Naios
ed4722b6e6 CMake: Use source_groups to represent the source tree 
* It let ide's (like vs) display the source tree.
* Disabled by default.
* Soft requirement is cmake >= 2.8.12 .
* Offers 2 modes: flat & hierarchical.
* For detailed description see #14471
* Thanks @click for help and advises.
* Closes #14471

(cherry picked from commit c386711972)

Conflicts:
	src/server/authserver/CMakeLists.txt
 2015-03-29 16:13:22 +02:00
Rat
3660c3a37f Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x 
Conflicts:
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
 2015-03-29 11:25:48 +02:00
MitchesD
aa33d66f6b Merge pull request #14466 from gigatotem/6.x 
Spells/Mage: Correct typo in Time Warp script
 2015-03-28 16:38:47 +01:00
Gigatotem
9f3018c694 Spells/Mage: Correct typo in Time Warp script 2015-03-28 15:13:45 +00:00
click
c696f2195d Core/Script: Fix non-PCH build 
(cherry picked from commit 058457dda9)

Conflicts:
	src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp
 2015-03-27 23:11:13 +01:00
Shauren
8cfb542ee4 Core/PacketIO: Updated values of all known server opcodes 2015-03-27 22:21:24 +01:00
MitchesD
b05d74ba46 Merge pull request #14461 from gigatotem/6.x 
[6.x] Heroism/Bloodlust/Time Warp
 2015-03-27 15:34:53 +01:00
MitchesD
65275fd57d Scripts/Misc: small changes after recent commits 2015-03-27 14:47:10 +01:00
Gigatotem
bc8f4ee976 Spells/Mage: 
Time Warp should also check for the Fatigued debuff given when a Hunter's Nether Ray pet casts Netherwinds.
 2015-03-27 13:40:15 +00:00
Gigatotem
65b27fef91 Spells/Shaman: 
Bloodlust and Heroism should also check for the Fatigued debuff from Nether Ray Hunter Pets "Netherwinds" ability.
 2015-03-27 13:36:46 +00:00
Rushor
01ee7ecc69 Scripts/Bloodmyst Isle: Script Quest: Ending Their World 
closes #1815

* Add missing Waypoint
* Improve Aggrobehaviour
* Add BroascasttextIDs
* Update to current GUID-Handling

Original Patch by @trickerer

(cherry picked from commit f1101b145b)
 2015-03-26 16:14:38 +01:00
joschiwald
766eb599ea Scripts/Spells: implement some eject passenger spells 2015-03-25 17:43:59 +01:00
Rushor
e88f276946 Scripts/Grizzlyhills: Spell: Infected Worgen Bite - Apply Spellscript and Transformation 
closes #12165

(cherry picked from commit 6080234e98)
 2015-03-25 16:37:21 +01:00
Rat
eebc468e62 Merge branch '6.x' of https://github.com/TrinityCore/TrinityCore into 6.x 
Conflicts:
	src/server/collision/Management/MMapManager.cpp
	src/server/game/Conditions/ConditionMgr.cpp
	src/server/game/Conditions/ConditionMgr.h
 2015-03-24 20:01:02 +01:00
Shauren
cc4d79495f Core/Misc: Warning fixes 2015-03-22 13:47:55 +01:00
jackpoz
3799d454b3 Scripts/Ulduar: Fix some Flame Leviathan issues 
Fix some Flame Leviathan issues:
- Fix boss evading all the time due to bad Doors check
- Opened "Lightning Door" to other bosses only after boss dies
- Eject players from the vehicles when boss dies, make them untargetable and despawn them after 5 minutes (adjust the time to the blizzlike time of choice)

(cherry picked from commit d888e4c7ad)
 2015-03-21 23:44:12 +00:00
Naios
352012e531 Core/Updates: Add an automatic database update system. Automatically detects new and edited sql updates through file lists and hashing. Detects renames, deletes and is able to create and auto import full databases. * cleanups in main.cpp of world & bnetserver * refactoring in DatabaseWorkerPool.h & MySQLConnection.cpp 
Make sure you re-run cmake, because boost::iostreams was added as dependency.
Maybe you need to install libboost-iostreams1.55-dev on unix as well.

Import every update manual until (included) those INSERT IGNORE updates for each database.

Thanks DDuarte and Shauren for your amazing ideas, help and advises.

In hope that nobody gets a "Your database structure is not up to date..." anymore ,-)

Signed-off-by: Naios <naios-dev@live.de>
Signed-off-by: Nayd <dnpd.dd@gmail.com>
 2015-03-21 14:09:38 +00:00
MitchesD
f6428df949 Scripts/Misc: sync with 3cc305138c 
adfd8a6 - Scripts/Mulgore: The Plains Vision - Move Corescrript to SAI
c21a600 - Delete zone_mulgore.cpp
87f40a5 - Scripts/Kalimdor: Remove Mulgorescripts
8904a94 - Scripts/The Barrens: Add missing Text for 'The Escape'
cfc5fb2 - DB/Misc: Fix a few startup errors from recent Updates (Script part)
 2015-03-20 20:07:25 +01:00
Rushor
2c6500a231 Scripts/Spells: Hand of Reins - Questsupport for 'Mounting Up' 
by @untaught closes #3977

(cherry picked from commit 588b92ee05)
 2015-03-20 13:16:39 +01:00
Nyeriah
a30eb73e46 Scripts/ToC: The Lich King event should only be started by the announcer 
(cherry picked from commit ea78bce592)
 2015-03-19 19:12:17 -03:00
ariel-
b3a279b6ab Split up LANG_MAP_POSITION to fix a crash when issuing .gps command 
Conflicts:
	src/server/game/Miscellaneous/Language.h

(cherry picked from commit 461daadcaf)
 2015-03-19 11:14:02 +01:00
Naios
433bc289c2 Core/Misc: Fix some issues detected by static analysis 
* Assignment of function parameter has no effect outside the function. Did you forget dereferencing it?
  -> This argument is passed by value, it makes no sence so set it to null here.

* Member variable 'instance_violet_hold_InstanceMapScript::bWiped' is not initialized in the constructor.

* Mismatching allocation and deallocation: Data
 2015-03-18 20:20:04 +01:00
click
cc3387d984 Merge pull request #14371 from Kittnz/movecirclepath_003 
Core: Move FillCirclePath function to MotionMaster
Closes #14371
(cherry picked from commit cf14e9051d)
 2015-03-18 00:35:39 +00:00
click
812e117b30 Core/Script: INFO->DEBUG notification changes in ToC 
(cherry picked from commit 0c7c25d6ed)
 2015-03-18 00:34:00 +00:00
click
5a1c4fca7c Core/Scripts: INFO-DEBUG changes in scripts (gawd) 
(cherry picked from commit a8a5fae4f9)
 2015-03-18 00:33:50 +00:00
Carbenium
cc0c9add5a Merge pull request #14317 from Naios/typesafelog 
Type safe logging
 2015-03-18 01:25:38 +01:00
Nyeriah
8b7dabab21 Scripts/Undercity: Update Lady Sylvanas' script and also implement few missing things to Journey to Undercity's quest end event 
Closes https://github.com/TrinityCore/TrinityCore/pull/14094
Thanks to @Killyana @Rushor @jaredjones and all others who helped with this

(cherry picked from commit a76722ccef)
 2015-03-17 20:22:55 -03:00
Rat
a68f19af56 Core/Phases: Mmaps now use the swapped terrain's mmtiles for all units if available. 2015-03-16 16:54:47 +01:00
Rat
8f3a80c1cf Core/Phases: Ported new phasing system from 4.3.4 branch and fixed some map swap logic 2015-03-16 07:28:49 +01:00
Naios
95ebe4f31c Core/Log: Add type safe formatting 
* improves safety and log speed through:
  - variadic templates
  - perfect forwarding
* fixes a newline in db logs
* improve performance of Appender::write by using std::ostringstream && std::move
 2015-03-13 09:15:42 +01:00
Naios
1920e9c442 Scripts/Spells: Fix some issues detected by static analysis. 
* Prefer prefix ++/-- operators for non-primitive types.
* Variable 'ownerBonus' is reassigned a value before the old one has been used.

* Fix a wrong type of ownerBonus, sometimes it is float sometimes uint32
 2015-03-11 09:29:20 +01:00
Carbenium
37a14bc2d5 Core/Support: Update the support/ticket system to 6.x 
Core/Mail: fix a logic error introduced in 829e11b662
 2015-03-10 21:09:21 +01:00
Shauren
e15ba34444 Core/Misc: Cleaned up data truncation warnings 2015-03-08 22:04:34 +01:00
MitchesD
50b4a3a707 Core/Packets: updated structure of CMSG_PLAYED_TIME, SMSG_PLAYED_TIME 2015-03-08 16:23:00 +01:00
Shauren
0ba2e0d5ee Core/Spells: Implemented multiple spell power costs 2015-03-08 13:31:57 +01:00
Rushor
7086231a03 Scripts/Arcatraz: Harbinger Skyriss Adds - Remove Unattackable Flag on Spawn 
(cherry picked from commit a99d57b0a3)
 2015-03-07 17:55:37 +01:00
D4R4
610411ce5a Scripts/The Lich King: Defile should not grow when player grabbed by Val'kyr is moves across 
Closes #14131

(cherry picked from commit ceea37c9e3)
 2015-03-07 17:50:02 +01:00
joschiwald
f65d9b3fea Fixed typo in 1dc60e8717 2015-03-07 17:49:36 +01:00
MitchesD
02ccf53ad1 Scripts/Nexus: commanders converted from SAI to C++ 
(cherry picked from commit 5009d67f0c)
 2015-03-07 11:49:03 +01:00
joschiwald
1dc60e8717 Scripts/Rotface: moved mutated infection removal handling to spellscripts to fix an startup error 2015-03-07 02:42:02 +01:00
Golrag
78c7094b01 Core/Packets: SMSG_NOTIFICATION 2015-02-23 22:25:16 +01:00
Shauren
e81eb1192a Core/Database: Removed locales_item from world database (use item_sparse_locale in hotfixes database) 2015-02-22 17:18:19 +01:00
Shauren
9fa57479ca DB: Dropped unused tables 2015-02-22 12:44:44 +01:00
Shauren
40b6736f69 Core/DataStores: Added iterator class for DBCStorage and DB2Storage 2015-02-22 12:44:24 +01:00
Duarte Duarte
8ff752afa0 Merge pull request #14167 from Golrag/WorldStates 
Core/Opcodes: SMSG_INIT_WORLD_STATES
 2015-02-22 05:48:13 +00:00
Shauren
68fceee10e Core/Spells: Removed leftovers of old cooldown handling 
* Use ItemEffect.db2 data directly instead of copying it to another structure
 2015-02-21 13:08:33 +01:00
Rushor
b5458f9d76 Scripts/Violet Hold: Zuramat the Obliterator - Improve Summonbehaviour of Void Sentry 
closes #12175

(cherry picked from commit f06b77dcb3)
 2015-02-20 14:15:39 +01:00
Rushor
809c125881 Scripts/HallsOfLightning: Boss Volkhan - Add OOC Forgecast 
closes #14066
(cherry picked from commit dc87cc69a1)
 2015-02-18 20:18:39 +01:00