fc03ee94e2
Added rules for what int mobs need to not attack red cons and how much food and drink is taken per stamina update.
...
Added mod hooks for food/drink values and mob aggro.
Added quest functions for getting/setting hunger and thirst.
2013-08-01 19:24:15 -05:00
d472c05f5d
Lua packet handler dispatch
2013-07-13 13:53:41 -07:00
dfe63f87c3
Merge pull request #78 from j883376/cleanups
...
Code cleanups, take two
2013-07-12 13:36:02 -07:00
e6ad26f03c
Logfile cleanups. See changelog.txt.
2013-07-07 21:44:31 -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
16d3825df4
Fixed translocate, dispatch event now returns values properly, embparser now stores errors (what few it has)
2013-06-26 09:26:19 -07:00
342a4c1b17
Fix for clickies not working, changed order of dispatch events to allow nuking items from regular item events. Changed the lua modules path.
2013-06-24 12:42:42 -07:00
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
7e2806119b
Fix some improper uses of printf formats
2013-06-22 00:55:54 -04:00
7af04798fb
Augment item events
2013-06-21 14:20:30 -07:00
7b894a7c61
Added direct inventory access, and event_loot for items and event_weapon_proc for items
2013-06-20 14:03:22 -07:00
d8a1d84a49
Regression fixes, support for new lua arguments for many events
2013-06-19 22:56:46 -07:00
bb8d11a57b
Merge from master
2013-06-17 11:47:45 -07:00
91b01c2fcc
Image fix for OP_CastSpell exploit.
2013-06-15 13:08:32 -07:00
c0d37b2e04
Many fixes to regressions in perl and cleaning up the final interface
2013-06-12 15:04:26 -07:00
56b41c882b
Redoing event item api
2013-06-07 02:26:17 -07:00
e47de5deed
Merge with master
2013-05-24 01:23:58 -07:00
52b8c0e078
Merge pull request #66 from j883376/gcc-changes
...
GCC Changes
2013-05-24 01:16:10 -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
ce63503bab
Changed a bunch of lua stuff, as well as modified a bunch of generic item quest stuff
2013-05-23 12:43:21 -07:00
e6fba5ba82
Merging
2013-05-23 00:31:02 -07:00
54914a970e
Merge branch 'StringFormatting' into small_stage_cleanup
...
Conflicts:
common/Item.cpp
world/client.cpp
zone/net.cpp
2013-05-22 18:55:06 -07:00
ea2a1651d5
Merge branch 'master' into StringFormatting
...
Conflicts:
common/debug.cpp
2013-05-22 18:07:39 -07:00
5c6e95f921
Merge branch 'master' of https://github.com/EQEmu/Server
2013-05-22 17:38:26 -07:00
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04:00
d7546e09ee
broke up dumpInventory into methods, changed it to dumpEntireInventory (dumpInventory now only dumps a small peice)
2013-05-21 22:53:22 -07: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
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
69bad31019
Cleanup of some lua code, initial work on encounter_quests
2013-05-19 12:13:44 -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
9e13a2271c
Merge conflicts
2013-05-15 13:22:46 -07:00
3cc1065873
more lua, gonna work on single interpreter soon
2013-05-14 19:05:49 -07:00
38521e0009
Lua - basic npc quests work and i need a damned break for a bit
2013-05-13 21:56:42 -07:00
2445576ae8
Merge branch 'master' into lua
2013-05-11 20:35:49 -07:00
73a4e87379
FreeBSD support and clean up of unnecessary ifdef FREEBSD
2013-05-11 14:32:14 -04:00
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07:00
dc045591e4
Lua work - loading works, I think checking for sub works. Calling subs is in the beginning stages and binding is starting
2013-05-10 20:13:35 -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
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
0838d4507a
Fix NULL to nullptr for SQL queries
2013-05-07 17:41:05 -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
Tabasco
KimLS
SecretsOTheP
j883376
Arthur Ice
Michael Cook