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

• 0d6a0719de fix quest battles which are using InstanceContent instead of QuestBattle. collett 2023-01-21 07:09:00 +09:00
• 616b12c695 Fix OutsideRange event. collett 2022-02-17 04:53:19 +09:00
• abb295d4fe parse Event and PopRange into entries too Mordred 2022-02-26 10:50:10 +01:00
• 3b139571eb Fixed types in lgb.h and lgbtypes.h Mordred 2022-02-26 10:36:03 +01:00
• 459fa4865b fix merge error collett 2022-02-26 20:22:30 +09:00
• ec7195639e Removed unused cell logic Mordred 2022-02-22 23:47:11 +01:00
• a9a628fe47 Updated EventHandlerTypes Mordred 2022-02-18 00:03:04 +01:00
• ba1b8aadfb Added layerset parsing Mordred 2022-02-11 10:32:13 +01:00
• a56eec5d32 Fallback to entranceRect if no entrance circle is found in instance Mordred 2022-01-30 22:32:03 +01:00
• a84d0f4154 Map previously unmapped eobj and enpc Mordred 2022-02-26 19:45:19 +09:00
• 451f059bb7 have watchdog remove the lock file when finished loading the module should be fixed fr fr this time ong Tahir 2023-02-04 21:47:41 +00:00
• 7f48101dcd removed merge errors Mordred 2023-02-04 22:42:11 +01:00
• d2d451e670 fix typo in scripts cmake Tahir 2023-02-04 20:51:21 +00:00
• 4aac8d87c2
  Merge pull request #863 from hkAlice/3.3 Mordred 2023-02-04 21:46:03 +01:00
• cb1408264c
  Merge pull request #862 from T00fy/subwil015 Mordred 2023-02-04 21:45:52 +01:00
• d52fac9e35
  Merge pull request #861 from takhlaq/ThreePointThree Mordred 2023-02-04 21:45:28 +01:00
• 835ba3889e attempt to fix ci for scripts cmake Tahir 2023-02-04 20:33:11 +00:00
• 29f8a8673a add wiki to readme; update readme; Alice Ogeda 2023-02-04 17:13:35 -03:00
• f9b5e0e874 more watchdog shenanigans Tahir 2023-02-04 20:10:14 +00:00
• 05b88a3038 Finish subwil015 quest Toofy 2023-02-04 19:37:33 +00:00
• 5fd4ebab0e wip Toofy 2023-02-04 13:19:51 +00:00
• 6f457a4e7e scripts: write a temp file when building modules so watchdog waits Tahir 2023-02-04 19:24:43 +00:00
• e5fd01baaf fix build cause extra slash in scripts cmake Tahir 2023-02-04 18:42:38 +00:00
• bd8c620e73 scripts: build modules to tmp directory before copying over to reload Tahir 2023-02-04 17:50:44 +00:00
• 587844f9fd Update CONTRIBUTING.md Mordred 2018-08-30 13:32:12 +02:00
• 11660773c2 Removed extra qualifier Mordred 2018-01-30 14:47:27 +01:00
• d10cb2e3e3 Fixed a merge error. Mordred 2023-02-04 15:13:42 +01:00
• b82ba38bc2 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire into HEAD Mordred 2023-02-04 15:03:20 +01:00
• bd5fe6f699 Another approach at event improvements Mordred 2018-01-09 23:50:54 +01:00
• 7720bb6d68 Contributing.md Maru 2017-11-02 18:07:49 -02:00
• 6c209ccaff Merge remote-tracking branch 'origin/ThreePointThree' Mordred 2023-02-04 14:53:15 +01:00
• 6669300124 Changed information in readme in merged develop into master Mordred 2023-02-04 14:25:46 +01:00
• 8afaa0a42d Merge remote-tracking branch 'origin/develop' Mordred 2023-02-04 14:24:31 +01:00
• fe26d3ba84
  Merge pull request #860 from T00fy/levelfix ThreePointThree Adam 2023-02-05 00:13:18 +11:00
