sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-30 05:07:46 +00:00

Commit graph

Select branches

Hide pull requests

Sapphire5.58

Sapphire5.58_action

Sapphire_Retail

ThreePointOh

ThreePointThree

develop5.58

event_system_test

master

those_who_fight

want_some_action

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#121

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#135

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#179

#18

#184

#185

#186

#187

#188

#189

#19

#190

#191

#193

#194

#195

#196

#197

#198

#199

#200

#201

#202

#203

#204

#206

#207

#208

#209

#21

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#278

#279

#28

#280

#281

#282

#283

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#297

#298

#299

#30

#300

#301

#302

#303

#304

#305

#306

#307

#316

#317

#318

#319

#320

#321

#322

#323

#324

#325

#326

#327

#331

#333

#334

#335

#336

#337

#340

#342

#343

#344

#345

#346

#347

#348

#350

#351

#352

#353

#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

#384

#385

#386

#387

#389

#39

#390

#392

#393

#394

#395

#396

#397

#398

#399

#401

#402

#403

#404

#405

#406

#407

#408

#409

#410

#411

#412

#413

#414

#415

#416

#417

#418

#419

#42

#420

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#433

#434

#435

#436

#437

#438

#439

#44

#440

#441

#442

#443

#444

#445

#446

#447

#449

#45

#451

#452

#453

#454

#455

#456

#457

#458

#459

#46

#460

#461

#462

#463

#464

#465

#466

#467

#468

#469

#47

#470

#471

#473

#475

#476

#477

#478

#479

#480

#481

#482

#483

#484

#485

#486

#487

#49

#499

#501

#502

#503

#504

#505

#506

#507

#508

#51

#510

#511

#512

#514

#515

#516

#517

#518

#519

#52

#520

#521

#522

#523

#524

#525

#527

#528

#529

#53

#530

#531

#532

#533

#534

#535

#536

#537

#538

#539

#54

#540

#541

#542

#543

#544

#545

#546

#547

#548

#549

#55

#550

#551

#552

#553

#554

#555

#556

#557

#558

#559

#56

#560

#561

#562

#563

#564

#566

#567

#568

#569

#570

#571

#572

#573

#574

#578

#579

#581

#582

#584

#585

#586

#587

#588

#589

#59

#590

#591

#592

#593

#594

#595

#596

#597

#599

#60

#600

#601

#602

#603

#604

#605

#607

#608

#609

#610

#611

#612

#613

#614

#615

#616

#617

#618

#619

#62

#620

#621

#622

#623

#624

#625

#626

#627

#628

#629

#63

#630

#631

#633

#634

#637

#638

#639

#64

#640

#641

#642

#643

#644

#645

#646

#647

#648

#649

#65

#650

#651

#652

#653

#654

#655

#656

#657

#658

#659

#66

#660

#661

#662

#663

#665

#666

#667

#668

#669

#670

#671

#672

#673

#674

#675

#676

#677

#678

#679

#680

#681

#682

#683

#684

#685

#686

#687

#689

#69

#691

#696

#697

#698

#699

#700

#701

#705

#706

#707

#708

#709

#71

#710

#711

#713

#714

#715

#716

#717

#718

#719

#72

#720

#721

#722

#723

#724

#725

#726

#727

#728

#729

#73

#730

#731

#732

#733

#734

#735

#736

#737

#738

#739

#74

#740

#741

#742

#743

#744

#745

#747

#748

#749

#75

#750

#751

#752

#753

#754

#755

#756

#757

#758

#759

#76

#760

#761

#762

#763

#764

#765

#766

#767

#768

#769

#77

#770

#771

#772

#773

#774

#775

#776

#777

#778

#779

#78

#780

#781

#782

#783

#784

#785

#786

#787

#788

#789

#79

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#80

#800

#801

#802

#803

#804

#805

#806

#807

#808

#809

#81

#810

#811

#812

#813

#814

#815

#817

#819

#82

#820

#821

#822

#823

#824

#825

#826

#827

#828

#829

#83

#830

#831

#832

#833

#834

#835

#836

#837

#838

#839

#84

#840

#841

#842

#843

#844

#845

#846

#847

#848

#849

#85

#850

#851

#852

#853

#854

#855

#856

#857

#858

#859

#86

#860

#861

#862

#863

#864

