sapphire

mirrors/sapphire

Fork 0

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

703049e14f refactor getInventory -> getItemContainer NotAdam 2018-12-07 20:11:59 +11:00
7d712aa42e refactor getInventory -> getItemContainer NotAdam 2018-12-07 20:11:59 +11:00
60e372b232 adjust size type in itemcontainer to accommodate larger inventories NotAdam 2018-12-05 21:29:33 +11:00
4b8783aeca adjust size type in itemcontainer to accommodate larger inventories NotAdam 2018-12-05 21:29:33 +11:00
b49b5ab15a handle internal/external housing storeroom inventory requests NotAdam 2018-12-05 19:58:43 +11:00
899b4aead3 handle internal/external housing storeroom inventory requests NotAdam 2018-12-05 19:58:43 +11:00
60f5fd580e cleanup housing ClientTrigger handling NotAdam 2018-12-05 16:55:14 +11:00
c1b3e5d393 cleanup housing ClientTrigger handling NotAdam 2018-12-05 16:55:14 +11:00
23226f0e44 Fixed small event issues. Changed sapphire to use new DB setup. Database has to be created using the schema.sql and inserts.sql Mordred 2018-12-07 00:06:59 +01:00
66c3aba1f6 Fixed small event issues. Changed sapphire to use new DB setup. Database has to be created using the schema.sql and inserts.sql Mordred 2018-12-07 00:06:59 +01:00
338032b700 Merge pull request #447 from NotAdam/housing Mordred 2018-12-04 19:31:09 +01:00
b0f265bd9f

Merge pull request #447 from NotAdam/housing Mordred 2018-12-04 19:31:09 +01:00
60e643dd0e housing item containers and some minor cleanup/refactoring NotAdam 2018-12-04 23:00:49 +11:00
ef7a448ebc housing item containers and some minor cleanup/refactoring NotAdam 2018-12-04 23:00:49 +11:00
cee0ca87b4 fix shops only charging you the cost of 1 item even if you buy multiple NotAdam 2018-12-04 22:27:54 +11:00
e2b7012f3d fix shops only charging you the cost of 1 item even if you buy multiple NotAdam 2018-12-04 22:27:54 +11:00
ed3ada4020 show house greetings on ward selection ui NotAdam 2018-12-04 22:20:41 +11:00
1905e0af2b show house greetings on ward selection ui NotAdam 2018-12-04 22:20:41 +11:00
2c89d7923d housing containers NotAdam 2018-12-04 21:47:27 +11:00
ea42e1ceba housing containers NotAdam 2018-12-04 21:47:27 +11:00
23b5d4ce21 Merge pull request #446 from NotAdam/housing Mordred 2018-12-02 18:27:50 +01:00
cd1a1feccd

