KimLS
1f2145a45d
Fix for special_abilities crash dealing with std::string in struct that was then memcpyed
2013-07-18 00:24:43 -07:00
Alex
dfe63f87c3
Merge pull request #78 from j883376/cleanups
...
Code cleanups, take two
2013-07-12 13:36:02 -07:00
KimLS
2f335372a0
Few warning and lua fixes, fix for summon not working on new system. Need to look at enrage as it doesn't appear to work right either and think it's timing related
2013-07-07 15:22:20 -07:00
KimLS
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
j883376
0578f45490
Revert "Revert "Merge pull request #77 from j883376/cleanups""
...
This reverts commit d25205d9d381dc83d610fa1084019b90cfe83e1c.
2013-06-28 04:25:44 -04:00
KimLS
a5db4310c6
Merge branch 'master' into lua
...
Conflicts:
zone/merc.cpp
2013-06-27 12:53:47 -07:00
KimLS
d25205d9d3
Revert "Merge pull request #77 from j883376/cleanups"
...
This reverts commit 4ff2efea435a235b634904c91381334ce2d38e4b, reversing
changes made to e811e3975b3e6f5f1c3274a501b6f964925281fb.
2013-06-27 12:50:20 -07:00
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
bb1282de30
encounter events can now watch all events by all npcs/items/quests by registering themselves to watch -1, fix #74
2013-06-22 14:23:07 -07:00
KimLS
a3738dc131
Changed EVENT_TRADE to pass iteminst instead of variable ids, perl will not have changed at all but lua now passes the iteminsts in the trade object. Also redid a bunch of the spell quest stuff
2013-06-05 16:47:49 -07:00
KimLS
850fa5aecc
Exported client functions to lua, going to work on npc next
2013-05-26 12:44:33 -07:00
KimLS
e47de5deed
Merge with master
2013-05-24 01:23:58 -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
Michael Cook
0fdfe025cb
Remove 'using namespaces std' fixes #61
2013-05-22 16:17:19 -04: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
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
b26df187e6
Merge from master terrible
2013-05-15 16:01:13 -07:00
Arthur Ice
373ff66240
moved string functions from MiscFunctions to StringUtil
2013-05-11 00:05:11 -07: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
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
7560b6b0a7
NULL to nullptr
2013-05-04 18:06:58 -07:00
SecretsOTheP
56825e9ed0
Two crash fixes reported on the forums are hopefully fixed.
2013-03-20 10:46:09 -04:00
Arthur Ice
faa93c3739
Added some consts to remove 'deprecated string to char*' warnings.
2013-03-09 10:52:25 -08:00
Derision
c8ca362eba
Few minor issues highlighted by cppcheck/valgrind.
2013-03-04 19:15:07 +00:00
KimLS
d42ff6ce19
Merge branch 'master' into shared_mem
2013-02-23 22:43:24 -08:00
Derision
34a4b2ab37
Misc fizes.
2013-02-23 23:12:10 +00:00
KimLS
9c1159837a
Merge branch 'master' into shared_mem
2013-02-23 15:04:16 -08:00
KimLS
147c96970c
Moved faction stuff around, removed stupid external item status stuff
2013-02-23 15:03:15 -08:00
Derision
e7e1b46b36
Set #reloadlevelmods to status 255
2013-02-23 22:17:19 +00:00
Derision
299dc525d0
Set #reloadworld to 255 status
2013-02-23 22:00:43 +00:00
KimLS
c31b2b65c1
NPC Faction lists to new shared memory scheme
2013-02-23 13:45:19 -08:00
KimLS
8c425ff9d8
Merge branch 'master' into shared_mem
2013-02-22 22:36:30 -08:00
KimLS
1b44123551
Slight cleanup on recent pull req + changing versions up
2013-02-22 22:31:07 -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
f8bae86082
Spells via shared memory work, removal of blah, general fixes
2013-02-19 22:20:30 -08:00
KimLS
0d16361a40
Working on shared memory stuff - removed some stuff dealing with older code and loading spells from the non-database
2013-02-18 19:00:07 -08:00
KimLS
15dc9cfaf4
Some warning fixes, unreferenced local variables.
2013-02-16 22:07:32 -08:00
KimLS
da7347f76f
svn -> git Migration
2013-02-16 16:14:39 -08:00
