KimLS
9e1115f899
Merge master, pretty close to RC atm
2013-06-26 12:52:00 -07:00
KimLS
1480b8911f
Sorta hacky work around for doing nukeitem in item quests. Added lua bitop library. Made excluding io/os optional
2013-06-25 14:51:06 -07:00
Zaela
72ef7f6557
Made default-on-error a little less bad.
2013-06-25 11:05:03 -07:00
Zaela
c5e4cf35c0
Reworked RespawnFromHover framework to allow future customization (scripting) of respawn options.
...
Added event_respawn to be triggered when a client respawns from hover into the current zone (may not be set up correctly!).
2013-06-22 08:35:33 -07:00
KimLS
2529a7700e
Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc.
2013-06-22 01:32:41 -07:00
KimLS
d8a1d84a49
Regression fixes, support for new lua arguments for many events
2013-06-19 22:56:46 -07:00
KimLS
c0d37b2e04
Many fixes to regressions in perl and cleaning up the final interface
2013-06-12 15:04:26 -07:00
KimLS
8c3cce822a
Added three new events
2013-06-06 14:29:45 -07:00
KimLS
e6fba5ba82
Merging
2013-05-23 00:31:02 -07:00
Michael Cook
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04:00
Arthur Ice
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
Arthur Ice
fca9c1458b
Merge branch 'master' of https://github.com/EQEmu/Server
...
Conflicts:
common/debug.cpp
common/debug.h
zone/PlayerCorpse.cpp
zone/beacon.cpp
zone/client.cpp
zone/net.cpp
zone/tribute.cpp
2013-05-19 16:19:22 -07:00
Arthur Ice
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07:00
j883376
4bdd8b2502
Change space indentation to tabs
2013-05-09 11:37:51 -04:00
j883376
ffcff4aea1
Remove trailing whitespace
2013-05-09 11:13:16 -04:00
Arthur Ice
23c524812d
Removed the _MSC_VER special cases for Visual Studio 2008 and lower.
...
We no longer support 2008 and lower so these defines will never be used.
2013-05-08 17:09:13 -07:00
josheb
8e49ab9179
Merge pull request #3 from EQEmu/master
...
sync
2013-05-06 14:16:46 -07:00
Tabasco
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
Arthur Ice
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
Tabasco
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
SecretsOTheP
e0b05e573e
Merc group/depop crash fixes.
2013-03-24 14:31:03 -04:00
SecretsOTheP
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
SecretsOTheP
a6f2c1be8a
Syntax error, better place for entity list removal
2013-03-23 10:13:29 -04:00
SecretsOTheP
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
SecretsOTheP
b0b342a020
Merge branch 'master' of https://github.com/SecretsOTheP/Server
...
Conflicts:
common/patches/RoF.cpp
2013-03-23 05:05:16 -04:00
SecretsOTheP
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
SecretsOTheP
cabf8631d4
Fixed mercenary memleaks in AI_Start and Unsuspend.
2013-03-20 04:00:08 -04:00
Derision
981cabe857
Fixed a couple of merc memory leaks and removed some commented out DumpPacket calls.
2013-03-17 13:52:43 +00:00
KimLS
c31b2b65c1
NPC Faction lists to new shared memory scheme
2013-02-23 13:45:19 -08:00
KimLS
f8bae86082
Spells via shared memory work, removal of blah, general fixes
2013-02-19 22:20:30 -08:00
KimLS
7ce6f4de0d
More shared memory work + moved spdat from zone to common
2013-02-19 15:33:21 -08:00
KimLS
0d16361a40
Working on shared memory stuff - removed some stuff dealing with older code and loading spells from the non-database
2013-02-18 19:00:07 -08:00
joligario
3feeced884
Chat garbled for drunk characters.
2013-02-18 01:59:43 -05:00
badcaptain
a41874b6a7
Moved merc save data from extended player profile to new merc table, save merc buffs, added cure and rez spells to healer merc.
2013-02-18 00:50:19 -05:00
KimLS
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00