Merge pull request #446 from NotAdam/housing Mordred 2018-12-02 18:27:50 +01:00
0b137d740f make the client marketboard ipc names clearer NotAdam 2018-12-03 00:23:07 +11:00
96c38f09df make the client marketboard ipc names clearer NotAdam 2018-12-03 00:23:07 +11:00
c30ce5deb1 market board item history packet NotAdam 2018-12-03 00:11:26 +11:00
f6f01a9ab8 market board item history packet NotAdam 2018-12-03 00:11:26 +11:00
b3810069d0 marketboard packets NotAdam 2018-12-02 23:40:18 +11:00
f61c6dd5e9 marketboard packets NotAdam 2018-12-02 23:40:18 +11:00
48c0f96ce6 some marketboard shit NotAdam 2018-12-02 23:26:21 +11:00
b89a21120a some marketboard shit NotAdam 2018-12-02 23:26:21 +11:00
61ee5bb16a fix wrong placename when buying plot and some logmessage cleanup NotAdam 2018-12-02 21:08:38 +11:00
d66d1e8d55 fix wrong placename when buying plot and some logmessage cleanup NotAdam 2018-12-02 21:08:38 +11:00
29dbc7fb19 fix housing furnishings menu not closing properly NotAdam 2018-12-02 19:44:38 +11:00
d49eab1c1c fix housing furnishings menu not closing properly NotAdam 2018-12-02 19:44:38 +11:00
78fd15f0af only spawn/lookup house instance if player chooses to enter NotAdam 2018-12-02 18:50:06 +11:00
394d8e2b28 only spawn/lookup house instance if player chooses to enter NotAdam 2018-12-02 18:50:06 +11:00
b91f41ba29 remove house instances that haven't had a player for 60 seconds NotAdam 2018-12-02 18:05:50 +11:00
e290febcc4 remove house instances that haven't had a player for 60 seconds NotAdam 2018-12-02 18:05:50 +11:00
150eb3317b minor cleanup and track house zone player activity NotAdam 2018-12-02 17:27:59 +11:00
76662f6e2c minor cleanup and track house zone player activity NotAdam 2018-12-02 17:27:59 +11:00
f589ff0815 cleanup and document storeroom status actrl NotAdam 2018-12-02 16:42:46 +11:00
c13a0b14ed cleanup and document storeroom status actrl NotAdam 2018-12-02 16:42:46 +11:00
aded517eb0 when exiting an instance, return the player to correct ward NotAdam 2018-12-02 15:32:22 +11:00
6219455591 when exiting an instance, return the player to correct ward NotAdam 2018-12-02 15:32:22 +11:00
e198705503 fix zoning in/out of houses NotAdam 2018-12-02 14:59:24 +11:00
d0dc247d64 fix zoning in/out of houses NotAdam 2018-12-02 14:59:24 +11:00
29b968d096 Merge remote-tracking branch 'upstream/housing' into housing NotAdam 2018-12-02 13:50:45 +11:00
97781b484d Merge remote-tracking branch 'upstream/housing' into housing NotAdam 2018-12-02 13:50:45 +11:00
89e0ac075d Merge pull request #1 from XeAri/housing Adam 2018-12-02 13:50:12 +11:00
135438ae8d

Merge pull request #1 from XeAri/housing Adam 2018-12-02 13:50:12 +11:00
b571be8b6f General cleanup work Mordred 2018-12-02 02:01:41 +01:00
07a5a866f0 General cleanup work Mordred 2018-12-02 02:01:41 +01:00
7d042d264e housing instance AriAvery 2018-12-01 21:40:30 +01:00
4615365e4f housing instance AriAvery 2018-12-01 21:40:30 +01:00
1a18f1a9ce Merge pull request #445 from NotAdam/housing Mordred 2018-12-01 14:29:27 +01:00
2991502986

Merge pull request #445 from NotAdam/housing Mordred 2018-12-01 14:29:27 +01:00
ea2acfcd8f Merge pull request #16 from NotAdam/housing XeAri 2018-12-01 10:55:42 +01:00
733f568a0c

Merge pull request #16 from NotAdam/housing XeAri 2018-12-01 10:55:42 +01:00
d1a51538a0 spawn internal house instances NotAdam 2018-12-01 18:18:29 +11:00
908b1322f9 spawn internal house instances NotAdam 2018-12-01 18:18:29 +11:00
e9d0b67354 Slight reformatting Mordred 2018-11-30 23:57:06 +01:00
85a2f11439 Slight reformatting Mordred 2018-11-30 23:57:06 +01:00
7b0c0b7de3 Merge pull request #444 from NotAdam/housing Mordred 2018-11-30 22:31:41 +01:00
56ccd3ca23

Merge pull request #444 from NotAdam/housing Mordred 2018-11-30 22:31:41 +01:00
00f6518255 Merge pull request #15 from NotAdam/housing XeAri 2018-11-30 16:35:00 +01:00
967dc9a823

