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

#1

#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

#135

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#153

#154

#155

#156

#157

#158

#158

#159

#16

#16

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#173

#174

#175

#176

#177

#179

#18

#184

#185

#186

#187

#188

#189

#19

#190

#191

#191

#193

#193

#194

#195

#196

#196

#197

#198

#199

#2

#200

#201

#202

#203

#204

#206

#207

#208

#209

#209

#21

#211

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#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

#263

#264

#265

#266

#267

#267

#268

#269

#269

#27

#270

#271

#272

#273

#274

#275

#276

#278

#279

#279

#28

#280

#281

#282

#283

#285

#286

#287

#288

#289

#29

#29

#290

#290

#291

#292

#293

#294

#295

#295

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#316

#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

#362

#363

#364

#365

#366

#367

#368

#369

#370

#371

#372

#373

#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

#4

#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

#49

#499

#5

#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

#6

#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

#7

#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

#79

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#8

#8

#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

#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

#9

#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

#960

#961

#962

#963

#964

#965

#967

#969

#97

#970

#971

#972

#973

#974

#974

#975

#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

Mono Color

• 20f854b36f Move quest finish packet to where it belongs to so we can abandon quests. collett 2020-01-05 05:14:38 +09:00
• 7f4184bfbc Move quest finish packet to where it belongs to so we can abandon quests. collett 2020-01-05 05:14:38 +09:00
• df9fb7ebf4 Better fix for abandon quest. collett 2020-01-05 05:14:38 +09:00
• 7545ad0934 Some status fixes. collett 2020-01-05 04:44:41 +09:00
• 84a868aae8 More aoe stuff. collett 2020-01-05 01:04:30 +09:00
• 03df9ab4d5 some aoe fixes collett 2020-01-04 21:12:54 +09:00
• 64f8be4512 vs2019 really wants to add that space. collett 2020-01-04 19:56:21 +09:00
• 4623ed535a Interrupt casting if target died and casting queue. collett 2020-01-04 19:47:34 +09:00
• 0cd7bd7f49 Merge remote-tracking branch 'remotes/origin/develop' into develop_c collett 2020-01-03 23:26:25 +09:00
• 28d3029abe Merge pull request #616 from collett8192/event_battle Adam 2020-01-04 01:20:56 +11:00
• 6df0dcffe9
  Merge pull request #616 from collett8192/event_battle Adam 2020-01-04 01:20:56 +11:00
• 6949c5f4b8 Merge pull request #615 from collett8192/aetheryte Adam 2020-01-04 01:20:50 +11:00
• 633004bf69
  Merge pull request #615 from collett8192/aetheryte Adam 2020-01-04 01:20:50 +11:00
• 352a0ac823 Fix event battle. collett 2020-01-03 22:47:01 +09:00
• 45f6f9fa7c Fix event battle. collett 2020-01-03 22:47:01 +09:00
• badfb2f0a9 Fix aetheryte. collett 2020-01-03 22:31:55 +09:00
• 2308a41a63 Fix aetheryte. collett 2020-01-03 22:31:55 +09:00
• 8790e71ff1 Clean up. collett 2020-01-03 22:36:49 +09:00
• 8313abf30a Fix aetheryte. collett 2020-01-03 22:31:55 +09:00
• 9b4142f94f Update gm command opcode. collett 2020-01-03 17:58:13 +09:00
• 7385d2291c Fix copy paste derp. collett 2020-01-03 17:37:21 +09:00
• d1b8fd019e Merge remote-tracking branch 'remotes/origin/develop' into develop_c collett 2020-01-03 17:33:53 +09:00
• ca2370910c Merge pull request #614 from karashiiro/develop Adam 2020-01-03 13:47:08 +11:00
• cfa515f1c9
  Merge pull request #614 from karashiiro/develop Adam 2020-01-03 13:47:08 +11:00
• 61ac094b2b merge duplicate keys karashiiro 2020-01-02 18:38:53 -08:00
• 924c1338d2 merge duplicate keys karashiiro 2020-01-02 18:38:53 -08:00
• a4440351b9 Merge branch 'develop' of https://github.com/karashiiro/Sapphire into develop karashiiro 2020-01-02 16:15:53 -08:00
• 913591ec23 Merge branch 'develop' of https://github.com/karashiiro/Sapphire into develop karashiiro 2020-01-02 16:15:53 -08:00
• bca39ac17a CFNotifyPop and CFPreferredRole karashiiro 2020-01-02 16:15:05 -08:00
• 4a31abc020 CFNotifyPop and CFPreferredRole karashiiro 2020-01-02 16:15:05 -08:00
• e438a75168 Merge pull request #613 from collett8192/social_list_fix Adam 2020-01-03 11:14:23 +11:00
• 78fb4d5576
  Merge pull request #613 from collett8192/social_list_fix Adam 2020-01-03 11:14:23 +11:00