• 38665cb4a8 Fixing bug where player info is not updated on level up Toofy 2023-02-04 12:43:14 +00:00
• d5c784f325
  Merge pull request #858 from Skyliegirl33/ThreePointThree Adam 2023-02-04 12:23:57 +11:00
• 5fa64e96e4
  Merge pull request #859 from T00fy/sql_fix Adam 2023-02-04 12:23:31 +11:00
• d9192a655e Fixing error Table 'sapphire.freecompany' doesn't exist Toofy 2023-02-03 22:57:29 +00:00
• dbbc45d924 Fix FindContent struct Lucy 2023-02-03 23:37:44 +01:00
• 9de70852cc Fix gil shops(?) Lucy 2023-02-02 02:52:42 +01:00
• 47e6fe8562 More preparation work for free companies. Mordred 2023-02-03 22:52:52 +01:00
• 1406549ced
  Merge pull request #857 from takhlaq/ThreePointThree Mordred 2023-02-03 14:42:07 +01:00
• c7b1a2f29b db: remove extraneous comma from fc prepared statement - log the failing query Tahir 2023-02-03 13:38:44 +00:00
• 83e7502b8b fix issue with instance content map Mordred 2023-02-03 14:36:08 +01:00
• f65fb8fba1 fix sql statement Mordred 2023-02-03 14:23:39 +01:00
• 748a557156 Use std::array instead of plain pointers Mordred 2023-02-03 08:43:16 +01:00
• 4bb35c8bb8 Basic db statements for main fc table Mordred 2023-02-02 22:46:37 +01:00
• a4a2423b84 changed list fields to binary, reduced fields overall Mordred 2023-02-02 22:32:59 +01:00
• b6ce7f5177 added more db tables in regards of fcs Mordred 2023-02-02 13:04:49 +01:00
• 68a5040fb9 Class and db table for basic FC representation Mordred 2023-02-02 10:57:49 +01:00
• 0929726ea5
  Merge pull request #856 from hkAlice/3.3 Mordred 2023-02-02 06:48:36 +01:00
• 9655b4a0dd remove unnecessary imports; Alice Ogeda 2023-02-02 02:39:34 -03:00
• 0f995cd934 chatchannel fetch by player id; general cleanup; Alice Ogeda 2023-02-02 02:30:31 -03:00
• 00d62fbc6c Major rework of yield events. Mordred 2023-02-01 13:34:21 +01:00
• 9491b549a1 Some more work on FC related packets and custom scripts. Mordred 2023-01-30 13:11:05 +01:00
• 9da58c61aa added parser for custom talk Mordred 2023-01-30 11:58:02 +01:00
• ee942b36b7 Added FC related packet structs Mordred 2023-01-29 21:57:57 +01:00
• a1b3c3acf6 Removal/Replacement of old packet opcodes and structs Mordred 2023-01-29 21:31:55 +01:00
• ebcce49448 Forgot to remove a debug print Mordred 2023-01-29 21:09:09 +01:00
• 320ed48c33
  Merge pull request #855 from Skyliegirl33/ThreePointThree Mordred 2023-01-29 12:36:54 +01:00
• 96b61dc3ed
  Merge pull request #854 from hkAlice/3.3 Mordred 2023-01-29 12:36:03 +01:00
