sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 19:17:45 +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

5e55de5b31 opcode collett 2020-02-24 20:40:46 +09:00
514a27b41f Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2 collett 2020-02-24 20:03:29 +09:00
8a559f8d53 Merge pull request #640 from collett8192/5.2_fix_part_4 Adam 2020-02-24 22:00:46 +11:00
2b5773a3ab

Merge pull request #640 from collett8192/5.2_fix_part_4 Adam 2020-02-24 22:00:46 +11:00
2f2d43b939 More fixes on action related enums. collett 2020-02-24 19:24:29 +09:00
420dac5d16 More fixes on action related enums. collett 2020-02-24 19:24:29 +09:00
c497dcdb3e StatusNoEffect also shifted and add proper comment for these. collett 2020-02-24 19:13:45 +09:00
ad45d41b8f Merge pull request #639 from collett8192/5.2_fix_part_3 Adam 2020-02-24 21:13:38 +11:00
05e6f868cc

Merge pull request #639 from collett8192/5.2_fix_part_3 Adam 2020-02-24 21:13:38 +11:00
ad759503b4 it's not gone u stupid collett 2020-02-24 19:05:25 +09:00
b3b5d917cb model equip collett 2020-02-24 18:56:39 +09:00
c8c29f0a3a model equip collett 2020-02-24 18:56:39 +09:00
38683a9fa2 model equip collett 2020-02-24 18:56:39 +09:00
af36a3e9b5 fix offset comment collett 2020-02-24 18:31:15 +09:00
50755efe87 fix offset comment collett 2020-02-24 18:31:15 +09:00
c22f524435 Inventory fix and more opcode update. collett 2020-02-24 18:23:43 +09:00
0d8b406a77 Inventory fix and more opcode update. collett 2020-02-24 18:23:43 +09:00
6dc03653cf Inventory fix. collett 2020-02-24 18:17:58 +09:00
28b2d1558c opcode update for newly created characters collett 2020-02-24 17:41:09 +09:00
25c961baa4 Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2 collett 2020-02-20 19:26:40 +09:00
450be5c171 Merge pull request #638 from collett8192/5.2_fix_part_2 Adam 2020-02-20 21:21:26 +11:00
7823230f61

Merge pull request #638 from collett8192/5.2_fix_part_2 Adam 2020-02-20 21:21:26 +11:00
243943eac9 Fix combo indicator and more opcode updates. collett 2020-02-20 18:31:05 +09:00
97a1a854dc Fix combo indicator and more opcode updates. collett 2020-02-20 18:31:05 +09:00
3e67a17dab Fix combo indicator and more opcode updates. collett 2020-02-20 18:31:05 +09:00
eec26b4dd1 Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2 collett 2020-02-20 17:04:57 +09:00
ab458f079c Merge pull request #637 from collett8192/update_5.2 Adam 2020-02-20 11:21:39 +11:00
008182ecba

Merge pull request #637 from collett8192/update_5.2 Adam 2020-02-20 11:21:39 +11:00
c7a61352ba chat opcode collett 2020-02-19 19:04:20 +09:00
848a451dfe chat opcode collett 2020-02-19 19:04:20 +09:00
0816ba2002 fix npcspawn collett 2020-02-19 18:56:48 +09:00
c6b2fdc5dd fix npcspawn collett 2020-02-19 18:56:48 +09:00
579188d830 fix npcspawn collett 2020-02-19 18:56:48 +09:00
0c4b9d564a more opcode collett 2020-02-19 18:39:43 +09:00
d8ae481ced more opcode picked up collett 2020-02-19 16:46:00 +09:00
e15212a502 more opcode picked up collett 2020-02-19 16:46:00 +09:00
39cc5af97b fix build collett 2020-02-19 16:51:31 +09:00
9095d5b4bb fix build collett 2020-02-19 16:51:31 +09:00
a3e5b66508 more opcode picked up collett 2020-02-19 16:46:00 +09:00
d7ae8ddaac Merge remote-tracking branch 'remotes/origin/develop' into develop_5.2 collett 2020-02-18 23:14:51 +09:00
c98594f6c5 5.2 packet update. collett 2020-02-18 23:05:24 +09:00
d80d4ba1bf 5.2 packet update. collett 2020-02-18 23:05:24 +09:00
d405e7677f more opcode update collett 2020-02-18 22:58:42 +09:00
e8ff03520f 5.2 login packet opcode update collett 2020-02-18 19:44:37 +09:00
d845162190 fix api routing, bit nicer code for fixing urls NotAdam 2020-02-17 15:57:44 +11:00
93e4ced601 fix api routing, bit nicer code for fixing urls v5.18 NotAdam 2020-02-17 15:57:44 +11:00
0306b68f88 fix an issue where some versions of std::fs would handle path generation differently this changes the builtin http server to generate more reliable paths when parsing request bodies, fixes #635 NotAdam 2020-02-17 15:45:27 +11:00
3373d771ac fix an issue where some versions of std::fs would handle path generation differently this changes the builtin http server to generate more reliable paths when parsing request bodies, fixes #635 NotAdam 2020-02-17 15:45:27 +11:00
2c34f0a58d Merge remote-tracking branch 'remotes/origin/develop' into develop_c collett 2020-02-15 17:29:55 +09:00
daaba2ea4d Merge pull request #634 from collett8192/mount_fix Adam 2020-02-13 08:22:25 +11:00
855d53ae93

