Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-20 09:17:36 +01:00
Code Issues Packages Projects Releases Wiki Activity
18,064 Commits 4 Branches 146 Tags
6fc17c6b1e0dadc3429ffa67b753ac492ddbd7a1
Commit Graph

282 Commits

Author SHA1 Message Date
Nay
6fc17c6b1e Core: Fix compile warnings 2013-01-22 19:34:27 +00:00
Vincent_Michael
94944e3072 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
 2013-01-20 00:34:20 +01:00
Gacko
e524539d90 Core/CS: More npcflag info in .npc info 2013-01-19 20:59:48 +01:00
Vincent_Michael
65cd79dc77 Core/Misc: Update headers to 2013 2013-01-14 17:42:06 +01:00
Nay
e6a07076c3 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2013-01-14 13:58:34 +00:00
Spp
802657250c Core/Misc: Apply codestyle to multiple files 2013-01-14 09:50:59 +01:00
Vincent_Michael
b08ea19aff Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-13 01:25:56 +01:00
Nay
9d1e5a013e Core/Ticket: Fix unassigned message not showing who was assigned to ticket 
Thanks to @Bezo
Closes #8923
 2013-01-12 18:16:02 +00:00
Vincent_Michael
84cdd538bb Core/Commands: Fix sql warnings with pinfo at ban players 2013-01-12 18:52:51 +01:00
Vincent_Michael
7210ffe34d Core: Fix warnings 2013-01-09 21:14:12 +01:00
blub
9ad1857e59 Merge pull request #8826 from joschiwald/mmaps_disable 
Core/MMaps: use DisableMgr to disable pathfinding on a specific map
 2013-01-07 07:52:35 -08:00
Vincent_Michael
24e0eb1812 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2013-01-05 16:55:17 +01:00
Nay
8ac5b3b7d6 Core/Player: Prevent a crash in CastedCreatureOrGO and add an assertion to KilledMonster 2013-01-04 21:15:18 +00:00
Vincent_Michael
8db66bfefd Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 2013-01-04 01:27:51 +01:00
Nay
9394dc10b4 Core/Scripts: Drop gameobject_scripts table - empty, deprecated and no longer needed 2013-01-03 19:18:26 +00:00
Vincent_Michael
62adbdab99 Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
 2013-01-01 23:12:21 +01:00
Vincent_Michael
7fea285aea Core/Command: Add command for near creature finding 2013-01-01 18:16:32 +01:00
Vincent_Michael
eef7754dc2 Update more copyright note for 2013. 2013-01-01 15:35:09 +01:00
Vincent_Michael
cc65aba789 Update copyright note for 2013. 
Happy new year.
 2013-01-01 00:41:01 +01:00
joschiwald
08f62d8313 Core/MMaps: use DisableMgr to disable pathfinding on a specific map 2012-12-30 21:09:21 +01:00
Subv
ff5b0a14a4 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into mmaps 2012-12-28 11:45:46 -05:00
secharles
8272affe92 Script/Commands: New command: lookup spell id #spellid 
Command to allow to know spell names based on id

Example:
 lookup spell id 686:
 686 - [Shadow Bolt rank 1 esES] [know]

Closes #8800

Signed-off-by: Nay <dnpd.dd@gmail.com>
 2012-12-28 01:05:56 +00:00
Nay
7e196e8e58 Merge remote-tracking branch 'origin/master' into mmaps 2012-12-27 17:53:34 +00:00
Vincent_Michael
7b9b67a3b3 Core/Quest: Drop table quest_end_scripts 2012-12-26 23:20:05 +01:00
kaelima
0a88787dfc Merge git://github.com/TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/IdleMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Movement/Spline/MoveSpline.h
 2012-12-21 00:00:16 +01:00
