Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-23 02:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity
44,662 Commits 4 Branches 146 Tags
master
Commit Graph

7915 Commits

Author SHA1 Message Date
Subv
ecf3f6c2c7 Merge pull request #8291 from Gacko/utgardekeep 
Core/DB: Utgarde Keep
 2012-11-16 05:33:16 -08:00
Gacko
c95228fcf8 Core: Utgarde Keep - Fix warning/error 2012-11-16 14:21:48 +01:00
Spp
279b7f4c10 Core/Misc: Minor changes here and there 2012-11-16 09:51:44 +01:00
Spp
978fc4b7b9 Fix compile 2012-11-16 09:09:27 +01:00
Spp
a0c8193ee7 Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Handlers/BattleGroundHandler.cpp
 2012-11-16 08:51:15 +01:00
kaelima
c9801e83c6 Script/Emerald Dragons: Fixed a couple of issues with emerald dragon world bosses and some cleanup. 
Renamed one sql from yesterday
 2012-11-14 09:02:17 +01:00
kaelima
3c3d4f4c99 Script/Commands: Reimplemented ".lookup map" command. 2012-11-13 15:56:15 +01:00
Gacko
4e95c64bad Core: Utgarde Keep - Codestyle 2012-11-12 19:16:26 +01:00
rocky517
7249865a12 Update src/server/scripts/Commands/cs_mmaps.cpp 2012-11-12 14:43:51 +02:00
Spp
f53a04add0 Core/Scripts: Added Worgen and Goblin races to .pinfo command. 2012-11-12 10:31:56 +01:00
Spp
5fd7d01bde Core/Build: Remove some more unneeded code for OS X from cmake files 
Core: Minor changes here and there
 2012-11-12 10:29:52 +01:00
Tuxity
516c6d31ec Merge branch 'master' into 4.3.4 2012-11-11 18:53:01 +01:00
Gacko
5126c0ad8b Core/DB: Utgarde Keep - Proto Drake 2012-11-11 18:43:04 +01:00
Shauren
63076ae58b Merge pull request #8260 from Warpten/cleanup 
Core/Scripts: Cleanup alterac_valley.cpp.
 2012-11-11 06:20:19 -08:00
Pitcrawler
660f7e72be DB/SAI: Fix some Howling Fjord gossips 
Closes #4973
 2012-11-11 12:28:31 +01:00
Gacko
a2748fde4b Core/DB: Utgarde Keep - Corrections 2012-11-10 18:08:40 +01:00
Gacko
cc0842f46b Core/DB: Utgarde Keep 
- Script areatrigger near Ingvar to activate the proto drake
- Assign heroic spells
- Mount proto drake rider to proto drake
 2012-11-10 17:33:07 +01:00
Warpten
51b23af98d Core/Scripts: Cleanup alterac_valley.cpp. 2012-11-09 18:14:30 +01:00
Warpten
05c8cbaa4b Scripts/Ruby Sanctum: 
* Move Dark / Flame Breaths handling to generic_halionAI.
* Also apply Twilight Precision to Twilight Halion.
* Fix some mistakes in the corporeality handling code, and remove some unused enums.

Fixes #8176.
 2012-11-09 18:12:29 +01:00
Spp
c51380690f Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/DataStores/DBCEnums.h
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Server/WorldSession.h
 2012-11-09 14:26:27 +01: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
Spp
35d63a9799 Merge branch 'master' into 4.3.4 
Conflicts:
	sql/base/characters_database.sql
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/scripts/EasternKingdoms/silverpine_forest.cpp
 2012-11-08 11:25:38 +01:00
Spp
9659f0335f Core/Guilds: Multiple changes 
- Fix Delete Rank
- Fix Rank order after Rank is deleted
- Send correct event after Guild Tab purchase
- Better debug msgs
- Move news to Event Logs (internal struct is like Event Logs and Bank Event Logs). Max news configurable
 2012-11-07 23:21:19 +01:00
kaelima
68291eed03 Merge git://github.com/TrinityCore/TrinityCore into mmaps 2012-11-07 16:43:13 +01:00
ille
dd2e02f157 Core/Scripts: tweak code in pyrewood_ambushAI::SummonCreatureWithRandomTarget() 2012-11-05 12:44: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
click
e587d8c1af Core. Fix non-PCH building (again)... 2012-11-03 15:04:30 +01:00
Spp
c97fc99e16 Merge branch 'master' into 4.3.4 
Note: What a bad automatic merge!!! needed to fix a lot of stuff... grrr