Merge pull request #634 from collett8192/mount_fix Adam 2020-02-13 08:22:25 +11:00
6c916d1235 clear job gauge on spawn collett 2020-02-13 02:00:40 +09:00
1a186dba25 Missing casting flag clear after mount action. collett 2020-02-13 01:35:24 +09:00
5ba259a4e9 Missing casting flag clear after mount action. collett 2020-02-13 01:35:24 +09:00
d40fbbce1b Missing casting flag clear after mount action. collett 2020-02-13 01:35:24 +09:00
1ad37fadea Merge remote-tracking branch 'remotes/origin/master' into develop_c collett 2020-02-12 23:10:45 +09:00
5f18c43dd6 loads of datreader cleanup/consistency fixes NotAdam 2020-02-10 14:05:04 +11:00
399d9b0dcd loads of datreader cleanup/consistency fixes NotAdam 2020-02-10 14:05:04 +11:00
b7ddb054f4 make readme more lazy NotAdam 2020-02-10 13:42:22 +11:00
9b1e9b3aa7 make readme more lazy NotAdam 2020-02-10 13:42:22 +11:00
7ccc29a6ce fix a strange issue where some stl implementations would produce an invalid path where 2 or more / are present sequentially in a path NotAdam 2020-02-10 13:38:53 +11:00
8c3e037ebf fix a strange issue where some stl implementations would produce an invalid path where 2 or more / are present sequentially in a path NotAdam 2020-02-10 13:38:53 +11:00
1054ee6fcd clean up action code collett 2020-02-08 22:22:27 +09:00
0d8c99d2af haste does not affect recast collett 2020-02-08 19:14:50 +09:00
5a07e3059b Merge remote-tracking branch 'remotes/origin/develop' into develop_c collett 2020-02-08 19:04:05 +09:00
29afcfe487 Merge pull request #633 from collett8192/632 Adam 2020-02-08 10:32:30 +11:00
94cefbb658

Merge pull request #633 from collett8192/632 Adam 2020-02-08 10:32:30 +11:00
f7036ef1e3 fix faulty actions submodule NotAdam 2020-02-08 10:22:03 +11:00
1170674f8c fix faulty actions submodule NotAdam 2020-02-08 10:22:03 +11:00
ee12f4f75b create data directory NotAdam 2020-02-08 10:15:14 +11:00
698db748f9 create data directory NotAdam 2020-02-08 10:15:14 +11:00
abcba7aebd Merge branch 'feature/vs2019' into develop NotAdam 2020-02-08 09:58:30 +11:00
d9d8d93279 Merge branch 'feature/vs2019' into develop NotAdam 2020-02-08 09:58:30 +11:00
333650c3d5 Fix #632. collett 2020-02-08 00:43:49 +09:00
81bbcbef23 Fix #632. collett 2020-02-08 00:43:49 +09:00
5d5de5e451 fix aethernet escape collett 2020-02-08 00:41:58 +09:00
f3f38c4682 update sheltron data collett 2020-02-05 22:13:56 +09:00
ade2a21631 missing damage collett 2020-02-05 19:16:20 +09:00
9a9ce6d02e Implement dodge, block, parry. collett 2020-02-05 18:42:30 +09:00
0903f0d2f1 pld oath gauge collett 2020-02-05 17:21:57 +09:00
93479a9c75 more fixes collett 2020-02-04 22:09:19 +09:00
ffb1a83494 fix collett 2020-02-04 21:59:14 +09:00
5ff8965ed5 allow scripts to interrupt actions and bug fixes collett 2020-02-04 21:57:16 +09:00
deebcd76c3 inner release, inner chaos, chaotic cyclone collett 2020-02-04 20:58:40 +09:00
08a0556b36 require combo collett 2020-02-04 17:09:23 +09:00
e7c44ccff7 more war stuff collett 2020-02-02 22:44:22 +09:00
e75db49d37 fix collett 2020-02-02 19:51:13 +09:00
aaccb4bd6a clean up collett 2020-02-02 19:49:16 +09:00
450ff0ddff show job ui and some war stuff collett 2020-02-02 19:42:24 +09:00
39aa49f092 bit of cleanup and sqpack fix NotAdam 2020-02-02 17:14:59 +11:00
a84de09bf1 bit of cleanup and sqpack fix NotAdam 2020-02-02 17:14:59 +11:00
bbcf5a82eb Merge remote-tracking branch 'remotes/origin/develop' into develop_c collett 2020-01-26 19:35:08 +09:00
5b843c66dd add actions submodule NotAdam 2020-01-26 21:24:38 +11:00
65678715f4 add actions submodule NotAdam 2020-01-26 21:24:38 +11:00
0dbcda7229 fix typo NotAdam 2020-01-26 21:16:41 +11:00
127960cd12 fix typo NotAdam 2020-01-26 21:16:41 +11:00
3aafea9edf Merge pull request #631 from collett8192/mount Adam 2020-01-26 21:00:31 +11:00
36b79e6c03

Merge pull request #631 from collett8192/mount Adam 2020-01-26 21:00:31 +11:00
264f4bd459 fix derp collett 2020-01-24 08:08:51 +09:00
05f38dedde fix derp collett 2020-01-24 08:08:51 +09:00