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

d3301b0b9f add external housing object placing NotAdam 2018-12-26 18:11:18 +11:00
b50c501946 add external housing object placing NotAdam 2018-12-26 18:11:18 +11:00
e58014174c fix msvc builds and cleanup some warnings NotAdam 2018-12-26 13:37:13 +11:00
0aba5c8d2d fix msvc builds and cleanup some warnings NotAdam 2018-12-26 13:37:13 +11:00
68e3f5c3f8 housing yard objects spawn from the db now NotAdam 2018-12-26 01:08:54 +11:00
da8b86b1a0 housing yard objects spawn from the db now NotAdam 2018-12-26 01:08:54 +11:00
e73d9dea0d not much point using a map NotAdam 2018-12-26 01:05:28 +11:00
e00883286c not much point using a map NotAdam 2018-12-26 01:05:28 +11:00
27e631d546 yard object spawning (mostly) working NotAdam 2018-12-26 00:43:27 +11:00
99d52f18f1 yard object spawning (mostly) working NotAdam 2018-12-26 00:43:27 +11:00
7a15179f5a spawn housing objects on zone in NotAdam 2018-12-25 23:43:39 +11:00
fab6a27354 spawn housing objects on zone in NotAdam 2018-12-25 23:43:39 +11:00
95862a4fac force stack to 1 for housing items NotAdam 2018-12-25 22:59:13 +11:00
e0aa6550ae force stack to 1 for housing items NotAdam 2018-12-25 22:59:13 +11:00
19017f6e12 remove model params from item constructor NotAdam 2018-12-25 21:53:05 +11:00
b624237731 remove model params from item constructor NotAdam 2018-12-25 21:53:05 +11:00
c6232f2395 Fix items being created incorrectly for small plots NotAdam 2018-12-25 21:40:02 +11:00
0a4c8b37d7 Fix items being created incorrectly for small plots NotAdam 2018-12-25 21:40:02 +11:00
52c35e0ccb create all estate inventories on launch NotAdam 2018-12-25 21:05:13 +11:00
a66b937200 create all estate inventories on launch NotAdam 2018-12-25 21:05:13 +11:00
3d469b3f1c minor refactoring, move some more stuff out of land and into housingmgr NotAdam 2018-12-25 20:12:24 +11:00
d9dd3a5114 minor refactoring, move some more stuff out of land and into housingmgr NotAdam 2018-12-25 20:12:24 +11:00
ad2fbe44ec fix prepared statement missing a param NotAdam 2018-12-25 20:11:59 +11:00
56d78e8c3d fix prepared statement missing a param NotAdam 2018-12-25 20:11:59 +11:00
95be37add0 fix an issue where multiple items could get created at the same time NotAdam 2018-12-25 20:11:41 +11:00
068b840c0a fix an issue where multiple items could get created at the same time NotAdam 2018-12-25 20:11:41 +11:00
199d7a6ec6 More fw cleanup Mordred 2018-12-25 01:57:50 +01:00
4a33793270 More fw cleanup Mordred 2018-12-25 01:57:50 +01:00
e2fd36bbdb update schema NotAdam 2018-12-23 23:46:49 +11:00
5ed8281f96 update schema NotAdam 2018-12-23 23:46:49 +11:00
101f284003 More fw related cleanup Mordred 2018-12-23 13:26:33 +01:00
fdb4f011ac More fw related cleanup Mordred 2018-12-23 13:26:33 +01:00
99c9d5edf8 use HousingItem instead of Item for housing inventories NotAdam 2018-12-23 22:43:35 +11:00
b4e0c2a406 use HousingItem instead of Item for housing inventories NotAdam 2018-12-23 22:43:35 +11:00
abb3771b86 save a newly created house to the db correctly NotAdam 2018-12-23 21:00:00 +11:00
b77d4e6ff3 save a newly created house to the db correctly NotAdam 2018-12-23 21:00:00 +11:00
b124ae06b1 more refactoring + sql NotAdam 2018-12-23 20:54:21 +11:00
24520a8491 more refactoring + sql NotAdam 2018-12-23 20:54:21 +11:00
2dd08e1551 housing inventories work, parts are loaded from db now NotAdam 2018-12-23 19:13:30 +11:00
2c426b5059 housing inventories work, parts are loaded from db now NotAdam 2018-12-23 19:13:30 +11:00
478d8fe238 cleanup and simplify model cache logic for houses NotAdam 2018-12-23 15:23:22 +11:00
50ddcbb180 cleanup and simplify model cache logic for houses NotAdam 2018-12-23 15:23:22 +11:00
f52588cdb2 Progress... Mordred 2018-12-23 03:53:08 +01:00
f1c0512d28 Progress... Mordred 2018-12-23 03:53:08 +01:00
d03e7a43a6 Added BaseManager and moved DebugCommandHandler to Manager Mordred 2018-12-22 22:25:03 +01:00
28139b47b5 Added BaseManager and moved DebugCommandHandler to Manager Mordred 2018-12-22 22:25:03 +01:00
616c788e71 cleanup old house cols from db schema NotAdam 2018-12-22 23:39:07 +11:00
ce53890985 cleanup old house cols from db schema NotAdam 2018-12-22 23:39:07 +11:00
32a8cccb12 refactor housepart to housemodel NotAdam 2018-12-22 23:33:38 +11:00
b9fe2b33f9 refactor housepart to housemodel NotAdam 2018-12-22 23:33:38 +11:00
f29e72942b show error messages in the event of an invalid house appearance inv NotAdam 2018-12-22 21:20:12 +11:00
d0d776161b show error messages in the event of an invalid house appearance inv NotAdam 2018-12-22 21:20:12 +11:00
d254839fa7 Merge pull request #458 from NotAdam/housing Mordred 2018-12-22 10:46:40 +01:00
18fd18ebe0

