Rat
5d39e09d89
Merge branch 'master' of github.com:TrinityCore/TrinityCore
2011-11-23 20:23:26 +01:00
Rat
47d0a7f3af
Merge branch 'master' of github.com:TrinityCore/TrinityCore
...
Conflicts:
src/server/game/DataStores/DBCStores.cpp
src/server/game/DataStores/DBCfmt.h
src/server/game/Server/Protocol/Opcodes.cpp
2011-11-23 20:23:04 +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
megamage
5a0ffefecc
Remove unnecessary const_cast<Map*>.
2011-11-23 12:51:20 -05:00
megamage
298c162c86
Do not allow an instance map to be created twice if it already exists. Fix #4018 .
2011-11-23 09:34:08 -05:00
Rat
34f0792f75
fixed startup crash while loading instance_encounters
2011-11-22 16:50:00 +01:00
megamage
462a2b9876
Change more ace_guard to trinity_guard
2011-11-08 10:48:49 -05:00
Spp
bc023c6dfb
Core: Fix some warnings
2011-10-18 12:39:01 +02:00
megamage
69414ed065
Add MX lock to InstanceSave::Add/RemovePlayer. Because BindToInstance can be called within Player::Update.
...
Try to fix crashes #2514 and #2177 . May also fix #3466 , #2862 and #2239 .
2011-10-12 11:36:03 -04:00
Machiavelli
82dbe7bc17
Core: Fix some build errors after code style cleanup
2011-10-08 13:20:04 +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
cc06c41887
Core: Move FormationMgr to namespace
...
Also...
- Warning fixes
- Make Singleton constructors private
2011-09-28 11:11:38 +02:00
Spp
af05915b9e
[Cosmetic] Apply codestyle "XXX * " and "XXX *" changed to "XXX* " (with some exceptions)
2011-09-15 14:12:57 +02:00
Chaplain
bea649d045
Core: cleanup.
...
*remove some garbage
*little bit moore const func
*fix process of args in vmap3_extractor
2011-09-01 22:38:32 +03: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
click
c77aa6e846
Core: And some more cleanups...
2011-06-12 02:00:43 +02:00
click
f16df538ee
Core: More codestyle cleanups
2011-06-12 01:47:45 +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
d64c6ad55a
Core/Instances: Kill weird SQL generator function and fix cleaning of expired instances
2011-05-02 22:04:35 +02:00
leak
f70d5196ac
And another one
2011-05-02 14:45:53 +02:00
leak
1003f30448
Add spaces after commas
2011-04-29 20:47:02 +02:00
leak
6d1924cee8
Removing SQLStorage class leftovers
2011-04-28 23:03:02 +02:00
leak
5aeb4fe794
Core/ObjectMgr: Refactor sInstanceTemplate
2011-04-28 22:16:13 +02:00
Shauren
ba5bd01ade
Core/InstanceSaveMgr: Fixed typo in friend declaration
2011-04-25 14:17:29 +02:00
Shauren
40cb0718c2
Core: Added definitions to mark methods as deprecated and marked DoCompleteAchievement as such
2011-04-22 13:41:58 +02:00
Shauren
97f482cd82
Core/Achievements: Removed unused parameter from UpdateAchievementCriteria and unused DoCompleteAchievement from BattlegroundMgr
2011-04-21 23:32:45 +02:00
Azazel
3993b73925
Core/CharDB cleanup: change creature_respawn and gameobject_respawn column names to lowerCamel, rename instance column to instanceId and move all queries to these tables to prepared statements.
...
Fix import error in character_database.sql.
2011-04-13 17:02:06 +06:00
Azazel
5357b1ba77
Core/CharDB Cleanup: alter corpse table making column names lowerCamel and move all queries to prepared statements.
...
NOTICE: column can be named `guid` only if it represents character guid. All other guids will be renamed to reflect their purpose (like corpseGuid in this specific case)
2011-04-11 14:39:00 +06:00
Shauren
1a4a618d81
Core/Scripts: Code style cleanup in ScriptedAI and BossAI
2011-03-19 10:54:16 +01:00
Shauren
b986dfb57a
Core/Scripts: Added FillInitialWorldStates hook to InstanceScript class for the same purpose as its used in Battlegrounds
2011-03-13 21:49:07 +01:00
leak
190ef1c2ef
Core/Instances: Fix crash and allocation issue in instance id generation
2011-03-11 13:24:58 +01:00
leak
4569e4852a
Core/Instances: Recycle instance IDs. Should fix instance ID shifting and related issues with instance binding.
...
fixes #736
2011-03-10 22:22:27 +01:00
leak
a751bd64aa
Core/Instances: Remove unused map
2011-02-23 00:15:45 +01: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
3f0d888b0e
Core/Instances: Fixed cleaning and packing query for account_instance_times table (instance can no longer exist but player limit is still there)
2011-01-28 15:05:46 +01:00
leak
137b079eea
Core: Generic cleanup (tab2spaces/trailing whitespace removal)
2011-01-26 01:03:35 +01:00
Shauren
867bc197ef
Core/Instances: Made the max amount of instances player can enter within hour configurable and fixed typo in instance packing/cleaning query
2011-01-24 16:12:02 +01:00
Shauren
820f87f365
Core/Instances: Implemented confirmation dialog for players upon entering instance which would permanently bind the player to it, players can now choose to get saved or leave the instance
...
Also fixes broken build
2011-01-24 11:38:59 +01:00
Shauren
464837077a
Core/Instances: Implemented hourly instance limit: players are limited to entering 5 instances per hour (account wide limit)
2011-01-24 11:20:30 +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
leak
c59ea4726e
SQL: Characters db storage type cleanup No. 6
2011-01-20 01:02:24 +01:00
leak
a7df9ddff1
SQL: Characters db storage type cleanup No. 4
2011-01-19 22:46:21 +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