KimLS
a3738dc131
Changed EVENT_TRADE to pass iteminst instead of variable ids, perl will not have changed at all but lua now passes the iteminsts in the trade object. Also redid a bunch of the spell quest stuff
2013-06-05 16:47:49 -07:00
KimLS
1e7c5bb9b7
Bug fix in event_trade export, exported augments too. Also need to fix overloads
2013-05-26 15:56:55 -07:00
KimLS
e47de5deed
Merge with master
2013-05-24 01:23:58 -07:00
j883376
b47597b813
Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes
2013-05-23 21:12:07 -04:00
j883376
d6ff01d63c
Fix several GCC warnings
2013-05-23 20:22:42 -04:00
KimLS
a3e24b6854
Merge from master
2013-05-23 12:50:34 -07:00
KimLS
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
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
KimLS
7adcf6d3e5
Some quest item and spell work, took out that stupid multiquesting code -> use your brains that's completely doable entirely in quests even perl
2013-05-17 17:10:38 -07:00
KimLS
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
KimLS
b26df187e6
Merge from master terrible
2013-05-15 16:01:13 -07:00
KimLS
38521e0009
Lua - basic npc quests work and i need a damned break for a bit
2013-05-13 21:56:42 -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
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
Derision
23b2b599a7
Fixed bug where BecomeTrader packets were only being sent to the Trader, not all other clients in the bazaar.
2013-02-17 20:23:34 +00:00
KimLS
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00
