34bec5913b
Merge plus changed getposition to return a reference
2015-01-24 11:48:06 -08:00
17af9e3808
Merge fixes, hopefully didn't break anything.
2015-01-23 13:36:27 -08:00
06ff4823d3
Minor tweaking to new logsys
2015-01-23 15:48:20 -05:00
269d56e1d0
Switched out our kinda juryrigged vector types for glm::vec types since we use that as a 3d math library already but never switched out the types
2015-01-23 00:01:10 -08:00
c5447778a6
Merge remote-tracking branch 'remotes/origin/master' into logging_changes
...
Conflicts:
world/client.cpp
world/worlddb.cpp
zone/aggro.cpp
zone/bot.cpp
zone/client.cpp
zone/client_packet.cpp
zone/client_process.cpp
zone/doors.cpp
zone/entity.cpp
zone/inventory.cpp
zone/mob_ai.cpp
zone/perl_client.cpp
zone/spells.cpp
zone/waypoints.cpp
zone/zone.cpp
zone/zonedb.cpp
zone/zoning.cpp
2015-01-21 17:29:30 -06:00
951f98a63e
Re-Implement GMSay colors: http://i.imgur.com/tQbuKUM.jpg
2015-01-20 00:53:52 -06:00
af8ab89a36
Compile state
2015-01-18 01:50:05 -06:00
b15e5f7913
Refactor GMSayHookCallBackProcess to use category instead of type
2015-01-18 01:48:07 -06:00
f410b270ad
Fix Callback in zone, some stragglers in the renaming of function
2015-01-16 03:22:23 -06:00
78e08e5327
Move GMSayHookCallBackProcess out of client logs and into Zone Class
2015-01-16 02:56:39 -06:00
f409d39f1a
merge upstream
2014-12-21 13:57:20 -08:00
c646a6c43a
zone.cpp & .h include header cleanup
2014-12-15 19:14:41 -06:00
2aa287fe3c
Merge
2014-12-05 20:16:13 -08:00
100eca203f
GetClosestZonePoint converted to xyz_location
2014-12-05 17:57:07 -08:00
523562c152
GetClosestZonePoint converted to xyz_location (id version)
2014-12-02 21:46:16 -08:00
f00cddd67e
graveyard_x(), graveyard_y(), graveyard_z(), and graveyard_heading() converted to GetGraveyardPoint()
2014-12-02 21:00:31 -08:00
ff1942245b
Added GetGraveyardPoint() to Zone
2014-12-02 20:25:38 -08:00
e64e131c9c
Removed safe_x(), safe_y(), safe_z() from Zone
2014-12-02 20:19:12 -08:00
0275e9646c
Added GetSafePoint to Zone
2014-12-02 19:55:29 -08:00
14608c972a
SetGraveyard to xyz_header
2014-12-01 23:34:41 -08:00
c3333a46c9
pgraveyard_x, pgraveyard_y, pgraveyard_z, and pgraveyard_heading converted to xyz_heading as m_Graveyard
2014-12-01 23:12:19 -08:00
40ec1f805f
psafe_x, psafe_y, and psafe_z replaced with xyz_location m_SafePoint
2014-12-01 22:35:46 -08:00
f5a94ed07b
IsSpellBlocked converted to use xyz_location
2014-12-01 16:00:48 -08:00
395be050a3
Switch random function to std::mt19937
...
Added class EQEmu::Random
Functions:
EQEmu::Random::Int(int low, int high)
EQEmu::Random::Real(double low, double high)
EQEmu::Random::Roll(int required)
EQEmu::Random::Roll(double required)
EQEmu::Random::Reseed()
For zone, you will access the random object through the zone object
ex.
zone->random.Int(0, 100);
Int returns a random int between low and high
Real returns a random double between low and high
Roll(int) returns true if Int(0, 99) < required is true
Roll(double) returns true if Real(0.0, 1.0) <= required is true
2014-12-01 18:13:12 -05:00
fb9d76f851
GetSpellBlockedMessage converted to xyz_location
2014-12-01 14:16:53 -08:00
ad9c0df552
#include and forward declaration cleanup of
...
client.cpp net.cpp questmgr.cpp zone.cpp zone.h
2014-11-29 03:12:34 -06:00
c506e33018
Fixed merge
2014-11-18 21:12:48 -08:00
ca430e2494
Fix void Database::GetCharName(uint32 char_id, char* name)
...
Increased MAX_PP_SPELLBOOK to 720 for UF/RoF
Increased MAX_PP_MEMSPELL to 12
Implemented up to 12 spell slots
Fix for public_note default value in bool BaseGuildManager::DBSetGuild(uint32 charid, uint32 guild_id, uint8 rank)
Updated all CastSpell entries to use the appropriate slot type defines located now in zone/common.h
Fixed Guild Loading from character_data
Fixed #guild list
Refactored Merchantlist loading
Refactored Temp Merchantlist loading
Gutted most of dbasync
Added:
LoadCharacterSpellBook(uint32 character_id, PlayerProfile_Struct* pp);
LoadCharacterMemmedSpells(uint32 character_id, PlayerProfile_Struct* pp);
LoadCharacterLanguages(uint32 character_id, PlayerProfile_Struct* pp);
LoadCharacterBindPoint(uint32 character_id, PlayerProfile_Struct* pp);
SaveCharacterSpellSwap(uint32 character_id, uint32 spell_id, uint32 from_slot, uint32 to_slot);
SaveCharacterSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
SaveCharacterMemorizedSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
DeleteCharacterSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
DeleteCharacterMemorizedSpell(uint32 character_id, uint32 spell_id, uint32 slot_id);
Removed Zone::LoadTempMerchantData_result(MYSQL_RES* result)
Removed Zone::LoadMerchantData_result(MYSQL_RES* result)
Removed SharedDatabase::GetPlayerProfile
Removed SharedDatabase::SetPlayerProfile
Removed SharedDatabase::SetPlayerProfile_MQ
Removed Zone::DBAWComplete(uint8 workpt_b1, DBAsyncWork* dbaw) from zone.cpp
2014-08-31 17:52:43 -05:00
07a2cbe9a5
Renamed zone files
2014-08-21 23:46:01 -07:00
504a8b19ce
Missed Mutex.h
2014-08-21 19:36:50 -07:00
6e0a214bcc
Compiler option for playing with npctype_cache as was requested for a feature. Not entirely tested may need some work. Currently defaults to old behavior on #repop.
2014-01-31 20:38:32 -08:00
70f994cda5
Live-Like weather. Big thanks to Robregen for figuring out the system!
...
Included in the required SQL is weather data pulled from NewZone live packets for up to PoP. An update to EQExtractor will be made to grab the rest of the data from existing collects.
Please note: Until weather data is grabbed for zones later than PoP, weather will not work in those zones.
2014-01-20 10:10:39 -08:00
765f23febc
Initial check-in of bard bot in combat song code.
2013-10-11 23:37:46 -04:00
fcd9b525a8
Removed Common Profiler and Zone Profiler. They're well past outdated status and are just code bloat.
2013-08-29 15:46:40 -07:00
63d678ce29
Replaced npcspecialatk with special_attacks, needs more testing also gotta export new api for it as I can't remove the legacy one. Too many quests rely on the legacy functionality.
2013-07-06 03:45:06 -07:00
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04:00
4bdd8b2502
Change space indentation to tabs
2013-05-09 11:37:51 -04:00
ffcff4aea1
Remove trailing whitespace
2013-05-09 11:13:16 -04:00
8e49ab9179
Merge pull request #3 from EQEmu/master
...
sync
2013-05-06 14:16:46 -07:00
f983d19e01
Removed my bookmark comments and cleaned up itemtick for cases where there are no tick items.
2013-05-05 18:04:22 -05:00
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
56490400ca
Dungeon Crawl custom code merge
...
Added numerous modding hooks.
Added rules:
Character:KeepLevelOverMax - Don't delevel a character if they are found to be over max level rule.
Spells:UseCHAScribeHack - Optionally omit spells with CHA in effect12 when using scribespells and traindiscs
Combat:MonkACBonusWeight - Adjust the weight threshold for monk AC bonus
Combat:ClientStunLevel - Adjust the level clients kicks and bashes start to roll for stuns
Combat;QuiverWRHasteDiv - Adjust the divisor applied to weight reduction for haste calcs
Combat:UseArcheryBonusRoll - Make archery stationary bonus a roll
Combat:ArcheryBonusChance - Archery stationary bonus chance
Added account flags and associated perl wrappers
Added EVENT_ITEM_TICK for interactive items
Added EVENT_DUEL_WIN and EVENT_DUEL_LOSE, which exports $enemyname and $enemyid
Added timer and interval to console worldshutdown command
Added EQW interface for worldshutdown and server-wide messages
2013-04-24 15:58:51 -05:00
ea72975e69
Fixed Merc duplicate save bug, focus items, spell_scale and heal_scale now work implemented, new merc equipment (with focus items), added checks during merc hire, unsuspend, & timer update for states where a merc can't be hired, unsuspended, or can't be retained due to insufficient funds, no room in group, in raid, invalid merc data, etc, and give appropriate feedback, added rules for charging of merc purchase and upkeep costs.
2013-03-01 00:01:27 -05:00
8eb7d0aaa8
Skill caps load with new smem scheme
2013-02-20 13:54:26 -08:00
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00
KimLS
Michael Cook (mackal)
Akkadius
Arthur Ice
cavedude00
badcaptain
j883376
josheb