#865

#866

#867

#868

#869

#87

#870

#871

#872

#873

#874

#875

#876

#877

#878

#879

#88

#880

#881

#882

#883

#884

#885

#886

#887

#888

#889

#89

#890

#891

#892

#893

#894

#895

#896

#897

#898

#899

#90

#900

#901

#902

#903

#904

#905

#906

#907

#908

#909

#91

#910

#911

#912

#913

#914

#915

#916

#917

#918

#919

#92

#920

#921

#922

#923

#924

#925

#926

#927

#928

#929

#93

#930

#931

#933

#934

#935

#937

#938

#939

#940

#941

#942

#943

#944

#945

#946

#947

#948

#949

#95

#950

#952

#953

#954

#955

#956

#957

#958

#959

#96

#960

#961

#962

#963

#964

#965

#967

#969

#97

#970

#971

#972

#973

#974

#975

#98

#99

v4.18

v4.25

v4.36

v4.45

v4.58

v5.08

v5.10

v5.11

v5.18

v5.20

v5.21

v5.211

v5.25

v5.31

104b07d7fa start moving old packets to new incoming packet system NotAdam 2018-07-06 22:43:49 +10:00
f774ba9d33 fix typo NotAdam 2018-07-06 22:43:26 +10:00
3051aaa9b4 fix typo NotAdam 2018-07-06 22:43:26 +10:00
479a4369ab add packet hex dump, moved gm1handler to use struct inpacket NotAdam 2018-07-06 21:53:35 +10:00
3e4582560d add packet hex dump, moved gm1handler to use struct inpacket NotAdam 2018-07-06 21:53:35 +10:00
57c1f66310 raw packet data contains an ipc header, not segment NotAdam 2018-07-06 20:32:54 +10:00
4897481309 raw packet data contains an ipc header, not segment NotAdam 2018-07-06 20:32:54 +10:00
24615759ce client opcode updates NotAdam 2018-07-06 20:32:36 +10:00
b3651c8abd client opcode updates NotAdam 2018-07-06 20:32:36 +10:00
98bb3eb436 incoming packet deserialization NotAdam 2018-07-06 19:47:35 +10:00
228053834a incoming packet deserialization NotAdam 2018-07-06 19:47:35 +10:00
a322e81a53 remove old xmlconfig class NotAdam 2018-07-06 19:47:07 +10:00
c3128e4ca3 remove old xmlconfig class NotAdam 2018-07-06 19:47:07 +10:00
d8896bf53e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-07-04 17:32:18 +02:00
173ed8174f Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-07-04 17:32:18 +02:00
788a3a30a5 Initui fix. Still plenty of issues in it, at least bitmasks line up again though Mordred 2018-07-04 17:31:56 +02:00
b1e2678362 Initui fix. Still plenty of issues in it, at least bitmasks line up again though Mordred 2018-07-04 17:31:56 +02:00
f13c0d84be Merge pull request #333 from NotAdam/develop Mordred 2018-07-04 14:50:36 +02:00
9ba4223e23

Merge pull request #333 from NotAdam/develop Mordred 2018-07-04 14:50:36 +02:00
924c455f34 add packet injection back NotAdam 2018-07-04 22:13:06 +10:00
829d851317 add packet injection back NotAdam 2018-07-04 22:13:06 +10:00
3d09b3efc0 unlockAction now takes u16 param, unlockAction debug command added NotAdam 2018-07-04 19:28:54 +10:00
92cfe1e2a5 unlockAction now takes u16 param, unlockAction debug command added NotAdam 2018-07-04 19:28:54 +10:00
fec2b8c81b Updated submodules Mordred Admin 2018-07-04 09:01:47 +02:00
22663bb560 Updated submodules Mordred Admin 2018-07-04 09:01:47 +02:00
56996b73f4 Added another trigger def and removed some debug prints Mordred 2018-07-03 23:25:44 +02:00
5e280c9d05 Added another trigger def and removed some debug prints Mordred 2018-07-03 23:25:44 +02:00
d10e3f9423 Fixed instances Mordred 2018-07-03 23:09:36 +02:00
3c2b45507c Fixed instances Mordred 2018-07-03 23:09:36 +02:00
f37ac11550 [Subquests] Adjusts Dantestyle 2018-07-03 21:37:14 +02:00
ef31c62b44 [Subquests] Adjusts Dantestyle 2018-07-03 21:37:14 +02:00
e5f0e6be46