• 0f9f6c61d3 Merge pull request #612 from collett8192/add_item_dupe_fix Adam 2020-01-03 11:13:39 +11:00
• fa7ddf5b6b
  Merge pull request #612 from collett8192/add_item_dupe_fix Adam 2020-01-03 11:13:39 +11:00
• e19513ae4d Merge pull request #1 from SapphireServer/develop karashiiro 2020-01-02 16:09:30 -08:00
• e94bf44e6a
  Merge pull request #1 from SapphireServer/develop karashiiro 2020-01-02 16:09:30 -08:00
• 22edf9b155 Abandon quest. collett 2020-01-03 05:53:36 +09:00
• bd1b23c834 Fix social list. collett 2020-01-03 05:07:55 +09:00
• 51046f9da0 Fix social list. collett 2020-01-03 05:07:55 +09:00
• 44fb2c9db3 Next quest. collett 2020-01-03 05:23:12 +09:00
• f58bb4f72b Fix social list. collett 2020-01-03 05:07:55 +09:00
• edaa400202 Oops. collett 2020-01-03 04:08:22 +09:00
• 2bf1e3767a Play the sound effect when buying items from shop. When selling the sound effect is also played (and shop switch to buy back tab as well) but the selling logic code is not there so... collett 2020-01-03 04:06:25 +09:00
• 39a711dab5 Play the sound effect when you get an item. collett 2020-01-03 04:04:30 +09:00
• 7da25b33ef Merge branch 'add_item_dupe_fix' into develop_c collett 2020-01-03 01:32:04 +09:00
• e8ebabe025 Fix item being added more than once when there is already a stack of the same item. collett 2020-01-03 01:07:42 +09:00
• cd0f7fbd2b Fix item being added more than once when there is already a stack of the same item. collett 2020-01-03 01:07:42 +09:00
• 148243c402 Try to implement a quest. collett 2020-01-03 01:11:19 +09:00
• 1c89e16c27 Fix quest reward choice. Quest scripts need to call player.giveQuestRewards( getId(), result.param3 ) for it to work. collett 2020-01-03 01:10:42 +09:00
• 81d5929e08 Fix item dupe. collett 2020-01-03 01:07:42 +09:00
• 71bd6ef133 Merge remote-tracking branch 'remotes/origin/develop' into develop_c collett 2020-01-02 21:09:30 +09:00
• dee59aead1 Try to implement MP restoring actions. MPP values in lut entries are input manually. collett 2020-01-02 20:58:50 +09:00
• 482745624c Clear last combo action id if the combo breaks. collett 2020-01-02 19:51:19 +09:00
• 885746c860 Merge pull request #611 from collett8192/actionlut_fix Adam 2020-01-02 20:59:09 +11:00
• 18078e928e
  Merge pull request #611 from collett8192/actionlut_fix Adam 2020-01-02 20:59:09 +11:00
• 1ff69bcce0 Fix non-existing lut entry being executed. collett 2020-01-02 01:52:20 +09:00
• 6fb6ccbda5 Fix non-existing lut entry being executed. collett 2020-01-02 01:52:20 +09:00
• 28a88e5a96 Merge remote-tracking branch 'remotes/origin/develop' into develop_c collett 2020-01-02 17:37:40 +09:00
• 86a2f18f25 Merge pull request #610 from NotAdam/develop Adam 2020-01-02 15:24:18 +11:00
• ff606f7378
  Merge pull request #610 from NotAdam/develop Adam 2020-01-02 15:24:18 +11:00
• 7deae36146 more 5.18 opcodes NotAdam 2020-01-02 15:10:04 +11:00
• 9c6e431cf6 more 5.18 opcodes NotAdam 2020-01-02 15:10:04 +11:00
• 0d3e73e531 fix eventplay opcodes/names NotAdam 2020-01-02 14:42:58 +11:00
• acacfc5553 fix eventplay opcodes/names NotAdam 2020-01-02 14:42:58 +11:00
• ba74f988d6 fix build error NotAdam 2020-01-02 14:22:36 +11:00
• 371382dc0a fix build error NotAdam 2020-01-02 14:22:36 +11:00
• fa10458bce Merge pull request #609 from collett8192/opcode_update Adam 2020-01-02 14:21:48 +11:00
• 4951c323b0
  Merge pull request #609 from collett8192/opcode_update Adam 2020-01-02 14:21:48 +11:00
