49c3a81e18
More lua work, client should be completely exported barring any more bugs that crop up. Starting work on getting the rest of the general functions
2013-05-27 17:24:31 -07:00
79a9d2112a
Retransmit support added back in (stupid compile flags), prelim work on lua_client stuff, took out a few redundant or non-working functions
2013-05-25 01:08:30 -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
fcb769e353
Merge branch 'master' into small_stage_cleanup
...
Conflicts:
common/EQStream.cpp
zone/client.h
2013-05-23 12:49:22 -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
efe7092995
Merge and a few cleanup / bug fixes
2013-05-23 12:35:00 -07:00
2840e32853
Merge branch 'master' into string
2013-05-23 00:56:27 -07:00
320494c83d
Windows compile fix
2013-05-23 00:55:29 -07:00
e6fba5ba82
Merging
2013-05-23 00:31:02 -07:00
5255c236c3
added std:: to a lot of locations which where
...
missed and added NOMINMAX to cmakelist
2013-05-22 23:55:49 -07:00
e5d4b35a32
Spelling fix in a comment. Nothing else.
2013-05-22 22:21:28 -07:00
b4e65a8840
tabbify and cleaned up std issues and min/max problems.
2013-05-22 21:27:37 -07:00
ac78841e55
Removed MakeUpperString since it's not used anywhere.
2013-05-22 19:41:16 -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
41dcd5bc29
Should only need dumpItemCollection and dumpBagContents internally so made them protected.
2013-05-21 23:34:55 -07: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
e9577db9c2
removed DBMemLeak.cpp and DBMemLeak.h, unused.
2013-05-21 22:51:19 -07:00
cdc7b2a000
weird #ifdef pattern, reorganized and cleaned it up. easier to understand now.
2013-05-21 00:36:34 -07:00
70eb226fea
changed from using a preset char buffer to string.
2013-05-21 00:36:34 -07:00
26143750f3
removed visual studio 5,6,7 specific code except in tinyxml and StackWalker.
2013-05-20 22:40:10 -07:00
d41331d948
Apparently the original implementation from facebook was incorrect.
...
Fixed it, sadly this does mean we need to call vsnprintf twice.
Once to find out the size involved, a second time to apply.
2013-05-20 17:51:08 -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
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
3ddc61420b
Added id to spells so i can export them to lua correctly. Also made the lua_classes less messy by having them all derive from Lua_Ptr instead of reimplementing functionality
2013-05-16 23:24:47 -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
2336aa0e4f
Changed quests/templates to quests/global. Changed default location for plugins to quests/plugins instead of quests. Added a single interpreter for lua instead of multiple ones.
2013-05-15 13:00:46 -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
d1f7935ee2
...trying out boost with luabind
2013-05-11 01:29:58 -07:00
b19755a313
For windows compile, moved definve of va_copy
2013-05-11 00:46:46 -07:00
9a139a7604
missed two string conversion functions. Moved them to StringUtil
2013-05-11 00:17:02 -07:00
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07:00
babd3949f6
Added StringUtil h/cpp which contains StringFormat
2013-05-10 23:18:00 -07:00
3521472942
Merge branch 'master' of https://github.com/EQEmu/Server
2013-05-10 22:55:15 -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
c98c115cb6
-- Added Bot primary weapon proc (secondary and ranged already exist)
...
-- Added Bard Bot Instrumentation bonuses
-- Added checks to avoid AE Buff casting on enemy mobs
-- Fixed a few typos in 'Vah Shir'-related code
2013-05-09 20:57:02 -04:00
0e4ac63b6b
Perl parser works, still needs a little cleanup
2013-05-09 14:52:20 -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
KimLS
j883376
Arthur Ice
Michael Cook
Uleat