Merge 741c9f6fe4 into a3d5dc8c26 DantestyleXD 2018-07-03 13:22:25 +00:00
9d620d160c Merge remote-tracking branch 'origin/develop' into packet_work Mordred Admin 2018-07-03 15:01:13 +02:00
a3d5dc8c26 Merge remote-tracking branch 'origin/develop' into packet_work Mordred Admin 2018-07-03 15:01:13 +02:00
57cf959c94 Merge pull request #323 from goaaats/actor_control_redo Mordred 2018-07-03 14:38:57 +02:00
b28a4e6776

Merge pull request #323 from goaaats/actor_control_redo Mordred 2018-07-03 14:38:57 +02:00
70d58d2484 More renames goaaats 2018-07-03 14:31:20 +02:00
d27877d242 More renames goaaats 2018-07-03 14:31:20 +02:00
b53f03aa9f Rename ClientActorControl back to ClientTrigger goaaats 2018-07-03 14:20:51 +02:00
46133d4f6f Rename ClientActorControl back to ClientTrigger goaaats 2018-07-03 14:20:51 +02:00
b9019876cd Merge pull request #324 from DantestyleXD/CmnDefMogLetter Mordred 2018-07-03 12:14:26 +02:00
3e4067452a

Merge pull request #324 from DantestyleXD/CmnDefMogLetter Mordred 2018-07-03 12:14:26 +02:00
6e7f1c6692 Merge pull request #331 from NotAdam/packet_work Mordred 2018-07-03 12:14:05 +02:00
3866fa01fb

Merge pull request #331 from NotAdam/packet_work Mordred 2018-07-03 12:14:05 +02:00
3448218ff6 Merge pull request #327 from AcedArmy/actor_rewrite Mordred 2018-07-03 12:13:19 +02:00
464bcec7d9

Merge pull request #327 from AcedArmy/actor_rewrite Mordred 2018-07-03 12:13:19 +02:00
72c071eb07 check if segmentTargetOverride is nonzero before overriding target NotAdam 2018-07-03 20:12:28 +10:00
66b25b0755 check if segmentTargetOverride is nonzero before overriding target NotAdam 2018-07-03 20:12:28 +10:00
f693fa0a2f segment header types, send inrange packets and override target id NotAdam 2018-07-03 20:04:12 +10:00
0ae41974b2 segment header types, send inrange packets and override target id NotAdam 2018-07-03 20:04:12 +10:00
c7760a0dc6 Merge remote-tracking branch 'origin/develop' into packet_work Mordred Admin 2018-07-03 09:32:14 +02:00
b2aeed0f8a Merge remote-tracking branch 'origin/develop' into packet_work Mordred Admin 2018-07-03 09:32:14 +02:00
8e6cdf0eda Removed old GamePacket Mordred Admin 2018-07-03 09:20:09 +02:00
50ba02ed27 Removed old GamePacket Mordred Admin 2018-07-03 09:20:09 +02:00
30b08d5817 More packet conversion for lobby and zone Mordred 2018-07-03 00:01:26 +02:00
b784c9e311 More packet conversion for lobby and zone Mordred 2018-07-03 00:01:26 +02:00
c01cf130a4 Tell works again and add research I found for u3b Biscuit Boy 2018-07-02 23:16:55 +10:00
e852e73865 Tell works again and add research I found for u3b Biscuit Boy 2018-07-02 23:16:55 +10:00
70425780d5 Merge pull request #287 from AcedArmy/actor_rewrite Mordred 2018-07-02 11:34:47 +02:00
d4133f19d9

