pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-12 17:51:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
431 Commits 88 Branches 159 Tags
Commit Graph

32 Commits

Author SHA1 Message Date
KimLS
2529a7700e Fix for luabind not compiling (jumbers), bunch of api upgrades for lua, changed where spells and items load quests from, removed some old code. etc etc. 2013-06-22 01:32:41 -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
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
KimLS
e6fba5ba82 Merging 2013-05-23 00:31:02 -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
Michael Cook
0fdfe025cb Remove 'using namespaces std' fixes #61 2013-05-22 16:17:19 -04:00
Arthur Ice
e9577db9c2 removed DBMemLeak.cpp and DBMemLeak.h, unused. 2013-05-21 22:51:19 -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
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
Arthur Ice
373ff66240 moved string functions from MiscFunctions to StringUtil 2013-05-11 00:05:11 -07:00
j883376
4bdd8b2502 Change space indentation to tabs 2013-05-09 11:37:51 -04:00
j883376
ffcff4aea1 Remove trailing whitespace 2013-05-09 11:13:16 -04:00
Arthur Ice
7560b6b0a7 NULL to nullptr 2013-05-04 18:06:58 -07:00
KimLS
b5405c35e2 Tests fix + fix for certain factions not loading 2013-02-28 22:33:20 -08:00
KimLS
aff4d53d7e Fix for sdrawkcab index in skill_caps 2013-02-24 22:08:10 -08:00
KimLS
3092286604 Fix for bad data on factions 2013-02-24 10:33:07 -08:00
KimLS
26f965e251 Fix for shared memory loot: both the inconsistent tables and the not loading of tables with no items 2013-02-23 22:42:40 -08:00
KimLS
147c96970c Moved faction stuff around, removed stupid external item status stuff 2013-02-23 15:03:15 -08:00
KimLS
c31b2b65c1 NPC Faction lists to new shared memory scheme 2013-02-23 13:45:19 -08:00
KimLS
9eaa98675b Shared Memory Loot works 2013-02-22 18:25:17 -08:00
KimLS
6f13d0cfbc Partial work on loot tables (non-compiling) 2013-02-21 22:13:33 -08:00
KimLS
3e9c2a06a3 Items in shared memory 2013-02-20 22:36:30 -08:00
KimLS
ef9498b03a Got rid of rules global (ugh) and gonna start work on items loading next 2013-02-20 15:35:46 -08:00
KimLS
8eb7d0aaa8 Skill caps load with new smem scheme 2013-02-20 13:54:26 -08:00
KimLS
12bde7434a Starting on skill caps today 2013-02-20 11:26:23 -08:00
KimLS
23dbd00d40 Style + compile option for rvalue-move 2013-02-19 23:06:00 -08:00
KimLS
acecff23f4 Almost have spells loaded 2013-02-19 16:50:05 -08:00
KimLS
da7347f76f svn -> git Migration 2013-02-16 16:14:39 -08:00