forked from EQEmu/Server
-
Notifications
You must be signed in to change notification settings - Fork 0
/
tatasdf
1957 lines (1335 loc) · 61.4 KB
/
tatasdf
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
[33mcommit 92282da4d5ad4ac20fe24323de83d0466905e60a[m
Merge: 5de491f b9a3218
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Tue May 14 13:00:08 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit b9a32185d7f0d76b0f21a36f8a6fb72e4d88184d[m
Merge: 73a4e87 0f88017
Author: josheb <uberneen@yahoo.com>
Date: Sun May 12 19:44:07 2013 -0700
Merge pull request #60 from josheb/master
CHA scribe logic fix.
[33mcommit 0f880177e4bc22a5c1fc74aeacd934ded9045a49[m
Merge: 7683252 3a31ad5
Author: root <root@Tabasco-VM.(none)>
Date: Sun May 12 21:36:13 2013 -0500
Merge branch 'master' of https://github.com/josheb/Server
[33mcommit 768325289681267470c1afcd6af1370c6ee937eb[m
Author: root <root@Tabasco-VM.(none)>
Date: Sun May 12 21:35:21 2013 -0500
CHA scribe rule logic fix
[33mcommit 73a4e8737913528569fecb72a21301c3b0dce254[m
Author: Michael Cook <mcook@mackal.net>
Date: Sat May 11 14:32:14 2013 -0400
FreeBSD support and clean up of unnecessary ifdef FREEBSD
[33mcommit 3a31ad55fb310a29649a48888e84b9746d582ffa[m
Merge: 56b15f5 9ea71dd
Author: josheb <uberneen@yahoo.com>
Date: Sat May 11 07:03:50 2013 -0700
Merge pull request #5 from EQEmu/master
sync
[33mcommit 5de491fe665977ac741bbd309832b1549e863b17[m
Merge: 47b20c7 9ea71dd
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Sat May 11 00:36:30 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 9ea71dd94f7fb2f6f36214abb5ece55626459b35[m
Merge: 7a93966 7a4cac8
Author: Uleat <uleat.charismata@gmail.com>
Date: Fri May 10 19:38:14 2013 -0700
Merge pull request #58 from EQEmu/botproc
-- Added Bot primary weapon proc (secondary and ranged already exist)
[33mcommit 7a4cac84ac93c39d27920a1951a79a630665c144[m
Author: Uleat <uleat.charismata@gmail.com>
Date: Fri May 10 22:24:56 2013 -0400
-- Added missing wrapper to bot update message
-- Added notes to AESpell() update
[33mcommit c98c115cb65ff73051ec9e191a904fd607525ad3[m
Author: Uleat <uleat.charismata@gmail.com>
Date: Thu May 9 20:57:02 2013 -0400
-- 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
[33mcommit 56b15f558ca9857ef70cc4970a1e80e6fcd86004[m
Merge: a0a9258 7a93966
Author: josheb <uberneen@yahoo.com>
Date: Thu May 9 06:19:29 2013 -0700
Merge pull request #4 from EQEmu/master
sync
[33mcommit 47b20c7097f34a2a316e9a7e6af90cedc15b5250[m
Merge: 17de00d 7a93966
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Thu May 9 01:38:11 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 7a9396615858264f1f18538f7d520dc559128ddf[m
Author: KimLS <KLS@peqtgc.com>
Date: Wed May 8 21:03:35 2013 -0700
VS2012 fix + return 0 fix
[33mcommit f6100ed83406dcef6ea2c6166acef1654883e9a8[m
Author: mackal <mcook@mackal.net>
Date: Wed May 8 17:07:49 2013 -0400
Fixed NPC::GetScore and XS_NPC_GetScore
[33mcommit 21a9434f89e3e5a9856024c92be9bf730ffb7d45[m
Author: Derision <DerisionEQ@gmail.com>
Date: Wed May 8 20:02:55 2013 +0100
Changed dummy strings written into the TaskSelector packet from nullptr to ABCD since the packet size calculation was based on the strings being 4 characters long.
[33mcommit 17de00d58117dc603acf127c2352bcb102633b37[m
Merge: b12a5b4 ea6e239
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Wed May 8 12:11:46 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit ea6e239d58a526a1a749af1df7ee5eae6effc533[m
Merge: 059ecdb 4ee4992
Author: josheb <uberneen@yahoo.com>
Date: Wed May 8 05:46:49 2013 -0700
Merge pull request #54 from af4t/master
VS2010 compatibility adjusts
[33mcommit 4ee499233061b58c2ae56785f4ee828b42cfd01e[m
Merge: 5cda797 059ecdb
Author: af4t <kemmler.irreverent@gmail.com>
Date: Wed May 8 06:07:11 2013 -0400
Merge branch 'master' of git://github.com/EQEmu/Server
[33mcommit b12a5b4cbf8be4aa500880fc93a3eb96e02150ee[m
Merge: f4320d6 059ecdb
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Tue May 7 18:29:37 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 059ecdb50b6373b1def84827efb09d8d45e9c7a6[m
Author: Michael Cook <mcook@mackal.net>
Date: Tue May 7 18:20:09 2013 -0400
Fix NULL to nullptr for SQL queries take 2
[33mcommit 0838d4507a2f423bde4f2ceffcc809694196bde8[m
Author: Michael Cook <mcook@mackal.net>
Date: Tue May 7 17:41:05 2013 -0400
Fix NULL to nullptr for SQL queries
[33mcommit 5cda797531393f9b5d4a0f6ab03afd59cf924e82[m
Author: af4t <kemmler.irreverent@gmail.com>
Date: Tue May 7 15:19:27 2013 -0400
VS2010 compatibility
[33mcommit 308a21e0e27792515afbdebc02e6d6cfef3f63e9[m
Merge: 90c7fab a0a9258
Author: josheb <uberneen@yahoo.com>
Date: Tue May 7 05:44:07 2013 -0700
Merge pull request #51 from josheb/master
Quest events and customizations
[33mcommit a0a92587b4beec1d2d42ff78ea3853ac8ffe9301[m
Author: tabasco <tabasco@tabasco.(none)>
Date: Mon May 6 16:24:44 2013 -0500
Fixing some regressions
[33mcommit 8e49ab91799b8714fc34d8cb1e1249d71cc220b3[m
Merge: 05d7c12 90c7fab
Author: josheb <uberneen@yahoo.com>
Date: Mon May 6 14:16:46 2013 -0700
Merge pull request #3 from EQEmu/master
sync
[33mcommit f4320d6200305ec4c64d90d4b88a84bc2751d4d1[m
Merge: 9e0d901 90c7fab
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Mon May 6 09:58:03 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 90c7fab452023bdc7dac318da042520e94703608[m
Merge: a4b985c 4a0749f
Author: Alex <KLS@peqtgc.com>
Date: Sun May 5 23:42:14 2013 -0700
Merge pull request #50 from j883376/master
Fix Auto XTargets not clearing on death
[33mcommit a4b985cd96a31e4b464a9f1d89e00ecca99dd729[m
Merge: e1c2657 7560b6b
Author: Alex <KLS@peqtgc.com>
Date: Sun May 5 23:41:47 2013 -0700
Merge pull request #49 from addtheice/master
NULL to nullptr
[33mcommit 05d7c12d387bb1677406f10a3f09823735f0222a[m
Author: Tabasco <uberneen@yahoo.com>
Date: Sun May 5 18:20:22 2013 -0500
Various customizations from DungeonCrawl
[33mcommit f983d19e01deadbc9641c6ba937d8beeca357c4d[m
Author: Tabasco <uberneen@yahoo.com>
Date: Sun May 5 17:53:34 2013 -0500
Removed my bookmark comments and cleaned up itemtick for cases where there are no tick items.
[33mcommit 4a0749f811a82709728928c818d68645c9a3fa35[m
Author: j883376 <j883376@gmail.com>
Date: Sun May 5 18:51:20 2013 -0400
Change NULL to nullptr in RemoveAutoXTargets()
[33mcommit e2fd78b51063d4d38a065bddeddfc25b30fda373[m
Author: j883376 <j883376@gmail.com>
Date: Sun May 5 06:47:53 2013 -0400
Fix Auto XTargets not clearing on death
[33mcommit 7560b6b0a72c19c9e86b1b0bb5e4128413f813b2[m
Author: Arthur Ice <addtheice@gmail.com>
Date: Sat May 4 18:06:58 2013 -0700
NULL to nullptr
[33mcommit 824b101831987e47ac3c23643de52983f41b417b[m
Merge: 43b91b5 e1c2657
Author: josheb <uberneen@yahoo.com>
Date: Sat May 4 07:30:46 2013 -0700
Merge pull request #2 from EQEmu/master
sync
[33mcommit e1c2657b115f61420dd3a9b7be9630e8cd0cd3f3[m
Author: Derision <DerisionEQ@gmail.com>
Date: Fri May 3 09:36:16 2013 +0100
NULL check in Merc::CalcItemBonuses
[33mcommit d3588d2c95d0543db2bfbe34f21d92d6367ea98a[m
Author: KimLS <KLS@peqtgc.com>
Date: Thu May 2 23:24:52 2013 -0700
PERL ON BY DEFAULT - THANKS DALAYA
[33mcommit c5c945f0c3d5df14f1dd171bbacd7ced1b6cbe61[m
Author: KimLS <KLS@peqtgc.com>
Date: Thu May 2 23:21:04 2013 -0700
Make perl truely optional (Dalaya)
[33mcommit 9e0d90158346807e2baadcb6da038630bea72582[m
Merge: d95d151 0227139
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Sun Apr 28 21:06:35 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 022713996a85226755d3b72ef8dc6c8b64c5091d[m
Author: Derision <DerisionEQ@gmail.com>
Date: Sun Apr 28 18:57:08 2013 +0100
Changed return type of CRC16 to uint16
[33mcommit d2c7f23ec9303328f3ad2c20d68063f061f992f7[m
Author: PiB <pixelbound@gmail.com>
Date: Sat Apr 27 19:13:34 2013 +0100
Implement CRC16 using CRC32.
[33mcommit d95d1511d7ca146c9ea152e7d49fd7d6cc3ba6a1[m
Merge: c388a03 232d1e2
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Sun Apr 28 10:21:46 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 232d1e2ca888f491f6ab1d45fc07f9c0dc906bf9[m
Author: Derision <DerisionEQ@gmail.com>
Date: Sat Apr 27 16:22:29 2013 +0100
Verify minimum size of OP_Packet, OP_Fragment and OP_OutOfOrderAck
[33mcommit 401e897019f0172366f0dd0a8da524cdf1a4bc99[m
Author: Derision <DerisionEQ@gmail.com>
Date: Sat Apr 27 15:45:24 2013 +0100
Verify OP_Ack size & fix crash in BasePacket::build_raw_header_dump due to uninitialised timestamp
[33mcommit c388a03fd45ff4b95d564af9b4a95395e6a7b5b4[m
Merge: 2aa3067 61f7009
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Fri Apr 26 01:36:10 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 61f70093780d3a58349cf72a223487289f409d16[m
Author: Derision <DerisionEQ@gmail.com>
Date: Thu Apr 25 19:04:33 2013 +0100
EQExtractor2 SQL gen support for current client.
[33mcommit 43b91b59389afcb2ec7797a5a4f93d692e5761aa[m
Merge: 5649040 e2f25d1
Author: josheb <uberneen@yahoo.com>
Date: Thu Apr 25 05:34:17 2013 -0700
Merge pull request #1 from EQEmu/master
Sync
[33mcommit e2f25d1c92ca031a8d9248036bbb67bcc70179de[m
Author: badcaptain <bad_captain@yahoo.com>
Date: Thu Apr 25 00:42:52 2013 -0400
Fixed a couple of merc stat issues and a few bot aggro issues, removed unneeded bot pet AI.
[33mcommit 56490400ca271690470f7b0496256d417805fe90[m
Author: Tabasco <uberneen@yahoo.com>
Date: Wed Apr 24 15:58:51 2013 -0500
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
[33mcommit b15cb08f549172f4f996be65af911888a5ce5c95[m
Author: Derision <DerisionEQ@gmail.com>
Date: Wed Apr 24 19:31:13 2013 +0100
EQExtractor2 update.
[33mcommit 9b015a29754acc455461b895c5c9827a5469f49f[m
Merge: a7ce668 b09a384
Author: Derision <DerisionEQ@gmail.com>
Date: Tue Apr 23 13:16:25 2013 -0700
Merge pull request #48 from addtheice/master
Cleaned up Packet Handling in world/Client
[33mcommit b09a3840eb226e5585ef6e685e8e6fa7aef9ee79[m
Author: Arthur Dene Ice <arthuri@predator-software.com>
Date: Mon Apr 22 23:22:13 2013 -0700
Turn HandleZoneChangePacket into method.
[33mcommit 495510a02ec0a66240257175ff68d8135388cf7d[m
Author: Arthur Dene Ice <arthuri@predator-software.com>
Date: Mon Apr 22 23:18:40 2013 -0700
Reorganized handling of Packets to be a bit cleaner.
[33mcommit ea606ef80dc958a09234d6131462cf21b6e200f6[m
Author: Arthur Dene Ice <arthuri@predator-software.com>
Date: Mon Apr 22 23:14:00 2013 -0700
Turn DeleteCharacterPacket handling into a method.
[33mcommit 27493c3d751f5a52012fc696aedcb69282e65951[m
Author: Arthur Dene Ice <arthuri@predator-software.com>
Date: Mon Apr 22 23:10:57 2013 -0700
Turn EnterWorldPacket handling into a method.
[33mcommit cc07d511a51a47d5e9894c177d1e092aa1a43473[m
Author: Arthur Dene Ice <arthuri@predator-software.com>
Date: Mon Apr 22 23:00:44 2013 -0700
Turn CharacterCreatePacket handling into a method.
[33mcommit 5b3ec4fb7ce20abf35a712e9188cce4f6b2994eb[m
Author: Arthur Dene Ice <arthuri@predator-software.com>
Date: Mon Apr 22 22:56:55 2013 -0700
Turn CharacterCreateRequestPacket handling into a method.
[33mcommit 18da8fe44d7e4ec659d1fed1c84b09d9774168eb[m
Author: Arthur Dene Ice <arthuri@predator-software.com>
Date: Mon Apr 22 22:52:29 2013 -0700
Turn GenerateRandomNamePacket handling into a method.
[33mcommit 211248b50ed37110b356fda59c488e1a624155a0[m
Author: Arthur Dene Ice <arthuri@predator-software.com>
Date: Mon Apr 22 22:47:19 2013 -0700
Turn SendLoginInfoPacket handling into a method.
[33mcommit 969f0c535e9a6e3ca20b25c036089aee347d2b77[m
Author: Arthur Dene Ice <arthuri@predator-software.com>
Date: Mon Apr 22 22:44:29 2013 -0700
Turn NameApprovalPacket handling into a method.
[33mcommit 2aa30676032b3166c7d6eeb48e3729790545da12[m
Merge: 5f0cbf9 a7ce668
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Sun Apr 21 11:19:22 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit a7ce66856b6425f7236102419528e5760958f33e[m
Author: JJ <jeremiah.oligario@gmail.com>
Date: Sat Apr 20 14:04:08 2013 -0400
Fix rare case where heals from buffs could be negative.
[33mcommit 5f0cbf97fa141c11dd7455ce3671df116028be14[m
Merge: 9efe713 3b42f29
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Fri Apr 12 17:04:23 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 3b42f295d6414efdf98e333b4b153ef665d32832[m
Author: Derision <DerisionEQ@gmail.com>
Date: Fri Apr 12 19:20:43 2013 +0100
Moved entity_list.Clear() prior to destruction of Perl objects in zone shutdown
[33mcommit 9efe7134a98a31a58a5bcf23a436302469a64959[m
Merge: bd7a423 b8febdd
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Thu Apr 11 13:02:56 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit b8febdd44059d09b4705c4e8fbba198f6cd22b17[m
Author: mackal <mcook@mackal.net>
Date: Tue Apr 9 14:50:51 2013 -0400
Realized there was a better way to do the DB entries for salvage, so I changed the script.
Run the optional 2013_04_09_SalvageCleanOld.sql if you ran the old script.
[33mcommit bd7a42388f92e53cc0545b38b85b95ae5eada88f[m
Merge: e2d47c1 f8795bc
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Tue Apr 9 02:14:15 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit f8795bcd72d04bd8be9ab24423a8c7eb33bfb33d[m
Author: mackal <mcook@mackal.net>
Date: Mon Apr 8 22:33:19 2013 -0400
Implemented Salvage AA.
Added a new coloumn to tradeskill_recipe_entires called salvagecount that works much in the same way to fail/success/componentcount
The code will default to the component list if nothing is found with a salvagecount
New script: generate_salvage.py will generate the entries for recipes with a failcount (make sure your config is vaild XML as well, it complains if it isn't)
[33mcommit 53301289f5e6b657343d3d5174c1b96599fcea8e[m
Merge: 5189605 81ca7a1
Author: mackal <mcook@mackal.net>
Date: Mon Apr 8 17:30:22 2013 -0400
Merge branch 'salvage'
[33mcommit 51896050ed23079bf1f6e550154c90dbf900513a[m
Author: mackal <mcook@mackal.net>
Date: Mon Apr 8 17:20:03 2013 -0400
Fix XML Type Declaration in example configs
[33mcommit 81ca7a1bfdfbc4b770511dfadf7a022b0f590ee0[m
Author: mackal <mcook@mackal.net>
Date: Mon Apr 8 14:16:08 2013 -0400
More work on salvage, added some extra checks and won't return stacks of items
[33mcommit 91c817d9ddfc6c75dc44519c7d9bf84c11bf5bc1[m
Author: mackal <mcook@mackal.net>
Date: Sun Apr 7 22:38:43 2013 -0400
Work on implementing salvage
[33mcommit e2d47c1aecce5e8d8226fc87795d54d1a4b9f909[m
Merge: 120e994 88b9f96
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Sat Apr 6 12:11:38 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 88b9f96b9196ea3da7b36fec500b0e452a3df5b2[m
Author: JJ <jeremiah.oligario@gmail.com>
Date: Sat Apr 6 08:23:09 2013 -0400
Attempting manual merge for Nature's Bounty
[33mcommit 120e99482828248b426314e70420cddabba38745[m
Merge: 775f62c b2d5ad6
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Sat Apr 6 08:10:33 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit b2d5ad6904f113f422e051c0564600ca04f8f881[m
Merge: 6fa93f2 20f086d
Author: JJ <jeremiah.oligario@gmail.com>
Date: Fri Apr 5 17:16:19 2013 -0700
Merge pull request #46 from mackal/pet_fixes_again
Switched rest of pet messages to MT_PetResponse
[33mcommit 20f086dc37bea83c7f476d80434e1028c1576177[m
Author: mackal <mcook@mackal.net>
Date: Wed Apr 3 16:09:44 2013 -0400
Switched rest of pet messages to MT_PetResponse
Overloaded Mob::Say_StringID with a version that takes a message type
[33mcommit 775f62c03f564a8b1e7c0df2e2398838d16f1a0e[m
Merge: 96a5ad7 6fa93f2
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Tue Apr 2 20:56:18 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 6fa93f243f738e8c6a46a823e783d49781f68f2c[m
Author: badcaptain <bad_captain@yahoo.com>
Date: Tue Apr 2 19:17:28 2013 -0400
Merged from Master & changelog.
[33mcommit 15e31d1c03372fb5d2e421e7e84cd3dbbc6d4d16[m
Merge: a787a7c 989d132
Author: badcaptain <bad_captain@yahoo.com>
Date: Tue Apr 2 19:10:18 2013 -0400
Merge branch 'master' of https://github.com/EQEmu/Server
[33mcommit a787a7ce727a34064cc54b9813e56b2420bcadd0[m
Author: badcaptain <bad_captain@yahoo.com>
Date: Tue Apr 2 19:09:32 2013 -0400
Fixed Merc lack of use of heal over time spells (causing excessive healing), fixed pet mitigation/AC issues.
[33mcommit 989d132423e023fc7451989016d8635984d4dd7e[m
Merge: 757fc01 353d7ce
Author: JJ <jeremiah.oligario@gmail.com>
Date: Mon Apr 1 15:49:19 2013 -0700
Merge pull request #45 from mackal/aa_fix
Bards can now use instant cast AAs while singing (Fading Memories, Boast...
[33mcommit 757fc01b781d1ca9370fb086d39ae22a0fba0485[m
Author: KimLS <KLS@peqtgc.com>
Date: Mon Apr 1 14:23:54 2013 -0700
Patch for:
-Perl blessing of exported variables is causing the SVs to be overwritten but never freed by the Perl GC. I'm not sure if this is a feature or a bug in Perl as the documentation sucks.
Addressed by setting the blessed SVs in question to be undefined at the end of every script. Caused a noticeable drop in memory for zones with a lot of quest events firing but it's probably not perfect.
[33mcommit 353d7cede0173c50026e594cbd4a8cc114490dc0[m
Author: mackal <mcook@mackal.net>
Date: Mon Apr 1 17:19:45 2013 -0400
Bards can now use instant cast AAs while singing (Fading Memories, Boastful Bellow)
AA reuse timers now start before the spell is cast and reset upon failure or canceling
[33mcommit 96a5ad7fa3900e1970fea2c8ffd5439b1d9588c7[m
Merge: 7e059e1 fb0add0
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Mon Apr 1 00:49:37 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit fb0add070b86bb82efc3f92289f34ba973da4053[m
Merge: 2dde4dc 96b42ed
Author: Derision <DerisionEQ@gmail.com>
Date: Sun Mar 31 04:06:16 2013 -0700
Merge pull request #43 from mackal/pet_fixes
Fix pet message to use StringIDs, most should be correct related to pet ...
[33mcommit 96b42ed86f4c38ee43ca15b7335b772f78172bc4[m
Author: mackal <mcook@mackal.net>
Date: Sat Mar 30 22:57:20 2013 -0400
Fix pet message to use StringIDs, most should be correct related to pet "saying" or just the client getting a message
Added the pet taunting message
[33mcommit 7e059e1d7a8a7fd3d7dacbc525e0fec62c2700bd[m
Merge: 49ddd82 2dde4dc
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Sat Mar 30 08:56:32 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 2dde4dce12ec5e5eff547473e055dd50a1dd7aab[m
Merge: 24d4eaf c7ff207
Author: JJ <jeremiah.oligario@gmail.com>
Date: Tue Mar 26 18:15:50 2013 -0700
Merge pull request #42 from SecretsOTheP/master
Potential fix for a Merc deconstructor crash.
[33mcommit c7ff207017a6c882e2578aa55aded886cb90b024[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Mon Mar 25 13:07:58 2013 -0400
Made Merc::AddMercToGroup handle cleaning up old groups as opposed to doing it in each location before AddMercToGroup. This should fix cases where the Merc's owner is invalid and being referenced, which causes the crash located in:
http://www.eqemulator.org/forums/showthread.php?t=36670&page=2
[33mcommit 23820a369e32fac92d44bedf8de73151127612e3[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sun Mar 24 18:08:03 2013 -0400
Moved around some data in Mercs to help prevent another crash... dunno if it actually will fix it but it can't hurt >_<
[33mcommit 24d4eaf65d4c1f32b2a88d833fe467b144939fc9[m
Merge: e2b9efa e0b05e5
Author: JJ <jeremiah.oligario@gmail.com>
Date: Sun Mar 24 11:56:06 2013 -0700
Merge pull request #41 from SecretsOTheP/master
Merc Group Crash Fix
[33mcommit e0b05e573e52659d70b500e09b9c4cfa5e6de532[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sun Mar 24 14:31:03 2013 -0400
Merc group/depop crash fixes.
[33mcommit e2b9efaf4981ef5595ba0135e6f4fbf911691e1c[m
Author: JJ <jeremiah.oligario@gmail.com>
Date: Sun Mar 24 08:36:53 2013 -0400
Fixed SQL
[33mcommit 349eb371c626b1ab92aa12d1de9771802d042f7d[m
Merge: 5e618a1 afe3ba4
Author: JJ <jeremiah.oligario@gmail.com>
Date: Sun Mar 24 05:20:29 2013 -0700
Merge pull request #40 from af4t/master
Fix typos in utils/sql/git/required/2013_03_23_Escape_FadingMemories.sql
[33mcommit afe3ba40cf7a1baca82cea85a803d83e483348f8[m
Author: af4t <kemmler.irreverent@gmail.com>
Date: Sun Mar 24 08:14:50 2013 -0400
Fix typos
[33mcommit 5e618a1ca460db18cb464273ad4bd497e5d5f63e[m
Merge: d011332 2073ca8
Author: Alex <KLS@peqtgc.com>
Date: Sun Mar 24 01:13:54 2013 -0700
Merge pull request #39 from mackal/Fade_Escape_Fix
Fixed and cleaned up Client::Escape()
[33mcommit d0113326477ce7f1e22544f1e7ff82e837bac868[m
Merge: ac040b5 bc73e9c
Author: Alex <KLS@peqtgc.com>
Date: Sun Mar 24 01:13:14 2013 -0700
Merge pull request #38 from SecretsOTheP/master
Merc Fixes Again
[33mcommit bc73e9c4e3b565bdfaf37d8c988840bf3d557ccb[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sun Mar 24 04:02:47 2013 -0400
Whoops. Fixed a small change I did.
[33mcommit e609ec1df61e5f4fdd73f0375f98a1107c519658[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sun Mar 24 04:01:49 2013 -0400
Fix for a crash issue related to groups that both PEQ and Armm reported on the forums.
[33mcommit 2073ca8d380e2c5a2056fafe9cf2361c3769f840[m
Author: mackal <mcook@mackal.net>
Date: Sat Mar 23 18:34:06 2013 -0400
Fixed and cleaned up Client::Escape()
Fixed SE_FadingMemories to use Client::Escape()
Rogue AA Escape now uses a spell instead of AA Action
Bard AA Fading Memories now only uses the AA Action to eat mana
[33mcommit 49ddd8263f15c852e50eb1971bb6e66f24a89aab[m
Merge: 11e65ef ac040b5
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Sat Mar 23 14:38:29 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit a6f2c1be8a427734f47ef0c5dd53be9d6c070f49[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sat Mar 23 10:13:29 2013 -0400
Syntax error, better place for entity list removal
[33mcommit 18e97142737c9f9a71f897f1cbb9af4a320a2d29[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sat Mar 23 10:10:03 2013 -0400
Another safeguard against a dangling pointer.
[33mcommit fa18991917e3a9ac0c5a2116133981503c60bbc9[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sat Mar 23 10:04:49 2013 -0400
Added a few checks to resolve dangling pointers involving Mercs. Similar to the AIYellForHelp crash fixed years ago by Rogean.
[33mcommit b0b342a020612fecbd31964022f3ca53f9ac7f14[m
Merge: abaad22 8e604fd
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sat Mar 23 05:05:16 2013 -0400
Merge branch 'master' of https://github.com/SecretsOTheP/Server
Conflicts:
common/patches/RoF.cpp
[33mcommit 8e604fd3db3b432d041084c5a69a6300ef29ea28[m
Merge: 2124b63 ac040b5
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sat Mar 23 05:02:27 2013 -0400
Merge branch 'master' of https://github.com/EQEmu/Server
Conflicts:
zone/client_packet.cpp
zone/merc.cpp
zone/npc.cpp
[33mcommit abaad22eb495491f29b4044b71689e21f379aea8[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sat Mar 23 04:58:03 2013 -0400
-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.
[33mcommit ac040b519748aa44e985a1d99baf2d0787bdc36e[m
Author: JJ <jeremiah.oligario@gmail.com>
Date: Fri Mar 22 21:48:57 2013 -0400
Added some pointer checks as discussed in issue #36
[33mcommit 11e65ef09897f02a2cfdda877c1982fabafc970c[m
Merge: 9976639 9b1a18d
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Fri Mar 22 01:21:02 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 9b1a18d9a3ab59feac2a43740df1bae405368b4a[m
Merge: a20c773 c94822a
Author: badcaptain <bad_captain@yahoo.com>
Date: Fri Mar 22 00:07:22 2013 -0400
Merge branch 'master' of https://github.com/EQEmu/Server
Conflicts:
changelog.txt
[33mcommit a20c7735e8314ef6a8476216c735f2502fe3c584[m
Author: badcaptain <bad_captain@yahoo.com>
Date: Fri Mar 22 00:03:50 2013 -0400
Fixed merc buffing bugs, added checks before dismissing merc to prevent possible bugged mercs, merged in Secret's merc memory leak fixes.
[33mcommit c94822a2a1f36c0020488631e46749efb0c98c36[m
Merge: 6ae8fbc 886c7bf
Author: Derision <DerisionEQ@gmail.com>
Date: Thu Mar 21 13:13:14 2013 -0700
Merge pull request #37 from mackal/stacking_SE_Limits
Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aur...
[33mcommit 2124b6398293ab8eeb2fccfb27821528ae561a75[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Thu Mar 21 00:40:59 2013 -0400
-Fixed a memleak in inviting mercs to group.
-Fixed a duplicate merc in window bug.
[33mcommit 886c7bf634fe2643e883fefd7bb83fa26fde682f[m
Author: mackal <mcook@mackal.net>
Date: Wed Mar 20 23:29:00 2013 -0400
Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aura of Reverence)
[33mcommit 997663988d409baf91981528953444ebf85b9494[m
Merge: 0a15b8d 6ae8fbc
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Wed Mar 20 13:44:06 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 56825e9ed0bbb460da0ea8ceca4f223ee70db104[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Wed Mar 20 10:46:09 2013 -0400
Two crash fixes reported on the forums are hopefully fixed.
[33mcommit 925ba2199edee6716103b36a9dc12a15636c59a9[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Wed Mar 20 07:19:20 2013 -0400
Whoops, forgot CMakeLists.txt
[33mcommit fd8650b8a0c1789437afc544699684d773bed154[m
Merge: 549455b f90a5b5
Author: SecretsOTheP <espause0703@gmail.com>
Date: Wed Mar 20 04:25:34 2013 -0400
Merge branch 'master' of https://github.com/SecretsOTheP/Server
[33mcommit 549455b3df08212a9fee96717ebcdf33c7e204f2[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Wed Mar 20 04:02:33 2013 -0400
Merc message removed.
VLD removed, oops.
[33mcommit f90a5b5b71b20d71320cd3bd275822bb5b9ef67c[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Wed Mar 20 04:02:33 2013 -0400
Merc message removed.
[33mcommit 5c76297e5f444bb99eae4d650cbcb17188825382[m
Merge: cabf863 6ae8fbc
Author: SecretsOTheP <espause0703@gmail.com>
Date: Wed Mar 20 04:01:44 2013 -0400
Merge branch 'master' of https://github.com/EQEmu/Server
[33mcommit cabf8631d449e5c523932f306f54df3be101e7cc[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Wed Mar 20 04:00:08 2013 -0400
Fixed mercenary memleaks in AI_Start and Unsuspend.
[33mcommit 6ae8fbc0e4915309aa839184b4f8e20f98ee5a9c[m
Author: Derision <DerisionEQ@gmail.com>
Date: Tue Mar 19 20:44:22 2013 +0000
Initialised some data in Mob/Merc constructors to stop valgrind complaining.
[33mcommit f32a277643fb4c92429a09e19df8422029b8d57e[m
Author: Derision <DerisionEQ@gmail.com>
Date: Tue Mar 19 19:22:16 2013 +0000
Fixed memory leak in OP_VeteranRewardsAvailable
[33mcommit 09df77b56e52f38fb4bbdfea681a651f7ebeb0ae[m
Author: badcaptain <bad_captain@yahoo.com>
Date: Tue Mar 19 01:03:15 2013 -0400
Changelog fix.
[33mcommit f5e58e0125e532441b7179cb27109d39e0556fb6[m
Merge: 660ab53 5c9f2c0
Author: badcaptain <bad_captain@yahoo.com>
Date: Tue Mar 19 00:57:15 2013 -0400
Merge branch 'master' of https://github.com/EQEmu/Server into Mercs
Conflicts:
changelog.txt
[33mcommit 660ab53476b9477c808618d228b153aaca83ed6c[m
Author: badcaptain <bad_captain@yahoo.com>
Date: Tue Mar 19 00:53:01 2013 -0400
Fixed zone crash due to merc focus effects & tribute, merc aggro issues when client in melee range, spell recast timers. Added melee DPS spells/disciplines & support.
[33mcommit 0a15b8da1d9d225b3d22e93bdee32b0889bd2a39[m
Merge: a0b092f 5c9f2c0
Author: Davoodinator <davoodatwork@hotmail.com>
Date: Mon Mar 18 17:42:41 2013 -0400
Merge https://github.com/EQEmu/Server
[33mcommit 5c9f2c0d50ca6920305999d9d3e1127be44238a4[m
Author: Derision <DerisionEQ@gmail.com>
Date: Mon Mar 18 21:09:23 2013 +0000
Fixed a couple of memory leaks.
[33mcommit d036afee5b997fe236d7a13b57e83d7ffecfb4d0[m
Author: Derision <DerisionEQ@gmail.com>
Date: Sun Mar 17 15:52:48 2013 +0000
Fixed missing version parameter in DB select in GetZoneWeather.
[33mcommit 4ab7786828276e139be7b432c021701e3d21d231[m
Merge: 9fbf9ab 981cabe
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sun Mar 17 10:14:25 2013 -0400
Merge branch 'master' of https://github.com/EQEmu/Server
Conflicts:
zone/client_packet.cpp
[33mcommit 981cabe85768b4384eaf4ee7c6b26d3652d2e054[m
Author: Derision <DerisionEQ@gmail.com>
Date: Sun Mar 17 13:52:43 2013 +0000
Fixed a couple of merc memory leaks and removed some commented out DumpPacket calls.
[33mcommit 8eef122cec55e25cf15603d0c2f69a9602df893f[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sun Mar 17 06:20:12 2013 -0400
Forgot changelog :x
[33mcommit 1dc16558914925ba5f9d5376bafe739f50b47b02[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sun Mar 17 06:18:32 2013 -0400
Hopefully fixed that pesky merc memleak and cleaned up mercs a tad.
[33mcommit 0bc942f4d56ef16945a64de5de86e7258b7d308c[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Fri Mar 15 03:27:45 2013 -0400
Test
[33mcommit 9fbf9abd47c66d84274aa19b78f1fc8ec394002f[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sun Mar 17 06:20:12 2013 -0400
Forgot changelog :x
[33mcommit b8170df4986b983673a843c7217a7ecd9139bb2f[m
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sun Mar 17 06:18:32 2013 -0400
Hopefully fixed that pesky merc memleak and cleaned up mercs a tad.
[33mcommit d76a8bd34ac9899d8d90dc0594b09190ac04f315[m
Author: Derision <DerisionEQ@gmail.com>
Date: Sun Mar 17 10:09:13 2013 +0000
EQExtractor2: Added SQL generation support for current Live client decoder.
[33mcommit 021faf68b3d082af9ee814c04984f59e70d0edca[m
Merge: c301b30 7c264ad
Author: SecretsOTheP <espause0703@gmail.com>
Date: Sun Mar 17 04:52:52 2013 -0400
Merge branch 'master' of https://github.com/EQEmu/Server
[33mcommit 7c264ad0974329e980dc030f38bdbd8ba67fefa2[m
Author: Derision <DerisionEQ@gmail.com>
Date: Sat Mar 16 19:56:09 2013 +0000
EQExtractor2 update.
[33mcommit 810fdf3ccac7aec22200ada95cd893ac85a48163[m
Author: Derision <DerisionEQ@gmail.com>
Date: Fri Mar 15 19:37:29 2013 +0000
Resurrection - Fix for RoF + fixed a couple of memory leaks.
[33mcommit c301b30c3a62cda73c81354da51090405d6cd16d[m
Merge: 735b418 a14feca