Merge pull request #15 from NotAdam/housing XeAri 2018-11-30 16:35:00 +01:00
4ee11da7ac unfuck the scripts include directories NotAdam 2018-12-01 00:30:53 +11:00
04167ce5cb unfuck the scripts include directories NotAdam 2018-12-01 00:30:53 +11:00
68195b17a1 Refactor managers and move them into Sapphire::World::Managers namespace NotAdam 2018-12-01 00:27:16 +11:00
5f5b28bcbe Refactor managers and move them into Sapphire::World::Managers namespace NotAdam 2018-12-01 00:27:16 +11:00
08ea6909ab EObjs are special so they get their own scripts NotAdam 2018-11-30 23:15:58 +11:00
9f2c8daab5 EObjs are special so they get their own scripts NotAdam 2018-11-30 23:15:58 +11:00
54009ea9ea correctly register eobjs on startup/build and handle the interaction NotAdam 2018-11-30 22:52:08 +11:00
0a5b71a320 correctly register eobjs on startup/build and handle the interaction NotAdam 2018-11-30 22:52:08 +11:00
f9b81dfcf9 Renamed publicAccess to flags Mordred 2018-11-30 00:11:18 +01:00
ebbe861e79 Renamed publicAccess to flags Mordred 2018-11-30 00:11:18 +01:00
56d1ecc5e5 Set house access to public by default Mordred 2018-11-29 23:44:08 +01:00
f393fec498 Set house access to public by default Mordred 2018-11-29 23:44:08 +01:00
f7a8f29b16 No more namespace Core, renamed to Sapphire Mordred 2018-11-29 16:55:48 +01:00
2d1a70a4ce No more namespace Core, renamed to Sapphire Mordred 2018-11-29 16:55:48 +01:00
34ad178a31 Fixed error with ward reading during house actions, lower case enum entries Mordred 2018-11-28 20:32:05 +01:00
2c69d7a22e Fixed error with ward reading during house actions, lower case enum entries Mordred 2018-11-28 20:32:05 +01:00
436506067f

Merge pull request #13 from SapphireServer/housing XeAri 2018-11-28 16:14:00 +01:00
02301cc7ef Merge pull request #441 from NotAdam/housing Mordred 2018-11-28 14:50:38 +01:00
5fe4155718

Merge pull request #441 from NotAdam/housing Mordred 2018-11-28 14:50:38 +01:00
84d7159e47 add estate guest access menu NotAdam 2018-11-29 00:19:37 +11:00
a66aea4eb4 add estate guest access menu NotAdam 2018-11-29 00:19:37 +11:00
392b098a02 Fix land state being sent incorrectly and consistently name those IPCs NotAdam 2018-11-28 23:29:55 +11:00
c12adb5c74 Fix land state being sent incorrectly and consistently name those IPCs NotAdam 2018-11-28 23:29:55 +11:00
a271ee6d46 estate greetings can be updated/set NotAdam 2018-11-28 21:59:28 +11:00
9fc4666926 estate greetings can be updated/set NotAdam 2018-11-28 21:59:28 +11:00
ebee5e854a move more housing logic from client trigger handler to housingmgr NotAdam 2018-11-28 21:24:00 +11:00
a802d98cee move more housing logic from client trigger handler to housingmgr NotAdam 2018-11-28 21:24:00 +11:00
4abbbf7c1c added door positions AriAvery 2018-11-28 08:39:36 +01:00
9c3121eaf4

Merge pull request #12 from SapphireServer/housing XeAri 2018-11-28 08:18:41 +01:00
855d760382 correctly show edit estate name/greeting windows NotAdam 2018-11-28 00:36:45 +11:00
4e4097c1c8 correctly show edit estate name/greeting windows NotAdam 2018-11-28 00:36:45 +11:00
614439836c house renaming works 🎉 NotAdam 2018-11-28 00:05:57 +11:00
fee7ed381e house renaming works 🎉 NotAdam 2018-11-28 00:05:57 +11:00
945d91b783 change LandState to LandFlags NotAdam 2018-11-27 23:12:26 +11:00