• 6af408a24d Merge branch 'develop' into opcode_update Adam 2020-01-02 14:21:39 +11:00
• f5bf06ed00
  Merge branch 'develop' into opcode_update Adam 2020-01-02 14:21:39 +11:00
• dc67ea56cb Merge pull request #608 from Kirrilius/develop Adam 2020-01-02 13:24:26 +11:00
• 4b61b0b712
  Merge pull request #608 from Kirrilius/develop Adam 2020-01-02 13:24:26 +11:00
• 56296d295a Attempt to fix combo actions. collett 2020-01-02 08:07:33 +09:00
• f6bff46c9a Aggro the player when hostile action is used. collett 2020-01-02 02:46:00 +09:00
• f07ac7f6e5 More 5.18 opcode. collett 2020-01-02 02:45:19 +09:00
• 12fd17e09c Really fix sprint (and other scripted actions as well). collett 2020-01-02 01:52:20 +09:00
• b93dbbbaca Update 5.18 opcodes and packets. collett 2020-01-01 22:05:49 +09:00
• 5a4665af45 Update 5.18 opcodes and packets. collett 2020-01-01 22:05:49 +09:00
• 9b25a84c26 Fix sprint for now. collett 2020-01-01 23:12:31 +09:00
• cab6612285 Fix navmesh memory leak. collett 2020-01-01 22:08:17 +09:00
• 9723977c47 Fix event battle. collett 2020-01-01 22:07:43 +09:00
• b4dc049ae1 Update 5.18 opcodes and packets. collett 2020-01-01 22:05:49 +09:00
• a6ba1848a6 fix warnings: kbasikhin 2019-12-30 14:00:51 +03:00
• 80e72d316e fix warnings: kbasikhin 2019-12-30 14:00:51 +03:00
• a98a7eccc8 comparing floating point with "==" or "!=" is not correct (Chara.cpp) kbasikhin 2019-12-30 13:59:57 +03:00
• 2f129bbe30 comparing floating point with "==" or "!=" is not correct (Chara.cpp) kbasikhin 2019-12-30 13:59:57 +03:00
• 4c4fff58ce using static and reinterpret casts instead of old style casts kbasikhin 2019-12-26 11:09:15 +03:00
• 4186df6b40 using static and reinterpret casts instead of old style casts kbasikhin 2019-12-26 11:09:15 +03:00
• 23a12d4066 fix warnings: - using static casts - comparing floating point with "==" or "!=" is not correct (Chara.cpp) kbasikhin 2019-12-25 17:48:16 +03:00
• bf757cbf03 fix warnings: - using static casts - comparing floating point with "==" or "!=" is not correct (Chara.cpp) kbasikhin 2019-12-25 17:45:51 +03:00
• 03f89dfbee Identify elementalLevel and element in PlayerSpawn packet karashiiro 2019-12-21 16:17:46 -08:00
• b79d6d075d Identify elementalLevel and element in PlayerSpawn packet karashiiro 2019-12-21 16:17:46 -08:00
• 537d6e6ff0 Merge pull request #605 from karashiiro/develop Adam 2019-11-25 14:25:35 +11:00
• 51d29df7ac
  Merge pull request #605 from karashiiro/develop v5.11 Adam 2019-11-25 14:25:35 +11:00
• 1e43528740 Merge branch 'develop' of https://github.com/karashiiro/Sapphire into develop karashiiro 2019-11-24 19:06:30 -08:00
• 3ebaf8bd5f Merge branch 'develop' of https://github.com/karashiiro/Sapphire into develop karashiiro 2019-11-24 19:06:30 -08:00
• 44a542d603 CharaNameReq opcode update karashiiro 2019-11-24 19:05:27 -08:00
• 5872579cf6 CharaNameReq opcode update karashiiro 2019-11-24 19:05:27 -08:00
• bb4d210646 Merge pull request #604 from Caraxi/patch-2 Adam 2019-11-24 13:02:07 +11:00
• 7e0f836095
  Merge pull request #604 from Caraxi/patch-2 Adam 2019-11-24 13:02:07 +11:00