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

133 Commits

Author SHA1 Message Date
KimLS
9e1115f899 Merge master, pretty close to RC atm 2013-06-26 12:52:00 -07:00
j883376
488b2888a8 Fix uses of uninitialized variables 
- Replace unknown008 array with two separate variables in Object code

- Fix mismatched safe_delete() of an array
 2013-06-25 23:40:05 -04:00
KimLS
1480b8911f Sorta hacky work around for doing nukeitem in item quests. Added lua bitop library. Made excluding io/os optional 2013-06-25 14:51:06 -07:00
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
j883376
536e31d771 Change binary output path to use CMake variable 
Tools that use CMake's EXECUTABLE_OUTPUT_PATH variable to
determine which binary to launch for debugging may be confused
by a relative path, so use CMake variable PROJECT_BINARY_DIR
instead.
 2013-06-21 23:21:57 -04:00
KimLS
7af04798fb Augment item events 2013-06-21 14:20:30 -07:00
j883376
76e25f75fa Fix a few memory leaks 
- Rewrite zonename_array to use std::map rather than a pointer to an array
of character pointers

- Properly delete ZoneConfig on Zone shutdown

- Delete AdventureTemplates in AdventureManager destructor
 2013-06-21 17:09:46 -04:00
KimLS
d8a1d84a49 Regression fixes, support for new lua arguments for many events 2013-06-19 22:56:46 -07:00
KimLS
bb8d11a57b Merge from master 2013-06-17 11:47:45 -07:00
SecretsOTheP
d03e8d05ec 2013-06-16 13:04:48 -07:00
Hateborne
179063c863 spell.max convert int16 to int32 
Converting the spell.max field to int32 to handle larger numbers in the
PercentalHeal field.
 2013-06-13 17:59:24 -04:00
KimLS
c0d37b2e04 Many fixes to regressions in perl and cleaning up the final interface 2013-06-12 15:04:26 -07:00
KimLS
56b41c882b Redoing event item api 2013-06-07 02:26:17 -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
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
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
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
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
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
Michael Cook
0fdfe025cb Remove 'using namespaces std' fixes #61 2013-05-22 16:17:19 -04: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
70eb226fea changed from using a preset char buffer to string. 2013-05-21 00:36:34 -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
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
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
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
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
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
KimLS
9e13a2271c Merge conflicts 2013-05-15 13:22:46 -07:00