Arthur Ice
b4e65a8840
tabbify and cleaned up std issues and min/max problems.
2013-05-22 21:27:37 -07:00
Arthur Ice
ac78841e55
Removed MakeUpperString since it's not used anywhere.
2013-05-22 19:41:16 -07:00
Arthur Ice
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
Arthur Ice
ea2a1651d5
Merge branch 'master' into StringFormatting
...
Conflicts:
common/debug.cpp
2013-05-22 18:07:39 -07:00
Arthur Ice
5c6e95f921
Merge branch 'master' of https://github.com/EQEmu/Server
2013-05-22 17:38:26 -07:00
Kemmler
555e21c3c7
Merge pull request #5 from EQEmu/master
...
Sync 2013-05-22
2013-05-22 16:31:52 -07:00
Michael Cook
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04:00
root
930fda07c9
Added exp for level mod, misc fixes.
2013-05-22 07:19:09 -05:00
Arthur Ice
41dcd5bc29
Should only need dumpItemCollection and dumpBagContents internally so made them protected.
2013-05-21 23:34:55 -07:00
Arthur Ice
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
Arthur Ice
e9577db9c2
removed DBMemLeak.cpp and DBMemLeak.h, unused.
2013-05-21 22:51:19 -07:00
Arthur Ice
cdc7b2a000
weird #ifdef pattern, reorganized and cleaned it up. easier to understand now.
2013-05-21 00:36:34 -07:00
Arthur Ice
a7084b4d6c
reorganized includes to allow for consolidation and cleanup.
2013-05-21 00:36:34 -07:00
Arthur Ice
64212176ec
removed unneeded defines. snprintf and friends are used within StringUtil.h
2013-05-21 00:36:34 -07:00
Arthur Ice
70eb226fea
changed from using a preset char buffer to string.
2013-05-21 00:36:34 -07:00
Arthur Ice
c18d868d03
set many pointers to nullptr instead of 0.
2013-05-21 00:36:34 -07:00
Arthur Ice
9002bfb9a0
corrected incorrect use of StringFormat and did basic indenting fix.
2013-05-21 00:36:00 -07:00
Arthur Ice
26143750f3
removed visual studio 5,6,7 specific code except in tinyxml and StackWalker.
2013-05-20 22:40:10 -07:00
Arthur Ice
3c11f8f26b
simplified the includes to be a bit clearer.
2013-05-20 22:20:01 -07:00
Arthur Ice
dcec112b91
reordering includes to make it easier to simplify.
2013-05-20 22:17:56 -07:00
Arthur Ice
7b0de551e1
removed char buffer in 'UpdateWindowTitle"
2013-05-20 22:15:33 -07:00
Arthur Ice
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
Tabasco
1e5d6b0e34
Chat filter tests
2013-05-20 16:24:10 -05:00
KimLS
1363d5d209
Lua fixes, need to get perl working again D=
2013-05-19 23:39:18 -07: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
KimLS
69bad31019
Cleanup of some lua code, initial work on encounter_quests
2013-05-19 12:13:44 -07:00
KimLS
17954dd8fe
Exported a ton of functions to mob
2013-05-18 14:42:54 -07:00
Tabasco
7b21e3be72
Added server man quest events and command parsing.
2013-05-18 11:21:19 -05: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
bec6acc01e
Hatelist will now use a std::list so i can avoid a list copy when exporting it to quests. Cause frankly two copies was absurd
2013-05-17 10:48:59 -07:00
root
1b9647f57e
Updated mod_functions with DC examples
2013-05-17 12:27:18 -05:00
root
2d1805c983
Mod function updates - better documentation
2013-05-17 12:20:49 -05:00
KimLS
1f265af1e7
Hate list stuff, need to make it more efficient
2013-05-17 09:49:02 -07:00
KimLS
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
KimLS
b10de6f4e7
More work on lua parser - gonna get all events firing correctly by end of week also put all arguments into an event table object
2013-05-16 15:35:55 -07:00
Kemmler
7185ff25be
Merge pull request #4 from EQEmu/master
...
Sync 2013-05-16
2013-05-16 05:11:13 -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
josheb
55c66022eb
Merge pull request #6 from EQEmu/master
...
sync
2013-05-15 17:00:08 -07:00
KimLS
b26df187e6
Merge from master terrible
2013-05-15 16:01:13 -07:00
KimLS
312100e1c6
Azone fix for new compilers and possible fix for x64
2013-05-15 14:37:30 -07:00
j883376
f51f6e00c4
Add install paths to CMakeLists
2013-05-15 17:04:08 -04:00
KimLS
9e13a2271c
Merge conflicts
2013-05-15 13:22:46 -07:00
KimLS
6887ae18ae
Merge branch 'master' into lua
2013-05-15 13:07:30 -07:00
KimLS
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
KimLS
3cc1065873
more lua, gonna work on single interpreter soon
2013-05-14 19:05:49 -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
KimLS
20fc585b5e
Cleaned up lua glue macro a bit
2013-05-13 14:40:15 -07:00
KimLS
7b23c8dc75
Working on last of Mob:: that can be implemented atm, added safety checks to the lua functions that will be optional later in dev mode. Also changed quest return types to integers instead of doubles as that was non-intuitive
2013-05-13 14:29:50 -07:00
Kemmler
b0fb8aa4be
Merge pull request #3 from EQEmu/master
...
Sync 2013-05-12
2013-05-12 20:00:28 -07:00