Aokromes Name
5d77b10c35 Core/Account: Add logs for password change and fail change password 2012-12-18 01:58:12 +01:00
Vincent-Michael
0a3972db7c Core/Quest: Removed table quest_start_scripts 2012-12-04 11:23:10 +01:00
Spp
e954498560 Core/Misc: Random changes here and there to minimize differences with 4.3.4 branch 2012-11-27 13:03:12 +01:00
joschiwald
e83c5d1a0f Core/Conditions: use proper SpellCastResult instead of Notification when CONDITION_SOURCE_TYPE_SPELL fails 2012-11-24 02:45:48 +01:00
Nay
24cd72c8e1 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Maps/Map.cpp
	src/server/game/Movement/MovementGenerator.h
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.h
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/HomeMovementGenerator.h
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/PointMovementGenerator.h
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/RandomMovementGenerator.h
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.h
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.h
	src/server/game/Spells/SpellEffects.cpp
 2012-11-23 23:39:03 +00:00
Spp
7bef4ce401 Core/Misc: Reduce header dependencies - Step III 2012-11-20 15:03:56 +01:00
Spp
b5c9ab8802 Core/Misc: Reduction of header dependencies - Step II 2012-11-20 12:30:30 +01:00
Spp
b99c347747 Core: Remove Player.h dependency from all the possible headers 2012-11-17 05:18:37 +01:00
Subv
d55771267a Core/EventAI: Removed table creature_ai_summons. 2012-11-16 12:30:48 -05:00
kaelima
3c3d4f4c99 Script/Commands: Reimplemented ".lookup map" command. 2012-11-13 15:56:15 +01:00
rocky517
7249865a12 Update src/server/scripts/Commands/cs_mmaps.cpp 2012-11-12 14:43:51 +02:00
Spp
333b8e5159 Core/Build: Enable Clang PCH support and OS X specific features 
Core: Fix warnings here and there
 2012-11-09 13:13:45 +01:00
kaelima
3c13454ad7 Merge git://github.com/TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Movement/Spline/MoveSplineInit.cpp
 2012-11-05 12:02:08 +01:00
Spp
9074c11a90 Core/Dungeon Finder: Update "Current group roles" according to people in queue. 
Core/Dungeon Finder: Properly update internal lfg group structure at server load
 2012-10-29 20:13:42 +01:00
Spp
14027262ee Core/Dungeon Finder: Add some more debug msgs and restore LFG group structure at server load. 2012-10-29 13:58:48 +01:00
Spp
876ad50dcd Core/Misc: Tweaked ThreatContainer internals 
(and many cosmetic changes here and there)
 2012-10-26 14:31:19 +02:00
Spp
013fb1f4d9 Core/Misc: reduced amount of string memory allocations (Step I) 2012-10-24 15:34:48 +02:00
Spp
1be638e731 Core/Dungeon Finder: Add debugging commands 2012-10-23 11:44:02 +02:00
Subv
9dc2b7ecd5 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into mmaps 2012-10-19 17:57:30 -05:00
Warpten
c8c4291c6f Core/Commands: Allow .modify money to take another parameter structure: 
Example uses:
* .modify money 325g 25s 12c is the same as .modify money 3252512
* .modify money -12g is the same as .modify money -120000
* .modify money -12g 45s is the same as .modify money -115500
* .modify money 25c 18g is the same as .modify money 18g 25c
 2012-10-12 22:13:28 +02:00
Subv
ecc2362c69 Scripts/Commands: Fixed the command to restore a deleted character. 
Thanks @vlad852
 2012-10-10 09:25:25 -05:00
tibbi
5896da6689 some optimization + adding level to CharacterNameData 2012-10-08 17:21:09 +01:00
Nay
972b418103 Merge remote-tracking branch 'origin/master' into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/ConfusedMovementGenerator.cpp
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
 2012-10-07 14:51:21 +01:00
kaelima
8c013955ac Core/Misc: Fix some possible issues detected by static code analysis 2012-10-07 01:31:43 +02:00
Subv
f7d3600e7e Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps 
Conflicts:
	src/server/game/Movement/MovementGenerators/FleeingMovementGenerator.cpp
 2012-10-04 19:39:09 -05:00