Merge pull request #287 from AcedArmy/actor_rewrite Mordred 2018-07-02 11:34:47 +02:00
27cfa2f27f change isActingAsGm const location and add const to getOnlineStatus Biscuit Boy 2018-07-02 07:31:23 +10:00
062566f848 change isActingAsGm const location and add const to getOnlineStatus Biscuit Boy 2018-07-02 07:31:23 +10:00
629202e98f [ Classquests ] ClsArc003 added Dantestyle 2018-07-01 22:59:48 +02:00
06ac3e3632 [ Classquests ] ClsArc002 added Dantestyle 2018-07-01 22:59:10 +02:00
7da6e94ad3 [ Classquests ] ClsArc001 added Dantestyle 2018-07-01 22:58:44 +02:00
c83c59c25d Update isActingAsGm so we don't call getOnlineStatus 3 times Biscuit Boy 2018-07-01 21:43:50 +10:00
667ab110b9 Update isActingAsGm so we don't call getOnlineStatus 3 times Biscuit Boy 2018-07-01 21:43:50 +10:00
af06875e93 Rename m_territoryInstanceMap to m_territoryIdToInstanceGuidMap Biscuit Boy 2018-07-01 21:36:35 +10:00
7ee18f713f Rename m_territoryInstanceMap to m_territoryIdToInstanceGuidMap Biscuit Boy 2018-07-01 21:36:35 +10:00
569445632c change [GM] chat to isActingAsGm instead of directly checking Status Biscuit Boy 2018-07-01 21:33:37 +10:00
3daeffbb11 change [GM] chat to isActingAsGm instead of directly checking Status Biscuit Boy 2018-07-01 21:33:37 +10:00
4909791003 add isActingAsGm in Player Biscuit Boy 2018-07-01 21:31:49 +10:00
54be80a26b add isActingAsGm in Player Biscuit Boy 2018-07-01 21:31:49 +10:00
2b3de5f5e6 label now comes before getter in //gm teri Biscuit Boy 2018-07-01 21:31:26 +10:00
1172861d4d label now comes before getter in //gm teri Biscuit Boy 2018-07-01 21:31:26 +10:00
c3c3411565 Merge pull request #326 from NotAdam/develop Mordred 2018-06-30 08:35:45 +02:00
ff380bde32

Merge pull request #326 from NotAdam/develop Mordred 2018-06-30 08:35:45 +02:00
6846e16fda fix formatting NotAdam 2018-06-30 12:49:47 +10:00
65c9647591 fix formatting NotAdam 2018-06-30 12:49:47 +10:00
200232ceed inventory item creation cleanup NotAdam 2018-06-30 12:49:34 +10:00
37b1500a09 inventory item creation cleanup NotAdam 2018-06-30 12:49:34 +10:00
820f755f17 fix added items having incorrect data NotAdam 2018-06-30 12:45:41 +10:00
a2caccb2ee fix added items having incorrect data NotAdam 2018-06-30 12:45:41 +10:00
36ba7998de create larger stacks correctly, fix indent NotAdam 2018-06-30 11:53:45 +10:00
0bd352b50b create larger stacks correctly, fix indent NotAdam 2018-06-30 11:53:45 +10:00
6797e61657 Zone server actually works again Mordred 2018-06-28 23:42:12 +02:00
5a1830c59b Zone server actually works again Mordred 2018-06-28 23:42:12 +02:00
6d2b43e4c3 Merge pull request #325 from itsMaru/packet_work Mordred 2018-06-28 15:19:05 +02:00
1e89498d5f

Merge pull request #325 from itsMaru/packet_work Mordred 2018-06-28 15:19:05 +02:00
12ef194c7f no Maru 2018-06-27 23:53:01 -03:00
bfab1588e0 no Maru 2018-06-27 23:53:01 -03:00
65ea1ecac7 fix PacketContainer entrylist type; Maru 2018-06-27 23:48:18 -03:00
f3c71b0076 fix PacketContainer entrylist type; Maru 2018-06-27 23:48:18 -03:00
e9c9eaa53a Packet rework of server_zone Mordred 2018-06-28 00:07:07 +02:00
671576b861 Packet rework of server_zone Mordred 2018-06-28 00:07:07 +02:00
196433ae59 Merge pull request #294 from DantestyleXD/action_return Mordred 2018-06-26 07:56:29 +02:00
1564e8052e

Merge pull request #294 from DantestyleXD/action_return Mordred 2018-06-26 07:56:29 +02:00
333e1e99e0 Merge pull request #292 from DantestyleXD/ManSea002 Mordred 2018-06-26 07:55:44 +02:00
7c1cb5f3bc

Merge pull request #292 from DantestyleXD/ManSea002 Mordred 2018-06-26 07:55:44 +02:00
9f13a4dc91 Merge pull request #320 from DantestyleXD/ManFst003 Mordred 2018-06-26 07:54:55 +02:00