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
Shocker
ecb1bdd7c3
Merge pull request #4489 from devilcoredev/fix_001
...
Core/Achievemens: Fix 'The Undying' and 'The Immortal' achievements
2012-01-04 13:27:43 -08:00
Wilds
2a38902d2e
Core/Battleground: fix re-enter into battleground after disconnect
2012-01-04 11:52:13 +01:00
Giuseppe Montesanto
bf73409f49
Fix 'The Undying' and 'The Immortal' achievements.
2012-01-01 04:34:14 +01:00
kiper
8299627ed9
Update headers for 2012. HAPPY NEW YEAR!!!
2012-01-01 00:32:13 +01:00
Spp
fa9daaf95b
Merge branch 'master' into 4.x and some warning fixes
2011-12-27 10:15:27 +01:00
megamage
ce0dfa88a6
Revert "Temp fix for *nix build."
...
It builds in *nix without this patch.
This reverts commit e84fffe588 .
2011-12-22 10:15:17 -05:00
megamage
e84fffe588
Temp fix for *nix build.
2011-12-22 08:57:16 -05:00
megamage
8cf2062c1f
Update grid system. Try to fix some crashes and transport passengers (now they are despawned after a while).
2011-12-20 17:07:09 -05:00
Shauren
b4df932e71
Core/Dungeon Finder: Implemented Luck of the Draw buff
2011-12-18 22:09:03 +01:00
Nay
9f635ca906
Merge branch 'master' into 4.x
2011-12-18 15:10:54 +00:00
Shauren
23a5c5e855
Core/Maps: Removed some incorrect checks in GetHeight, flying creatures should now fall correctly when killed
2011-12-13 18:19:25 +01:00
Machiavelli
b1c8226d58
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
2011-12-10 15:21:55 +01:00
kaelima
11fb0beaf0
Core/Misc: Fixed some duplicate checks for player typeid in Unit::Kill and Spell::EffectSummonDeadPet. Also some random cleanup
2011-12-10 13:48:41 +01:00
Machiavelli
fe69bd654a
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x
...
Conflicts:
src/server/game/Entities/Creature/GossipDef.cpp
src/server/game/Globals/ObjectMgr.cpp
src/server/game/Quests/QuestDef.cpp
2011-12-06 12:01:51 +01:00
megamage
cde7ea260e
Make AddToMap return bool.
2011-11-28 13:23:20 -05:00
megamage
49b2407077
Add an ASSERT to find out the reasons of some crashes.
2011-11-28 11:32:52 -05:00
Rat
7fdefceb43
Core/Packets: updated update_object structure
...
Welcome ingame!
2011-11-27 16:06:29 +01:00
Rat
05880cc748
Core/DataStores:
...
-dropped dbcstring/db2string, use simple nonconstant char* (will be useable when loading custom data from db to dbc)
-fixed most dbc string related errors (you can now turn on logging)
2011-11-24 13:43:41 +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
f091360940
Do not allow base map be accessed from outside if map is instanceable.
2011-11-23 13:14:59 -05:00
megamage
98be413ce0
Clean up very some confusing MapManager functions (create/find map/base map).
2011-11-23 12:45:59 -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
Kandera
04183cb8de
Core/LFG: Fix being unable to enter an instance to retrieve body when you have 5 or more instances in the database.
2011-11-18 16:47:06 -05:00
megamage
d9e4d991c9
Fix a crash when player is logged out when not in map.
2011-11-12 08:16:52 -05:00
megamage
07cf71fdd4
Some cleanup of add/remove to/from map.
2011-11-11 17:50:26 -05:00
megamage
31a88d4fe5
Fix the crash when removing object from an unloaded grid. Object should always be unlinked from grid no matter if the grid is loaded.
2011-11-10 17:31:45 -05:00
megamage
23b3f16f3a
Add some ASSERT in add/remove obj to/from grid.
2011-11-10 10:18:32 -05:00
Shocker
c2a2a4f713
Merge pull request #3872 from Bootz/master
...
Codestyle clean-up
2011-11-09 02:31:18 -08:00
megamage
462a2b9876
Change more ace_guard to trinity_guard
2011-11-08 10:48:49 -05:00
Bootz
d1334624da
Core: Codestyle clean-up
...
"pl"->"player"
Note: codestyle methods needs maintained, Player* player.
still to do properly clean-up chat.cpp.
2011-11-07 11:18:00 -06:00
Bootz
f75ec5ba2b
Core: Codestyle clean-up
...
"plr"->player
Note: codestyle methods needs maintained, Player* player.
2011-11-07 11:06:39 -06:00
megamage
495ef10b0d
Change ObjectAccessor to an ACE_Null_Mutex singleton, since its members have been protected by individual locks.
...
Also make some of its member functions static.
2011-11-07 09:44:09 -05:00
megamage
91f56c181c
More cleanup of grid system.
2011-10-22 10:01:29 -04:00
megamage
80a18b9e56
Some cleanup of grid system.
2011-10-22 09:36:05 -04:00
kaelima
be0b2fcf97
Core/Grid:
...
- Simplified CellArea calculation (Original author: SilverIce)
- Removed unused code in Cell class (Original author: SilverIce)
- Improve some Visit functions.
2011-10-19 17:40:44 +01:00
Liberate
fd45c111b0
Core/Grid: Fix a typo in e0d933fed8. Grids should work correctly again. Thanks Kaelima.
2011-10-18 23:16:33 +02:00
megamage
7231ab959f
Clean up grid system. Get rid of GridLoader. This patch should not change any logic, except the incorrect calculation of the number of loaded corpse (which only affects log).
2011-10-18 14:31:34 -04:00
megamage
ffdfd9252b
More clean up of grid system.
2011-10-18 11:51:30 -04:00
megamage
e27ef59548
Clean up grid system: allow directly creating Cell from x, y.
2011-10-18 11:18:49 -04:00
megamage
e0d933fed8
Use method IsCoordValid() to replace explicit checks.
2011-10-18 11:05:32 -04:00
megamage
c29ff41001
Rename some classes in grid system.
...
Note: The naming of classes is still confusing. "cell" usually refers to class "Grid", and "grid" usually refers to class "NGrid". But it requires a lot of changes to clean this up.
2011-10-18 10:53:34 -04:00
Spp
bc023c6dfb
Core: Fix some warnings
2011-10-18 12:39:01 +02:00
Spp
805e14a463
Core/Grid: Replaced ambiguous operator overloads with functions (Makes it clear to read)
2011-10-18 11:42:40 +02:00
megamage
3ba22d0d06
Rename Map::Add to Map::AddToMap, Map::Remove to Map::RemoveFromMap for better management.
2011-10-10 17:39:34 -04:00
megamage
76c9c30c2b
Merge pull request #3399 from megamage/master
...
Fix the relocation of creatures across cells. Try to fix #3054 .
2011-10-10 13:12:15 -07: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
megamage
eb8cbae0d5
Fix the relocation of creatures across cells. Try to fix #3054 .
2011-10-07 17:36:23 -04:00
Bootz
96d7a1e970
REPO: code-style clean-up
...
* Fixed pGuild->guild
* Fixed pGroup->group
* Fixed pOwner->owner
2011-10-07 10:54:53 -05:00