josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,223 Commits 1 Branch 0 Tags
bdf6cf5146b884591e3a033a31ca5b729fdff0ff
Commit Graph
34 Commits
Author SHA1 Message Date
Spp 5cff9e0716 Merge branch 'master' into 4.x 
Conflicts:
	sql/base/auth_database.sql
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/AI/CoreAI/CombatAI.cpp
	src/server/game/AuctionHouse/AuctionHouseMgr.cpp
	src/server/game/Battlegrounds/Zones/BattlegroundSA.cpp
	src/server/game/DataStores/DBCStructure.h
	src/server/game/DataStores/DBCfmt.h
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Globals/ObjectMgr.cpp
	src/server/game/Globals/ObjectMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Movement/MotionMaster.cpp
	src/server/game/Movement/MovementGenerators/WaypointMovementGenerator.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/game/Server/Protocol/Opcodes.cpp
	src/server/game/Server/WorldSocket.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/game/Spells/SpellInfo.cpp
	src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
	src/server/scripts/Spells/spell_quest.cpp
	src/server/shared/Logging/Log.h
	src/server/worldserver/worldserver.conf.dist
	src/tools/vmap3_extractor/model.h
	src/tools/vmap4_extractor/CMakeLists.txt
	src/tools/vmap4_extractor/dbcfile.cpp
	src/tools/vmap4_extractor/dbcfile.h
	src/tools/vmap4_extractor/loadlib/loadlib.h
 2012-02-23 13:06:35 +01:00
Spp 03c34ee507 Fix a lot of warnings 2012-02-16 13:56:28 +01:00
Spp 37b66384f3 Merge branch 'master' into 4.x 
Conflicts:
	src/server/authserver/Server/AuthSocket.cpp
	src/server/game/Entities/Object/Object.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Miscellaneous/SharedDefines.h
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
 2012-01-31 11:49:53 +01:00
Shauren e9b243991e Compile fix 2012-01-12 22:33:11 +01:00
Shauren 84c7eb5643 Core/Scripts: Fixed DoSendNotifyToInstance message formatting (that should only be done once) 2012-01-12 21:14:57 +01:00
Nay 9c26ce8da5 Merge branch 'master' into 4.x 
Conflicts:
	src/server/game/Achievements/AchievementMgr.cpp
	src/server/game/Achievements/AchievementMgr.h
	src/server/game/Entities/Corpse/Corpse.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Quests/QuestDef.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
 2012-01-07 17:13:42 +00:00
leak ced346076b Merge pull request #4567 from Kiperr/master 
Happy new year!
 2011-12-31 16:13:28 -08:00
leak cdbeb42e0f Core/DBLayer: Refactor prepared statement defines to new format (char db) 2012-01-01 01:09:38 +01:00
kiper 8299627ed9 Update headers for 2012. HAPPY NEW YEAR!!! 2012-01-01 00:32:13 +01:00
Rat 5d39e09d89 Merge branch 'master' of github.com:TrinityCore/TrinityCore 2011-11-23 20:23:26 +01:00
Shauren 358b33239a Core: Fixed remaining C6246: Local declaration of 'x' hides declaration of the same name in outer scope. from previous commit 2011-11-23 19:17:33 +01:00
Rat 34f0792f75 fixed startup crash while loading instance_encounters 2011-11-22 16:50:00 +01:00
Spp bc023c6dfb Core: Fix some warnings 2011-10-18 12:39:01 +02:00
Bootz 5b4c7783c2 REPO: Code-style clean-ups 
* Fixed pMap->map
* Fixed pInstance->instance
* Fixed pInsta->instance
* Fixed pQuest->quest
* Fixed pWho->who
* Fixed pTarget->target
* Fixed pGo->go

~DEVNOTES: Handlers/QuestHandler.cpp still needs to be cleaned...
 2011-10-07 19:45:43 -05:00
Bootz 81c0a3a847 REPO: code-style clean-up 
* Fixed pPlayer->player
* Fixed pCreature->creature

