fc03ee94e2
Added rules for what int mobs need to not attack red cons and how much food and drink is taken per stamina update.
...
Added mod hooks for food/drink values and mob aggro.
Added quest functions for getting/setting hunger and thirst.
2013-08-01 19:24:15 -05:00
dfe63f87c3
Merge pull request #78 from j883376/cleanups
...
Code cleanups, take two
2013-07-12 13:36:02 -07:00
ab2c184b54
Merge branch 'master' of https://github.com/EQEmu/Server
2013-07-10 14:33:06 -07:00
31ede315f2
Fix Database::GetZoneID()
2013-07-08 19:02:54 -04:00
e6ad26f03c
Logfile cleanups. See changelog.txt.
2013-07-07 21:44:31 -07:00
63d678ce29
Replaced npcspecialatk with special_attacks, needs more testing also gotta export new api for it as I can't remove the legacy one. Too many quests rely on the legacy functionality.
2013-07-06 03:45:06 -07:00
0578f45490
Revert "Revert "Merge pull request #77 from j883376/cleanups""
...
This reverts commit d25205d9d3
2013-06-28 04:25:44 -04:00
a5db4310c6
Merge branch 'master' into lua
...
Conflicts:
zone/merc.cpp
2013-06-27 12:53:47 -07:00
d25205d9d3
Revert "Merge pull request #77 from j883376/cleanups"
...
This reverts commit 4ff2efea43e811e3975b
2013-06-27 12:50:20 -07:00
9e1115f899
Merge master, pretty close to RC atm
2013-06-26 12:52:00 -07:00
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
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
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
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
7af04798fb
Augment item events
2013-06-21 14:20:30 -07:00
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
d8a1d84a49
Regression fixes, support for new lua arguments for many events
2013-06-19 22:56:46 -07:00
bb8d11a57b
Merge from master
2013-06-17 11:47:45 -07:00
d03e8d05ec
2013-06-16 13:04:48 -07:00
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
c0d37b2e04
Many fixes to regressions in perl and cleaning up the final interface
2013-06-12 15:04:26 -07:00
56b41c882b
Redoing event item api
2013-06-07 02:26:17 -07:00
d14608356d
Added all lua objects i need for now, a ton of API too
2013-06-02 00:15:26 -07:00
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
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
e47de5deed
Merge with master
2013-05-24 01:23:58 -07:00
52b8c0e078
Merge pull request #66 from j883376/gcc-changes
...
GCC Changes
2013-05-24 01:16:10 -07:00
b47597b813
Merge branch 'master' of git://github.com/EQEmu/Server into gcc-changes
2013-05-23 21:12:07 -04:00
d6ff01d63c
Fix several GCC warnings
2013-05-23 20:22:42 -04:00
a3e24b6854
Merge from master
2013-05-23 12:50:34 -07:00
fcb769e353
Merge branch 'master' into small_stage_cleanup
...
Conflicts:
common/EQStream.cpp
zone/client.h
2013-05-23 12:49:22 -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
efe7092995
Merge and a few cleanup / bug fixes
2013-05-23 12:35:00 -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
e5d4b35a32
Spelling fix in a comment. Nothing else.
2013-05-22 22:21:28 -07:00
b4e65a8840
tabbify and cleaned up std issues and min/max problems.
2013-05-22 21:27:37 -07:00
ac78841e55
Removed MakeUpperString since it's not used anywhere.
2013-05-22 19:41:16 -07:00
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
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
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04:00
41dcd5bc29
Should only need dumpItemCollection and dumpBagContents internally so made them protected.
2013-05-21 23:34:55 -07:00
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
e9577db9c2
removed DBMemLeak.cpp and DBMemLeak.h, unused.
2013-05-21 22:51:19 -07:00
cdc7b2a000
weird #ifdef pattern, reorganized and cleaned it up. easier to understand now.
2013-05-21 00:36:34 -07:00
70eb226fea
changed from using a preset char buffer to string.
2013-05-21 00:36:34 -07:00
26143750f3
removed visual studio 5,6,7 specific code except in tinyxml and StackWalker.
2013-05-20 22:40:10 -07:00
Tabasco
Alex
j883376
SecretsOTheP
Hateborne
Arthur Ice
Michael Cook