Conflicts:
	src/server/game/AI/EventAI/CreatureEventAI.cpp
	src/server/game/AI/EventAI/CreatureEventAIMgr.cpp
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Entities/Creature/GossipDef.cpp
	src/server/game/Entities/Pet/Pet.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Guilds/GuildMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/ChannelHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/LFGHandler.cpp
	src/server/game/Handlers/MiscHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/game/Quests/QuestDef.h
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSession.cpp
	src/server/game/Server/WorldSession.h
	src/server/game/Spells/Spell.cpp
	src/server/scripts/Commands/cs_debug.cpp
	src/server/scripts/Commands/cs_titles.cpp
	src/server/scripts/Kalimdor/boss_azuregos.cpp
	src/server/scripts/OutdoorPvP/OutdoorPvPEP.cpp
 2012-10-30 10:30:05 +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
d2ba73d97f Core/Misc: Proper fix for previous commit (c5c8e38 - check race change before perfoming faction-change actions) 
Core/Misc: tab to spaces and remove trailing whitespaces
 2012-10-29 12:28:12 +01:00
Spp
876ad50dcd Core/Misc: Tweaked ThreatContainer internals 
(and many cosmetic changes here and there)
 2012-10-26 14:31:19 +02:00
Gacko
ead804df92 Core: Fix compile warnings 2012-10-25 22:08:10 +02:00
Subv
55892048ef Merge pull request #8127 from Gacko/childrens_week 
Core/DB: Children's Week
 2012-10-25 07:43:02 -07:00
Gacko
cd26aa7206 Core: Children's Week - Remove event.h include 2012-10-25 16:16:01 +02:00
Subv
69a81836ab Merge pull request #8174 from tibbi/sota 
correcting SotA teleports + cleanup
 2012-10-25 05:56:01 -07:00
tibbi
f8ce00acca correcting SotA teleports + cleanup 2012-10-24 14:51:42 +01:00
Spp
013fb1f4d9 Core/Misc: reduced amount of string memory allocations (Step I) 2012-10-24 15:34:48 +02:00
Spp
60d4343d8e Merge branch 'master' into 4.3.4 
Conflicts:
	src/server/game/Spells/Spell.cpp
	src/server/shared/Logging/Appender.h
 2012-10-23 14:16:05 +02:00
Spp
663db1cee3 Core/Misc: Add default count param to HasItemCount 2012-10-23 13:11:57 +02:00
Kaelima
1ff5b83657 Merge pull request #8074 from Warpten/halionUpdate 
Scripts/Ruby Sanctum: Misc fixes.
 2012-10-23 03:58:48 -07:00
Spp
1be638e731 Core/Dungeon Finder: Add debugging commands 2012-10-23 11:44:02 +02:00
Warpten
a664a356e2 Scripts/Ruby Sanctum: 
* Fixed a crash caused by the grid.
* Update spawnmasks.
* Misc updates and corrections.

Closes #8079.
Closes #8078.
Closes #8081.
Closes #8077.
 2012-10-22 21:18:21 +02:00
Subv
43d57c7547 Core/Build: Build fix from previous merge 2012-10-21 17:28:04 -05:00
Subv
bcabdb08e4 Merge branch '4.3.4' of https://github.com/TrinityCore/TrinityCore into 4.3.4 2012-10-21 17:26:37 -05:00
Subv
1fc3aad9d7 Merge branch 'master' of https://github.com/TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/DataStores/DBCfmt.h
	src/server/game/DungeonFinding/LFGMgr.h
	src/server/scripts/Kalimdor/feralas.cpp
 2012-10-21 17:18:35 -05:00
Subv
82c251dc3d Merge pull request #8088 from Gacko/q13038 
Core/DB: Quest 'Distortions in time'
Closes #3011
 2012-10-21 15:11:50 -07:00
Shocker
66889f11b7 Core/Spells: Use previous defines in a druid spell script 2012-10-21 22:25:52 +03:00
Gacko
9c4cf9b39c Core/DB: Children's Week 2012-10-21 14:33:20 +02:00
durotar
998c74ebe0 Core/Script: Gnomeregan - Deleting duplicate texts and adjusted the script 2012-10-20 11:44:43 -05:00