~DevNote: codestyle for Player should be (*player), not *plr or *p...
same goes for Creatures (*creature)... more cleaning needed.
We've way too many codestyles happening here.
 2011-10-07 11:08:09 -05:00
Spp af05915b9e [Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions) 2011-09-15 14:12:57 +02:00
Lopin d2f2c4dee5 Core/InstanceScript: Function DoRemoveAurasDoToSpellOnPlayers() will also remove those auras from players' pets 2011-08-19 18:17:04 +02:00
Spp- e47b96af3e Core: Append single character to stream as character, not as a string 2011-07-29 14:18:28 +02:00
Lopin cd76930f45 Core/Instances: Remove function DoCompleteAchievement() 2011-06-25 19:17:50 +02:00
Shauren 9650ba678b Core/Scripts: Implemented DOOR_TYPE_SPAWN_HOLE to use in instance script DoorData, marking doors that are only open if encounter is in progress, typically used with spawning points 2011-05-16 13:24:08 +02:00
leak 1003f30448 Add spaces after commas 2011-04-29 20:47:02 +02:00
Shauren 97f482cd82 Core/Achievements: Removed unused parameter from UpdateAchievementCriteria and unused DoCompleteAchievement from BattlegroundMgr 2011-04-21 23:32:45 +02:00
Machiavelli e07e20ffca Core/Log: Implement log masks for debug log level, to allow selective debug output. Update your worldserver.conf. 2011-02-20 20:16:34 +01:00
Shauren c2b0bcbd6c Core/Instances: Implemented DungeonEncounter.dbc for creating completed encounters mask to use in packets 
Core/Dungeon Finder: Implemented new way of giving random dungeon rewards, linked to DungeonEncounter.dbc
 2011-02-03 22:20:40 +01:00
Shauren e5b4f8e84d Scripts/Icecrown Citadel: Implemented boss raid frames for Blood Prince Council 2011-01-23 21:42:32 +01:00
Shauren ac689f456d Core/Scripts: Implemented method for sending encounter boss frames from scripts 2011-01-23 16:59:33 +01:00
Shauren 039d87bbc9 Scripts: Implemented virtual function DoCastSpellOnPlayers (self-explanatory) and CheckRequiredBosses checking states of other bosses before allowing combat with selected one 
Scripts/Icecrown Citadel: Added checks to prevent skipping bosses
 2011-01-01 23:37:35 +01:00
Machiavelli 957c69de83 Update copyright note for 2011. 
Happy new year.
 2011-01-01 15:01:13 +01:00
Shauren 928443d899 Core: Removed more operator workarounds for ACE_Singleton (missed previously because of inconsistent naming) 
--HG--
branch : trunk
 2010-12-23 23:25:44 +01:00
click f0c4241ea4 Remove the accidental additions of CRLF-crap from the header updates 
--HG--
branch : trunk
 2010-10-07 15:35:36 +02:00
click 8ea4b32fab Update copyright headers (following the same standard in all files = good) 
--HG--
branch : trunk
 2010-10-07 12:41:56 +02:00
Spp 405f312918 Core: Fix more warnings 
--HG--
branch : trunk
 2010-08-30 15:25:15 +02:00
Spp e7856a831c Core: Remove "enumeration value 'xxx' not handled in switch" warnings 
--HG--
branch : trunk
 2010-08-21 20:55:31 +02:00
azazel 590199d8e1 * Rename InstanceData to InstanceScript 
* Rename *mgr to their new names in scripts project
* Mass convert all the scripts (NEEDS THOROUGH TESTING, because it was done automatically) Please, report bugs on issue tracker.

--HG--
branch : trunk
rename : src/server/game/Instances/InstanceData.cpp => src/server/game/Instances/InstanceScript.cpp
rename : src/server/game/Instances/InstanceData.h => src/server/game/Instances/InstanceScript.h
 2010-08-08 22:54:58 +06:00