e3805d5920
Converted SkillType typedef enumeration to SkillUseTypes enumeration
2013-10-27 13:03:41 -04:00
3e6be197e6
Changed ItemTypes to ItemUseTypes
2013-10-27 09:04:52 -04: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
1f2145a45d
Fix for special_abilities crash dealing with std::string in struct that was then memcpyed
2013-07-18 00:24:43 -07:00
a1dc390f49
Windows compile error again, why wasn't this fixed on the second pass. I brought it up last time grr
2013-07-12 15:01:12 -07:00
dfe63f87c3
Merge pull request #78 from j883376/cleanups
...
Code cleanups, take two
2013-07-12 13:36:02 -07:00
3992ac02bb
Rampage, Area Rampage, Flurry got new customizable effects. Part of that was adding a new set of stuff to attack.
2013-07-08 14:37:01 -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
0578f45490
Revert "Revert "Merge pull request #77 from j883376/cleanups""
...
This reverts commit d25205d9d3
2013-06-28 04:25:44 -04:00
a5db4310c6
Merge branch 'master' into lua
...
Conflicts:
zone/merc.cpp
2013-06-27 12:53:47 -07:00
d25205d9d3
Revert "Merge pull request #77 from j883376/cleanups"
...
This reverts commit 4ff2efea43e811e3975b
2013-06-27 12:50:20 -07:00
9e1115f899
Merge master, pretty close to RC atm
2013-06-26 12:52:00 -07:00
488b2888a8
Fix uses of uninitialized variables
...
- Replace unknown008 array with two separate variables in Object code
- Fix mismatched safe_delete() of an array
2013-06-25 23:40:05 -04:00
bb8d11a57b
Merge from master
2013-06-17 11:47:45 -07:00
0dbd0478c0
Merge of hatebourne's stuff
2013-06-12 12:11:56 -07:00
85c7e1b059
Player event export plus lua_object api
2013-06-03 16:49:47 -07:00
e47de5deed
Merge with master
2013-05-24 01:23:58 -07:00
b47597b813
Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes
2013-05-23 21:12:07 -04:00
d6ff01d63c
Fix several GCC warnings
2013-05-23 20:22:42 -04:00
a3e24b6854
Merge from master
2013-05-23 12:50:34 -07:00
efe7092995
Merge and a few cleanup / bug fixes
2013-05-23 12:35:00 -07:00
e6fba5ba82
Merging
2013-05-23 00:31:02 -07:00
ea2a1651d5
Merge branch 'master' into StringFormatting
...
Conflicts:
common/debug.cpp
2013-05-22 18:07:39 -07:00
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04:00
f1a487f606
Merge branch 'master' into StringFormatting.
...
Cleaned up the problems. Tested on Linux. Still need to test on windows.
Conflicts:
common/CMakeLists.txt
common/MiscFunctions.cpp
common/MiscFunctions.h
common/debug.cpp
world/Adventure.cpp
2013-05-19 18:56:21 -07:00
1f265af1e7
Hate list stuff, need to make it more efficient
2013-05-17 09:49:02 -07:00
f2e0f9cca5
Changed a bunch of event names, made event_death returning more seamless and fixed up trading quests to have them always face target outside the parser
2013-05-15 18:43:06 -07:00
b26df187e6
Merge from master terrible
2013-05-15 16:01:13 -07:00
3cc1065873
more lua, gonna work on single interpreter soon
2013-05-14 19:05:49 -07:00
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07: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
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
e1c2657b11
NULL check in Merc::CalcItemBonuses
2013-05-03 09:36:16 +01:00
e2f25d1c92
Fixed a couple of merc stat issues and a few bot aggro issues, removed unneeded bot pet AI.
2013-04-25 00:42:52 -04:00
15e31d1c03
Merge branch 'master' of https://github.com/EQEmu/Server
2013-04-02 19:10:18 -04:00
a787a7ce72
Fixed Merc lack of use of heal over time spells (causing excessive healing), fixed pet mitigation/AC issues.
2013-04-02 19:09:32 -04:00
c7ff207017
Made Merc::AddMercToGroup handle cleaning up old groups as opposed to doing it in each location before AddMercToGroup. This should fix cases where the Merc's owner is invalid and being referenced, which causes the crash located in:
...
http://www.eqemulator.org/forums/showthread.php?t=36670&page=2
2013-03-25 13:07:58 -04:00
23820a369e
Moved around some data in Mercs to help prevent another crash... dunno if it actually will fix it but it can't hurt >_<
2013-03-24 18:08:03 -04:00
e609ec1df6
Fix for a crash issue related to groups that both PEQ and Armm reported on the forums.
2013-03-24 04:01:49 -04:00
a6f2c1be8a
Syntax error, better place for entity list removal
2013-03-23 10:13:29 -04:00
18e9714273
Another safeguard against a dangling pointer.
2013-03-23 10:10:03 -04:00
fa18991917
Added a few checks to resolve dangling pointers involving Mercs. Similar to the AIYellForHelp crash fixed years ago by Rogean.
2013-03-23 10:04:49 -04:00
abaad22eb4
-Merc upkeep timers fixed to display properly. They now persist through zones as well as save to the database properly.
...
-Merc unsuspend timers should now be more reliable across zone shutdown.
2013-03-23 04:58:03 -04:00
9b1a18d9a3
Merge branch 'master' of https://github.com/EQEmu/Server
...
Conflicts:
changelog.txt
2013-03-22 00:07:22 -04:00
a20c7735e8
Fixed merc buffing bugs, added checks before dismissing merc to prevent possible bugged mercs, merged in Secret's merc memory leak fixes.
2013-03-22 00:03:50 -04:00
6ae8fbc0e4
Initialised some data in Mob/Merc constructors to stop valgrind complaining.
2013-03-19 20:44:22 +00:00
f5e58e0125
Merge branch 'master' of https://github.com/EQEmu/Server into Mercs
...
Conflicts:
changelog.txt
2013-03-19 00:57:15 -04:00
660ab53476
Fixed zone crash due to merc focus effects & tribute, merc aggro issues when client in melee range, spell recast timers. Added melee DPS spells/disciplines & support.
2013-03-19 00:53:01 -04:00
Uleat
badcaptain
KimLS
j883376
Arthur Ice
Michael Cook
Derision
SecretsOTheP