sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-06-29 18:07: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

#976

#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

381339fe13 remove old boost shit from travis NotAdam 2018-12-20 23:59:13 +11:00
228af2d185 remove old boost shit from travis NotAdam 2018-12-20 23:59:13 +11:00
c979bc46b0 maybe fix travis, fix ci link in readme NotAdam 2018-12-20 23:57:01 +11:00
7dbbeea94c maybe fix travis, fix ci link in readme NotAdam 2018-12-20 23:57:01 +11:00
c0e093267d container count notes NotAdam 2018-12-20 23:38:39 +11:00
361c4a0b6a container count notes NotAdam 2018-12-20 23:38:39 +11:00
68db0d0e0c fix lambda type and remove testing code NotAdam 2018-12-20 21:54:03 +11:00
c54ceea607 fix lambda type and remove testing code NotAdam 2018-12-20 21:54:03 +11:00
a5ad3fb883 correctly send exterior placed items/storeroom inventories NotAdam 2018-12-20 21:52:18 +11:00
8da5ae47db correctly send exterior placed items/storeroom inventories NotAdam 2018-12-20 21:52:18 +11:00
332456ffd0 handle inventory packet sequencing properly for items & containers NotAdam 2018-12-20 20:41:16 +11:00
d6a6de6f77 handle inventory packet sequencing properly for items & containers NotAdam 2018-12-20 20:41:16 +11:00
54134594bd Merge remote-tracking branch 'origin/housing' into develop mordred 2018-12-19 11:10:45 +01:00
269fb27ec0 Merge remote-tracking branch 'origin/housing' into develop mordred 2018-12-19 11:10:45 +01:00
dbd6804d7d Merge pull request #455 from NotAdam/housing Mordred 2018-12-19 11:06:43 +01:00
86286f484c

Merge pull request #455 from NotAdam/housing Mordred 2018-12-19 11:06:43 +01:00
55497eafe1 Merge remote-tracking branch 'origin/develop' mordred 2018-12-19 10:32:30 +01:00
002850167b Merge remote-tracking branch 'origin/develop' mordred 2018-12-19 10:32:30 +01:00
72f2c41919 Merge remote-tracking branch 'origin/housing' into develop mordred 2018-12-19 10:31:48 +01:00
650bbd0603 Merge remote-tracking branch 'origin/housing' into develop mordred 2018-12-19 10:31:48 +01:00
6e4c190fda Merge pull request #454 from perize/housing Mordred 2018-12-19 10:29:00 +01:00
4a4fd2c0a5

Merge pull request #454 from perize/housing Mordred 2018-12-19 10:29:00 +01:00
73bce03040 Add missing --pass param Perize 2018-12-19 18:12:29 +09:00
a94076e9be Add missing --pass param Perize 2018-12-19 18:12:29 +09:00
d465875318 change getPlayerOwner to getOwnerId NotAdam 2018-12-19 16:03:35 +11:00
c00a15bacf change getPlayerOwner to getOwnerId NotAdam 2018-12-19 16:03:35 +11:00
321e42dbcc fix ps4transitionally.html sending accountid as string, not int NotAdam 2018-12-19 14:43:37 +11:00
0975c62374 fix ps4transitionally.html sending accountid as string, not int NotAdam 2018-12-19 14:43:37 +11:00
63ecd9a3c9 Merge pull request #453 from NotAdam/housing Mordred 2018-12-18 21:03:25 +01:00
8e4c42bcf9

Merge pull request #453 from NotAdam/housing Mordred 2018-12-18 21:03:25 +01:00
ab3c3a91cd fix this stupid inconsistency where its sometimes 2 u8s, sometimes u16s NotAdam 2018-12-19 01:03:41 +11:00
55e2290565 fix this stupid inconsistency where its sometimes 2 u8s, sometimes u16s NotAdam 2018-12-19 01:03:41 +11:00
ebda186553 minor cleanup and fix ward/landid being read incorrectly NotAdam 2018-12-19 00:54:25 +11:00
107c94f33c minor cleanup and fix ward/landid being read incorrectly NotAdam 2018-12-19 00:54:25 +11:00
3848fc60a6 Move inventory container sending to its own function NotAdam 2018-12-18 22:59:01 +11:00
f44c6b5efe Move inventory container sending to its own function NotAdam 2018-12-18 22:59:01 +11:00
cb117cd591 Ignore built tools NotAdam 2018-12-18 22:06:34 +11:00
3f6f0d5a5f Ignore built tools NotAdam 2018-12-18 22:06:34 +11:00
f71a09fb39 Ignore config folder contents except the default file NotAdam 2018-12-18 21:49:42 +11:00
5010de4aab Ignore config folder contents except the default file NotAdam 2018-12-18 21:49:42 +11:00
c4dd4b6b6b show better errors for exd/config related issues NotAdam 2018-12-18 21:40:44 +11:00
f48d546d85 show better errors for exd/config related issues NotAdam 2018-12-18 21:40:44 +11:00
d6deff3d2e Fixed binary build path for binaries under windows, changed the way entriesd in the framework are created to hopefully get better errorhandling in world Mordred 2018-12-16 14:26:38 +01:00
32a0d4725a Fixed binary build path for binaries under windows, changed the way entriesd in the framework are created to hopefully get better errorhandling in world Mordred 2018-12-16 14:26:38 +01:00
e7b3f4ae3f Ignore new binary too mordred 2018-12-14 13:41:20 +01:00
fc3b473a58 Ignore new binary too mordred 2018-12-14 13:41:20 +01:00
2d66cc5012 Merge pull request #452 from NotAdam/housing Mordred 2018-12-14 11:24:55 +01:00
3725eeda03

