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
815c3dc73f
Merge branch 'master' of https://github.com/EQEmu/Server into string
2013-05-23 12:35:21 -07:00
efe7092995
Merge and a few cleanup / bug fixes
2013-05-23 12:35:00 -07:00
12ddd30f67
Merge pull request #64 from af4t/master
...
Windows compile fix: bots
2013-05-23 12:30:06 -07:00
879ddb208b
Windows compile fixes (bots)
2013-05-23 12:17:30 -04:00
70dab7d920
Merge pull request #6 from EQEmu/master
...
Sync 2013-05-23
2013-05-23 03:53:22 -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
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
555e21c3c7
Merge pull request #5 from EQEmu/master
...
Sync 2013-05-22
2013-05-22 16:31:52 -07:00
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04: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
1363d5d209
Lua fixes, need to get perl working again D=
2013-05-19 23:39:18 -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
17954dd8fe
Exported a ton of functions to mob
2013-05-18 14:42:54 -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
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
1f265af1e7
Hate list stuff, need to make it more efficient
2013-05-17 09:49:02 -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
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
7185ff25be
Merge pull request #4 from EQEmu/master
...
Sync 2013-05-16
2013-05-16 05:11:13 -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
312100e1c6
Azone fix for new compilers and possible fix for x64
2013-05-15 14:37:30 -07:00
9e13a2271c
Merge conflicts
2013-05-15 13:22:46 -07:00
6887ae18ae
Merge branch 'master' into lua
2013-05-15 13:07:30 -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
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
20fc585b5e
Cleaned up lua glue macro a bit
2013-05-13 14:40:15 -07:00
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
b0fb8aa4be
Merge pull request #3 from EQEmu/master
...
Sync 2013-05-12
2013-05-12 20:00:28 -07:00
b9a32185d7
Merge pull request #60 from josheb/master
...
CHA scribe logic fix.
2013-05-12 19:44:07 -07:00
0f880177e4
Merge branch 'master' of https://github.com/josheb/Server
2013-05-12 21:36:13 -05:00
7683252896
CHA scribe rule logic fix
2013-05-12 21:35:21 -05:00
ca9a1de44c
Merge pull request #2 from EQEmu/master
...
Sync 2013-05-11
2013-05-11 21:49:12 -07:00
2445576ae8
Merge branch 'master' into lua
2013-05-11 20:35:49 -07:00
7648f071f1
More lua work - more mob implementation
2013-05-11 20:34:04 -07:00
60c93595f5
Missed a file save
2013-05-11 16:39:22 -07:00
70998d25e3
More lua work - changed how i get return values off the stack and do calls
2013-05-11 16:37:03 -07:00
fa908040ca
Lua work on api - entity and mob, lots more to go
2013-05-11 13:51:57 -07:00
73a4e87379
FreeBSD support and clean up of unnecessary ifdef FREEBSD
2013-05-11 14:32:14 -04:00
3a31ad55fb
Merge pull request #5 from EQEmu/master
...
sync
2013-05-11 07:03:50 -07:00
d1f7935ee2
...trying out boost with luabind
2013-05-11 01:29:58 -07:00
KimLS
af4t
Arthur Ice
Michael Cook
josheb
root