KimLS
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
Tabasco
fa0196b987
Fixed some mod function bugs and stat caps.
2013-05-27 15:32:59 -05: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
850fa5aecc
Exported client functions to lua, going to work on npc next
2013-05-26 12:44:33 -07:00
KimLS
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
KimLS
d25d8187b6
Failed merge on a specific file also fix for std and string changes in my embparser
2013-05-24 01:41:33 -07:00
KimLS
e47de5deed
Merge with master
2013-05-24 01:23:58 -07:00
Alex
52b8c0e078
Merge pull request #66 from j883376/gcc-changes
...
GCC Changes
2013-05-24 01:16:10 -07:00
KimLS
ee7d7c6f24
Merge branch 'small_stage_cleanup' of git://github.com/addtheice/Server into addtheice-small_stage_cleanup
2013-05-24 00:56:20 -07:00
KimLS
a66ef1b778
Function for retrieving a qglobal or list of them
2013-05-24 00:52:28 -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
Arthur Ice
fcb769e353
Merge branch 'master' into small_stage_cleanup
...
Conflicts:
common/EQStream.cpp
zone/client.h
2013-05-23 12:49:22 -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
efe7092995
Merge and a few cleanup / bug fixes
2013-05-23 12:35:00 -07:00
KimLS
e6fba5ba82
Merging
2013-05-23 00:31:02 -07:00
Arthur Ice
5255c236c3
added std:: to a lot of locations which where
...
missed and added NOMINMAX to cmakelist
2013-05-22 23:55:49 -07:00
Arthur Ice
b4e65a8840
tabbify and cleaned up std issues and min/max problems.
2013-05-22 21:27:37 -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
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
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
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
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
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
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
