Akkadius
|
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 |
|
Akkadius
|
0d9b6703a6
|
Rename debug.h to global_define.h, update cmakelists and such
|
2015-01-19 04:12:09 -06:00 |
|
Michael Cook (mackal)
|
f4224b296a
|
We don't need to cast these anymore
|
2015-01-18 18:29:37 -05:00 |
|
Uleat
|
34ab3e10f5
|
Added some nullptr checks for ItemInst* in a few places (tradeskills.cpp - particularly augments - needs a better review)
|
2014-12-23 10:14:45 -05:00 |
|
Akkadius
|
e7911df851
|
quest_parser_collection.cpp & .h header include cleanup
|
2014-12-15 18:33:23 -06:00 |
|
KimLS
|
6597967acd
|
Changed void* to EQEmu::Any in quest interface. Been meaning to change from void* for a while to a structure that data hides instead.
|
2014-08-25 22:59:52 -07:00 |
|
Uleat
|
52ae78709b
|
First attempt at fixing zone shutdown crashes. (Mob timer processing accessing released resources.)
|
2014-08-24 05:42:43 -04:00 |
|
KimLS
|
07a2cbe9a5
|
Renamed zone files
|
2014-08-21 23:46:01 -07:00 |
|