KimLS
2445576ae8
Merge branch 'master' into lua
2013-05-11 20:35:49 -07:00
Michael Cook
73a4e87379
FreeBSD support and clean up of unnecessary ifdef FREEBSD
2013-05-11 14:32:14 -04:00
KimLS
d1f7935ee2
...trying out boost with luabind
2013-05-11 01:29:58 -07:00
Arthur Ice
b19755a313
For windows compile, moved definve of va_copy
2013-05-11 00:46:46 -07:00
Arthur Ice
9a139a7604
missed two string conversion functions. Moved them to StringUtil
2013-05-11 00:17:02 -07:00
Arthur Ice
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07:00
Arthur Ice
babd3949f6
Added StringUtil h/cpp which contains StringFormat
2013-05-10 23:18:00 -07:00
Arthur Ice
3521472942
Merge branch 'master' of https://github.com/EQEmu/Server
2013-05-10 22:55:15 -07:00
KimLS
dc045591e4
Lua work - loading works, I think checking for sub works. Calling subs is in the beginning stages and binding is starting
2013-05-10 20:13:35 -07:00
Uleat
c98c115cb6
-- Added Bot primary weapon proc (secondary and ranged already exist)
...
-- Added Bard Bot Instrumentation bonuses
-- Added checks to avoid AE Buff casting on enemy mobs
-- Fixed a few typos in 'Vah Shir'-related code
2013-05-09 20:57:02 -04:00
KimLS
0e4ac63b6b
Perl parser works, still needs a little cleanup
2013-05-09 14:52:20 -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
KimLS
feae79b417
Merge from master
2013-05-08 20:22:40 -07:00
KimLS
bcf9546b2d
Partial perl parser rewrite, want to make it cleaner and have it match the interface
2013-05-08 20:18:39 -07:00
Arthur Ice
273cb928bf
removed using namespace std
2013-05-08 18:13:33 -07:00
Arthur Ice
23c524812d
Removed the _MSC_VER special cases for Visual Studio 2008 and lower.
...
We no longer support 2008 and lower so these defines will never be used.
2013-05-08 17:09:13 -07:00
Arthur Ice
c6ca89907c
Converted a lot of the char[] stuff internally into std:string
...
in addition I switched over to <string> rather than <string.h>
2013-05-08 17:09:13 -07:00
Michael Cook
059ecdb50b
Fix NULL to nullptr for SQL queries take 2
2013-05-07 18:20:09 -04:00
josheb
8e49ab9179
Merge pull request #3 from EQEmu/master
...
sync
2013-05-06 14:16:46 -07:00
Tabasco
f983d19e01
Removed my bookmark comments and cleaned up itemtick for cases where there are no tick items.
2013-05-05 18:04:22 -05:00
Arthur Ice
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
josheb
824b101831
Merge pull request #2 from EQEmu/master
...
sync
2013-05-04 07:30:46 -07:00
Derision
022713996a
Changed return type of CRC16 to uint16
2013-04-28 19:09:48 +01:00
PiB
d2c7f23ec9
Implement CRC16 using CRC32.
2013-04-28 18:56:19 +01:00
Derision
232d1e2ca8
Verify minimum size of OP_Packet, OP_Fragment and OP_OutOfOrderAck
2013-04-27 16:22:29 +01:00
Derision
401e897019
Verify OP_Ack size & fix crash in BasePacket::build_raw_header_dump due to uninitialised timestamp
2013-04-27 15:45:24 +01:00
Tabasco
56490400ca
Dungeon Crawl custom code merge
...
Added numerous modding hooks.
Added rules:
Character:KeepLevelOverMax - Don't delevel a character if they are found to be over max level rule.
Spells:UseCHAScribeHack - Optionally omit spells with CHA in effect12 when using scribespells and traindiscs
Combat:MonkACBonusWeight - Adjust the weight threshold for monk AC bonus
Combat:ClientStunLevel - Adjust the level clients kicks and bashes start to roll for stuns
Combat;QuiverWRHasteDiv - Adjust the divisor applied to weight reduction for haste calcs
Combat:UseArcheryBonusRoll - Make archery stationary bonus a roll
Combat:ArcheryBonusChance - Archery stationary bonus chance
Added account flags and associated perl wrappers
Added EVENT_ITEM_TICK for interactive items
Added EVENT_DUEL_WIN and EVENT_DUEL_LOSE, which exports $enemyname and $enemyid
Added timer and interval to console worldshutdown command
Added EQW interface for worldshutdown and server-wide messages
2013-04-24 15:58:51 -05:00
JJ
88b9f96b91
Attempting manual merge for Nature's Bounty
2013-04-06 08:23:09 -04:00
SecretsOTheP
abaad22eb4
-Merc upkeep timers fixed to display properly. They now persist through zones as well as save to the database properly.
...
-Merc unsuspend timers should now be more reliable across zone shutdown.
2013-03-23 04:58:03 -04:00
Derision
f32a277643
Fixed memory leak in OP_VeteranRewardsAvailable
2013-03-19 19:22:16 +00:00
SecretsOTheP
1dc1655891
Hopefully fixed that pesky merc memleak and cleaned up mercs a tad.
2013-03-17 13:01:54 +00:00
Derision
810fdf3cca
Resurrection - Fix for RoF + fixed a couple of memory leaks.
2013-03-15 19:37:29 +00:00
badcaptain
7109a40637
Merge branch 'master' of https://github.com/EQEmu/Server
2013-03-14 20:03:48 -04:00
badcaptain
0a805feeec
Fixed Merc spell recast timers, changed how Mercs add mobs to their hate lists (should prevent IsEngaged() issues), initial Caster DPS Merc spell casting AI, initial Merc stance implementation, Mercs now suspend when their owner dies to prevent them being bugged (until it can be fixed), added 2 seconds between spell casts to be live-like.
2013-03-14 19:51:29 -04:00
Derision
e53ae5f6d5
More compiler warning fixes.
2013-03-10 18:55:18 +00:00
KimLS
a2500ff814
Fix for DBCore crash
2013-03-08 18:07:28 -08:00
KimLS
adf42c8750
Changed some stuff to keep it consistent with old behavior: was seeing crashes related to ptimers on peq.
2013-03-06 11:19:44 -08:00
Alex
f7469412f1
Merge pull request #23 from addtheice/master
...
Fixed missing include that blocked compile on linux.
2013-03-05 23:05:27 -08:00
Derision
c8ca362eba
Few minor issues highlighted by cppcheck/valgrind.
2013-03-04 19:15:07 +00:00
Arthur Ice
950f00fae6
Fixed some warnings, like sprintf %i warnings (converted to %lu), fals vs NULL, etc
2013-03-03 16:17:06 -08:00
Arthur Ice
d8628170b5
Fixed missing include that blocked compile on linux.
2013-03-03 15:26:40 -08:00
KimLS
9262c0895f
Merge branch 'master' of https://github.com/EQEmu/Server
2013-02-28 22:33:31 -08:00
KimLS
b5405c35e2
Tests fix + fix for certain factions not loading
2013-02-28 22:33:20 -08:00
badcaptain
ea72975e69
Fixed Merc duplicate save bug, focus items, spell_scale and heal_scale now work implemented, new merc equipment (with focus items), added checks during merc hire, unsuspend, & timer update for states where a merc can't be hired, unsuspended, or can't be retained due to insufficient funds, no room in group, in raid, invalid merc data, etc, and give appropriate feedback, added rules for charging of merc purchase and upkeep costs.
2013-03-01 00:01:27 -05:00
KimLS
aff4d53d7e
Fix for sdrawkcab index in skill_caps
2013-02-24 22:08:10 -08:00
KimLS
7e63135a3d
Fix for linux ipc mutex
2013-02-24 10:51:04 -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