• f303cb3ebc Fixing placement and storage of yard items Mordred 2023-01-29 12:35:43 +01:00
• 5839d12980 Placing of yard and interior items works... until you rezone... Mordred 2023-01-28 23:27:36 +01:00
• e036a69cf9 Make sure modifiers exist before deserializing Lucy 2023-01-28 21:13:29 +01:00
• 419012f6e5 Merge branch 'ThreePointThree' of https://github.com/SapphireServer/Sapphire into ThreePointThree Lucy 2023-01-28 20:03:21 +01:00
• 5b225de6f7 Map out modifiers for lut and handle deserializing Lucy 2023-01-28 00:07:06 +01:00
• 233bef1886 Fixed large house zoning Mordred 2023-01-28 17:44:01 +01:00
• f3e8ecee15 you can now relinquish the land directly after removing the house without relogging Mordred 2023-01-28 17:43:46 +01:00
• 78b66b9c92 Use proper exit position for house. Mordred 2023-01-28 17:26:48 +01:00
• 95897dffc2 Add more client side opcodes, new characters can progress past opening now. Maple 2023-01-27 20:55:25 -03:00
• 3c4b55859f achievement code cleanup; Alice Ogeda 2023-01-27 18:54:54 -03:00
• 2c5c403172 Add partial client opcodes for 6.31, client can login Maple 2023-01-27 18:47:24 -03:00
• 01b262edc1 Entrances are being placed based on placard position Mordred 2023-01-27 22:33:16 +01:00
• 102aeb7692
  Merge pull request #853 from Skyliegirl33/ThreePointThree Mordred 2023-01-27 22:01:07 +01:00
• 637c786ebc Fix action parser formatting Lucy 2023-01-27 21:52:14 +01:00
• fe82d50288 Merge branch 'ThreePointThree' of https://github.com/SapphireServer/Sapphire into ThreePointThree Lucy 2023-01-27 21:32:22 +01:00
• f3627a9566 Convert action lut to JSON Lucy 2023-01-27 05:23:13 +01:00
• 6cde08d073 Cleanup inside the player class. Mordred 2023-01-27 11:13:57 +01:00
• 7dfbe76436 Update server opcodes to 6.31 (Thanks Flawed!) Maple 2023-01-27 00:33:31 -03:00
• 206b98e1df Actually update exd to 6.31 Maple 2023-01-26 23:59:41 -03:00
• cc0a7aa70a WiP Fixed exiting house Mordred 2023-01-26 22:39:50 +01:00
• 1af0b33807 WiP fixed code redundancy Mordred 2023-01-26 22:04:23 +01:00
• 32d9fdb818 WiP fixed code redundancy Mordred 2023-01-26 15:33:53 +01:00
• 47f449f4e1 WiP check permissions before removing the estate hall. Mordred 2023-01-26 15:30:57 +01:00
• 6ef3c0b071 WiP Added house removal, taken from collets commit. Mordred 2023-01-26 14:46:39 +01:00
• 3c6fccbad0
  Merge pull request #852 from collett8192/patch develop5.58 Mordred 2023-01-26 14:45:48 +01:00
• 1e7176b3d8 minor fix collett 2023-01-26 22:30:42 +09:00
• 3624b4374f Handle house removing. Also restored the house building scene, might still crash sound device though. collett 2023-01-26 20:06:27 +09:00
• f13bae27f7 Minor player fixes Maple 2023-01-26 07:11:56 -03:00
• 79f58a36aa Add missing OnlineStatus.exd to CommonGen.h Maple 2023-01-26 07:11:41 -03:00
• 81bbe690a8 Fix Oodle on Linux (todo:: make this not suck) Maple 2023-01-26 07:10:45 -03:00
• a280f9c3b8 WiP Fix house inventory not working Mordred 2023-01-26 10:15:36 +01:00
• 5b63cfb023 Re-add CountdownCancel opcode Maple 2023-01-26 04:45:38 -03:00
• 8220d90ed6 Update CommonGen.h for Patch 6.31 Maple 2023-01-26 04:42:45 -03:00
• a2bdb4e347 Update Network definitions to 6.30hf1 (Thanks Moydow, Reyli, Guaiguaijun) Maple 2023-01-26 04:25:51 -03:00
• 432cdc0de8 added a short form oodle2net.h Moydow 2022-06-14 04:28:42 +01:00
• 064851ff2e don't need SetWindow here Moydow 2022-06-12 23:54:24 +01:00
• 7449d16c7e Oodle support for 6.15 Moydow 2022-06-12 21:44:11 +01:00
• 6389597004 Update Loby encryption key Maple 2023-01-26 03:32:22 -03:00
• 9e3d2127cb Update Player array Maple 2023-01-26 03:21:17 -03:00