sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-23 18:17: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

e39258939b Orchestrion support amibu 2017-10-09 20:09:49 +02:00
2017fd7983 Orchestrion support amibu 2017-10-09 20:09:49 +02:00
f0b4797ad2 Merge pull request #127 from itsMaru/master Mordred 2017-10-09 17:45:32 +02:00
c67bc9ebba Merge pull request #127 from itsMaru/master Mordred 2017-10-09 17:45:32 +02:00
188a83790c Align codebase with req changes; Maru 2017-10-09 10:45:18 -03:00
9243ffd1b4 Align codebase with req changes; Maru 2017-10-09 10:45:18 -03:00
2781f86eef Merge pull request #125 from itsMaru/master Mordred 2017-10-09 15:18:57 +02:00
8bf4325fcc Merge pull request #125 from itsMaru/master Mordred 2017-10-09 15:18:57 +02:00
b21e4fe95a Merge pull request #126 from goaaats/master Mordred 2017-10-09 15:16:32 +02:00
ec5a6c65d5 Indentation amibu 2017-10-09 15:34:41 +02:00
6b306f9aee CmnDefInnBed fully implemented, dummy for Orchestrion amibu 2017-10-09 15:26:31 +02:00
9cc892a0f4 Merge pull request #126 from goaaats/master Mordred 2017-10-09 15:16:32 +02:00
2825af9dad Indentation amibu 2017-10-09 15:34:41 +02:00
ec8062d9ea CmnDefInnBed fully implemented, dummy for Orchestrion amibu 2017-10-09 15:26:31 +02:00
48309f33a9 Update Player.cpp Mordred 2017-10-09 14:13:23 +02:00
3adae605ca Update Player.cpp Mordred 2017-10-09 14:13:23 +02:00
41dbfaf7da No qualifiers in headers and const method Mordred 2017-10-09 14:12:56 +02:00
c4f30f64f2 No qualifiers in headers and const method Mordred 2017-10-09 14:12:56 +02:00
d22980d6be Retry travis build; Maru 2017-10-09 02:59:39 -03:00
87ff1774cf Retry travis build; Maru 2017-10-09 02:59:39 -03:00
27025eccb0 Final touches; Maru 2017-10-09 02:15:57 -03:00
c7784edfac Final touches; Maru 2017-10-09 02:15:57 -03:00
902cb69908 Handle title on player spawn; Maru 2017-10-09 02:06:31 -03:00
f97aa2d7d6 Handle title on player spawn; Maru 2017-10-09 02:06:31 -03:00
13ecfe9906 Player title SQL; Handle set player title; Maru 2017-10-09 01:56:47 -03:00
20daf4cdc2 Player title SQL; Handle set player title; Maru 2017-10-09 01:56:47 -03:00
0b2f5c8cd1 Title list SQL work; Clean-up; Maru 2017-10-09 00:31:31 -03:00
eb445fcdc3 Title list SQL work; Clean-up; Maru 2017-10-09 00:31:31 -03:00
d59194899c More titlelist stuff (broken for half of the titles); Maru 2017-10-08 20:26:56 -03:00
ffd85ff45f More titlelist stuff (broken for half of the titles); Maru 2017-10-08 20:26:56 -03:00
a6a35ab8e5 Please don't look Maru 2017-10-08 15:53:00 -03:00
3f611c47bb Please don't look Maru 2017-10-08 15:53:00 -03:00
309c4c7efa CmnDefInnBed, CmnDefCutSceneReplay amibu 2017-10-08 20:36:28 +02:00
3ae641b82d CmnDefInnBed, CmnDefCutSceneReplay amibu 2017-10-08 20:36:28 +02:00
83dc8c547e linux build fix Mordred 2017-10-07 23:23:45 +02:00
4660ff47a2 linux build fix Mordred 2017-10-07 23:23:45 +02:00
12a1ed422b Removed outdated queries from update.sql Mordred 2017-10-07 23:19:53 +02:00
4cd772d6e0 Removed outdated queries from update.sql Mordred 2017-10-07 23:19:53 +02:00
b6f90e9378 Updated DB structure Mordred 2017-10-07 23:17:28 +02:00
fc59592b70 Updated DB structure Mordred 2017-10-07 23:17:28 +02:00
4e0e79418d Rest server queries updated Mordred 2017-10-07 23:12:20 +02:00
cbd5a9d943 Rest server queries updated Mordred 2017-10-07 23:12:20 +02:00
5a92b0251c Updated a number of queries to use new system Mordred 2017-10-07 23:10:13 +02:00
7e2770a536 Updated a number of queries to use new system Mordred 2017-10-07 23:10:13 +02:00
964198dc90 Merge branch 'master' Maru 2017-10-06 20:40:51 -03:00
86ea81c32c Merge branch 'master' Maru 2017-10-06 20:40:51 -03:00
1c4392cc0a Basic title list handling; Maru 2017-10-06 20:40:27 -03:00
aaffc8e969 Basic title list handling; Maru 2017-10-06 20:40:27 -03:00
abee95112a Merge pull request #124 from goaaats/master Mordred 2017-10-06 14:56:05 +02:00
0a292c2813 Merge pull request #124 from goaaats/master Mordred 2017-10-06 14:56:05 +02:00
36a10bb841 Let's not break master amibu 2017-10-06 12:59:21 +02:00
37b94e2fd4 Let's not break master amibu 2017-10-06 12:59:21 +02:00
5bb4b8ba72 More fixes for bad sessions/incorrectly loaded players amibu 2017-10-06 12:54:03 +02:00
5feec7a5a7 More fixes for bad sessions/incorrectly loaded players amibu 2017-10-06 12:54:03 +02:00
93d2156549 Merge pull request #123 from goaaats/master Mordred 2017-10-06 10:09:22 +02:00
0f1bf80728 Merge pull request #123 from goaaats/master Mordred 2017-10-06 10:09:22 +02:00
b3c5820e35 Stuff I forgot amibu 2017-10-06 00:22:08 +02:00
3a6906cbc2 Stuff I forgot amibu 2017-10-06 00:22:08 +02:00
311a587bab Redoing everything amibu 2017-10-06 00:13:29 +02:00
a2522873d5 Redoing everything amibu 2017-10-06 00:13:29 +02:00
4a9eeb6eff updated submodules# Mordred 2017-10-05 22:44:14 +02:00
292cd2d412 updated submodules# Mordred 2017-10-05 22:44:14 +02:00
32605544bb converted more sql queries to new system Mordred 2017-10-05 22:43:15 +02:00
07ec135349 converted more sql queries to new system Mordred 2017-10-05 22:43:15 +02:00
20e36d1716 Enum in Common amibu 2017-10-05 20:40:52 +02:00
6a3d5a1510 Enum in Common amibu 2017-10-05 20:40:52 +02:00
5487a2e292 Add main handling for chara gear param state; amibu 2017-10-05 20:24:58 +02:00
d4fe294f51 Add main handling for chara gear param state; amibu 2017-10-05 20:24:58 +02:00
4fed5b76ba Merge pull request #121 from itsMaru/master Mordred 2017-10-05 08:13:23 +02:00
edd42c53da Merge pull request #121 from itsMaru/master Mordred 2017-10-05 08:13:23 +02:00
893e78d16b Bigger than expected; Maru 2017-10-04 23:30:45 -03:00
1f51b521e0 Bigger than expected; Maru 2017-10-04 23:30:45 -03:00
6dece1af8c Player title prototype; Maru 2017-10-04 23:19:38 -03:00
d08e43d564 Player title prototype; Maru 2017-10-04 23:19:38 -03:00
961390ab62 Fix issue with aggro when mob dies instantly from skill; Align cast interrupt packet with retail; Maru 2017-10-04 22:50:11 -03:00
d28c023456 Fix issue with aggro when mob dies instantly from skill; Align cast interrupt packet with retail; Maru 2017-10-04 22:50:11 -03:00
a4c19198d5 Fix crash when spamming cast action and cast interrupt (esc) while walking (null deref); Maru 2017-10-04 22:04:42 -03:00
989939cf51 Fix crash when spamming cast action and cast interrupt (esc) while walking (null deref); Maru 2017-10-04 22:04:42 -03:00
f701f6bd0a Fix wrong hPCurr/hPMax on PlayerSpawn; Maru 2017-10-04 21:16:10 -03:00
76e8a113cc Fix wrong hPCurr/hPMax on PlayerSpawn; Maru 2017-10-04 21:16:10 -03:00
3d3c6e6c85 Updated submodules Mordred 2017-10-04 23:29:41 +02:00
cee51bece1 Updated submodules Mordred 2017-10-04 23:29:41 +02:00
8cf1dcd1ee Player loading moved over to new DB system Mordred 2017-10-04 23:28:38 +02:00
8bbad4ea3b Player loading moved over to new DB system Mordred 2017-10-04 23:28:38 +02:00
1aeebebde7 Ugh Maru 2017-10-04 16:47:28 -03:00
9d52d10c6c Ugh Maru 2017-10-04 16:47:28 -03:00
c53fc16ead State in player spawn reflects actual player state; Maru 2017-10-04 16:13:11 -03:00
3328438b0e State in player spawn reflects actual player state; Maru 2017-10-04 16:13:11 -03:00
c324916808 Merge pull request #119 from goaaats/master Mordred 2017-10-04 13:21:11 +02:00
7abea43ed8 Merge pull request #119 from goaaats/master Mordred 2017-10-04 13:21:11 +02:00
843d80d928 Indentation amibu 2017-10-04 13:08:00 +02:00
13b1e42d5d Indentation amibu 2017-10-04 13:08:00 +02:00
9f691fe121 Aetheryte -> GM command amibu 2017-10-04 11:48:58 +02:00
bced310bbd Aetheryte -> GM command amibu 2017-10-04 11:48:58 +02:00
ac0a935885 Sql updates now happen on a timer per player instead of controlled by flags Mordred 2017-10-04 00:02:16 +02:00
7f44092a4d Sql updates now happen on a timer per player instead of controlled by flags Mordred 2017-10-04 00:02:16 +02:00
8cdb70cf31 Merged master to SQL_REWRITE_OWN Mordred 2017-10-03 23:03:58 +02:00
8d6bc11dfd Merged master to SQL_REWRITE_OWN Mordred 2017-10-03 23:03:58 +02:00
a4bb966a8c Startup banner extracted to own function Mordred 2017-10-03 12:09:51 +02:00
280bd3081b Startup banner extracted to own function Mordred 2017-10-03 12:09:51 +02:00