KimLS
|
85c7e1b059
|
Player event export plus lua_object api
|
2013-06-03 16:49:47 -07:00 |
|
root
|
a8de7e9ffc
|
Removed comments from mod_client.cpp for erroneous 255 stat cap.
|
2013-06-03 17:08:58 -05:00 |
|
KimLS
|
bc82bff4b4
|
Lua doors api
|
2013-06-03 00:08:41 -07:00 |
|
Tabasco
|
ff091e940c
|
Lua corpse API
|
2013-06-02 19:05:40 -05:00 |
|
KimLS
|
55a964267e
|
Raid/Group lua stuff, renamed corpses
|
2013-06-02 13:47:52 -07:00 |
|
KimLS
|
d14608356d
|
Added all lua objects i need for now, a ton of API too
|
2013-06-02 00:15:26 -07:00 |
|
root
|
7fca5a7a89
|
Merge branch 'master' of https://github.com/EQEmu/Server into EQEmu-master
Conflicts:
zone/client.h
zone/mod_functions.cpp
zone/mod_functions_base.cpp
|
2013-06-01 19:17:23 -05:00 |
|
josheb
|
ac5926bdfe
|
Merge pull request #7 from josheb/dungeoncrawl
Sync mod_functions updates
|
2013-06-01 08:56:19 -07:00 |
|
root
|
b16cf57510
|
Cautionary XP mod update.
|
2013-06-01 10:49:58 -05:00 |
|
root
|
851c842529
|
Updated mod_functions and mod_functions_base with new hooks and descriptions
|
2013-06-01 10:44:32 -05:00 |
|
KimLS
|
a1080fdb2d
|
Merge branch 'master' into lua
|
2013-05-31 16:41:44 -07:00 |
|
KimLS
|
344feb7484
|
Finished exporting lua general functions for now, also had to fix some const char* stuff
|
2013-05-31 16:40:55 -07:00 |
|
root
|
567c17cc9e
|
Berserker updates.
|
2013-05-28 20:27:17 -05:00 |
|
root
|
0ee54f1117
|
Added mod_spell_cast and various mod_functions fixes.
|
2013-05-28 19:58:40 -05:00 |
|
KimLS
|
69f1187722
|
Small amount of general lua functions
|
2013-05-28 13:12:42 -07:00 |
|
Alex
|
39426789f4
|
Merge pull request #69 from j883376/login-db-crash
Fix loginserver crash on DB connect failure
|
2013-05-27 17:33:57 -07:00 |
|
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 |
|
j883376
|
44477a0d47
|
Fix loginserver crash on DB connect failure
|
2013-05-27 12:35:45 -04:00 |
|
root
|
510ce16f0e
|
Added reloadworld console command
|
2013-05-27 08:46:50 -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
|
3c7f7beb6d
|
Red. include string
|
2013-05-24 01:10:19 -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
|
815c3dc73f
|
Merge branch 'master' of https://github.com/EQEmu/Server into string
|
2013-05-23 12:35:21 -07:00 |
|
KimLS
|
efe7092995
|
Merge and a few cleanup / bug fixes
|
2013-05-23 12:35:00 -07:00 |
|
Alex
|
12ddd30f67
|
Merge pull request #64 from af4t/master
Windows compile fix: bots
|
2013-05-23 12:30:06 -07:00 |
|
af4t
|
879ddb208b
|
Windows compile fixes (bots)
|
2013-05-23 12:17:30 -04:00 |
|
Kemmler
|
70dab7d920
|
Merge pull request #6 from EQEmu/master
Sync 2013-05-23
|
2013-05-23 03:53:22 -07:00 |
|
KimLS
|
2840e32853
|
Merge branch 'master' into string
|
2013-05-23 00:56:27 -07:00 |
|
KimLS
|
320494c83d
|
Windows compile fix
|
2013-05-23 00:55:29 -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
|
e5d4b35a32
|
Spelling fix in a comment. Nothing else.
|
2013-05-22 22:21:28 -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
|
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 |
|