Merge pull request #452 from NotAdam/housing Mordred 2018-12-14 11:24:55 +01:00
064855c8d6 Ignore generated script files NotAdam 2018-12-14 19:49:51 +11:00
8721999ec6 Ignore generated script files NotAdam 2018-12-14 19:49:51 +11:00
4df42c718b size_t warning in gamepacketnew fixed mordred 2018-12-13 13:25:00 +01:00
54220bf4b0 size_t warning in gamepacketnew fixed mordred 2018-12-13 13:25:00 +01:00
241d066bf3 Only use precompiled headers under linux mordred 2018-12-13 13:01:41 +01:00
886b972f22 Only use precompiled headers under linux mordred 2018-12-13 13:01:41 +01:00
726c122bab Update .gitignore and sql_import.sh mordred 2018-12-13 12:47:59 +01:00
f1be739272 Update .gitignore and sql_import.sh mordred 2018-12-13 12:47:59 +01:00
ea64b65331 Restructured project slightly mordred 2018-12-13 12:40:42 +01:00
8dcbfa5365 Restructured project slightly mordred 2018-12-13 12:40:42 +01:00
1750159247 Actually run sapphire_dbm mordred 2018-12-13 10:18:51 +01:00
036bc5fc24 Actually run sapphire_dbm mordred 2018-12-13 10:18:51 +01:00
8b937414a4 Appveyor should ..hopefully... be fine now mordred 2018-12-12 14:56:37 +01:00
4899fe9629 Appveyor should ..hopefully... be fine now mordred 2018-12-12 14:56:37 +01:00
a89def6f4a What about a release windows build? mordred 2018-12-12 14:18:27 +01:00
74c31f3f11 What about a release windows build? mordred 2018-12-12 14:18:27 +01:00
ecb486e7c7 use mysqlclient for statically linking in windows mordred 2018-12-12 14:04:04 +01:00
3e7e716841 use mysqlclient for statically linking in windows mordred 2018-12-12 14:04:04 +01:00
762d7a941d Skip input on liquidate mordred 2018-12-12 12:36:06 +01:00
1123c097bb Skip input on liquidate mordred 2018-12-12 12:36:06 +01:00
18ae25521c Allow force mode in dbm mordred 2018-12-12 12:23:56 +01:00
e69d112d5f Allow force mode in dbm mordred 2018-12-12 12:23:56 +01:00
90831ea089 Use sapphire_dbm to initialize the db mordred 2018-12-12 12:07:26 +01:00
4a920de104 Use sapphire_dbm to initialize the db mordred 2018-12-12 12:07:26 +01:00
2f03d9e656 Revert "fix appveyor project id in readme" Adam 2018-12-12 18:09:50 +11:00
9b865d6a3a Revert "fix appveyor project id in readme" Adam 2018-12-12 18:09:50 +11:00
ee28be4601 Merge pull request #451 from goaaats/issue_template Mordred 2018-12-12 08:09:58 +01:00
ee89ca5526

Merge pull request #451 from goaaats/issue_template Mordred 2018-12-12 08:09:58 +01:00
ca0db7c584 fix appveyor project id in readme Adam 2018-12-12 18:09:50 +11:00
b38541b0e4

fix appveyor project id in readme Adam 2018-12-12 18:09:50 +11:00
bd18cffdda Updated travis link in readme Mordred 2018-12-12 08:02:58 +01:00
2ba75fec20

Updated travis link in readme Mordred 2018-12-12 08:02:58 +01:00
bfacc85e96 Replaced build flags with proper defines Mordred 2018-12-11 23:40:47 +01:00
a3b45ec329 Replaced build flags with proper defines Mordred 2018-12-11 23:40:47 +01:00
2545c123f4 Punctuation goaaats 2018-12-11 00:21:51 +01:00
3605c18dc1 Punctuation goaaats 2018-12-11 00:21:51 +01:00
cf476e9e60 Add issue template, .github folder goaaats 2018-12-11 00:18:08 +01:00
d9c0ad8988 Add issue template, .github folder goaaats 2018-12-11 00:18:08 +01:00
b37262e374 dbm -> Initialize functional; Liquidate initial work done Mordred 2018-12-11 00:04:29 +01:00
10274e3064 dbm -> Initialize functional; Liquidate initial work done Mordred 2018-12-11 00:04:29 +01:00
de77e94e56 More dbm... Mordred 2018-12-08 01:11:46 +01:00
43892f7add More dbm... Mordred 2018-12-08 01:11:46 +01:00
c58edb540d Merge pull request #449 from NotAdam/housing Mordred 2018-12-07 23:36:42 +01:00
fc56a48731

Merge pull request #449 from NotAdam/housing Mordred 2018-12-07 23:36:42 +01:00
9e412306b6 new and improved™️ naming convention has been rejected NotAdam 2018-12-07 23:38:45 +11:00
50c262d11b new and improved™️ naming convention has been rejected NotAdam 2018-12-07 23:38:45 +11:00
3f372d3aa1 LandIdent now uses signed ints, rename housing clienttriggers, fix formatting NotAdam 2018-12-07 23:34:45 +11:00
6af13f39a3 LandIdent now uses signed ints, rename housing clienttriggers, fix formatting NotAdam 2018-12-07 23:34:45 +11:00
86fb678b0c Fix issue where housing eobj wouldn't spawn on land build - #448 NotAdam 2018-12-07 20:36:52 +11:00
6ca213f437 Fix issue where housing eobj wouldn't spawn on land build - #448 NotAdam 2018-12-07 20:36:52 +11:00
795c8280d5 fix db schema so characters get created correctly NotAdam 2018-12-07 20:12:20 +11:00
f0055d2f63 fix db schema so characters get created correctly NotAdam 2018-12-07 20:12:20 +11:00