Merge pull request #458 from NotAdam/housing Mordred 2018-12-22 10:46:40 +01:00
517b0912f0 fix autism Adam 2018-12-22 17:54:56 +11:00
f774e754f2

fix autism Adam 2018-12-22 17:54:56 +11:00
40e3865782 cleanup old house apperance crap NotAdam 2018-12-22 17:29:40 +11:00
3d0780e9fe cleanup old house apperance crap NotAdam 2018-12-22 17:29:40 +11:00
c345ac2c4e correctly load appearance from db NotAdam 2018-12-22 17:25:30 +11:00
54f3a8e933 correctly load appearance from db NotAdam 2018-12-22 17:25:30 +11:00
ca62581dfb partially fix inventory loading fuckery NotAdam 2018-12-22 17:22:24 +11:00
1b097e4181 partially fix inventory loading fuckery NotAdam 2018-12-22 17:22:24 +11:00
c75abab4e6 remove old land init struct NotAdam 2018-12-22 16:00:04 +11:00
66156a97ca remove old land init struct NotAdam 2018-12-22 16:00:04 +11:00
e52127fd91 load housing invs correctly NotAdam 2018-12-22 15:58:54 +11:00
3346ce6740 load housing invs correctly NotAdam 2018-12-22 15:58:54 +11:00
8b70f79108 fix house init, some refactoring and base inventory impl NotAdam 2018-12-22 14:35:42 +11:00
05b4045165 fix house init, some refactoring and base inventory impl NotAdam 2018-12-22 14:35:42 +11:00
8cd4b690a8 init houses from land cache instead of territory based queries NotAdam 2018-12-22 12:00:03 +11:00
74b41683ac init houses from land cache instead of territory based queries NotAdam 2018-12-22 12:00:03 +11:00
ab35d2075d cache all houses on startup NotAdam 2018-12-22 11:33:21 +11:00
09f0123809 cache all houses on startup NotAdam 2018-12-22 11:33:21 +11:00
96ba9a9e69 Merge remote-tracking branch 'origin/housing' into develop Mordred 2018-12-21 16:35:24 +01:00
c0f2f7880c Merge remote-tracking branch 'origin/housing' into develop Mordred 2018-12-21 16:35:24 +01:00
28211b2808 add batch land select to get all land + houses in 1 query NotAdam 2018-12-22 02:08:28 +11:00
cb96c26c3e add batch land select to get all land + houses in 1 query NotAdam 2018-12-22 02:08:28 +11:00
5b38ddf0c5 Merge pull request #457 from NotAdam/housing Mordred 2018-12-21 15:18:48 +01:00
1b3cf0222e

Merge pull request #457 from NotAdam/housing Mordred 2018-12-21 15:18:48 +01:00
74f35ea2ea a little reminder NotAdam 2018-12-22 01:02:42 +11:00
0fd3bf4194 a little reminder NotAdam 2018-12-22 01:02:42 +11:00
6da9ae57d2 fix shitty inventory impl so it works a bit more than before NotAdam 2018-12-22 01:00:31 +11:00
5f6c2d950a fix shitty inventory impl so it works a bit more than before NotAdam 2018-12-22 01:00:31 +11:00
0d66bdd270 batch land sql queries to 1 per ward instead of 60 NotAdam 2018-12-22 00:48:43 +11:00
d6b548afe9 batch land sql queries to 1 per ward instead of 60 NotAdam 2018-12-22 00:48:43 +11:00
14848ee955 partially working inventory loading NotAdam 2018-12-21 23:49:46 +11:00
732e36dc0a partially working inventory loading NotAdam 2018-12-21 23:49:46 +11:00
1c59eb8f98 more ident cleanup NotAdam 2018-12-21 22:23:49 +11:00
7aba36f963 more ident cleanup NotAdam 2018-12-21 22:23:49 +11:00
419a61f8ff Move land/house to use LandIdent instead of storing terri/plot/ward NotAdam 2018-12-21 22:08:05 +11:00
4e3de5817f Move land/house to use LandIdent instead of storing terri/plot/ward NotAdam 2018-12-21 22:08:05 +11:00
d4fcac3708 Merge pull request #456 from NotAdam/housing Mordred 2018-12-20 14:18:55 +01:00
a2a05f4b39

Merge pull request #456 from NotAdam/housing Mordred 2018-12-20 14:18:55 +01:00
2b89c1a3cb how about this NotAdam 2018-12-21 00:10:13 +11:00
5a4e4ee58d how about this NotAdam 2018-12-21 00:10:13 +11:00
604ba6d106 don't attempt to install clang NotAdam 2018-12-21 00:06:36 +11:00
a9c0ce08c7 don't attempt to install clang NotAdam 2018-12-21 00:06:36 +11:00
0655b99fdb fucking ruby devs NotAdam 2018-12-21 00:04:11 +11:00
07fbc3f245 fucking ruby devs NotAdam 2018-12-21 00:04:11 +11:00
763faa3465 maybe this works NotAdam 2018-12-21 00:00:05 +11:00
dc5a16512a maybe this works NotAdam 2018-12-21 00:00:05 +11:00