sapphire

mirrors/sapphire

Fork 0

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

43ce38ebae

Update ClientZoneDef.h XeAri 2018-11-12 08:43:24 +01:00
e96e875ea1 Merge branch 'housing' into housing XeAri 2018-11-12 08:34:06 +01:00
5220587f51

Merge branch 'housing' into housing XeAri 2018-11-12 08:34:06 +01:00
1808e16585 rename trigger (working) + build preset (starting) AriAvery 2018-11-12 08:32:30 +01:00
ac2dcaec93 rename trigger (working) + build preset (starting) AriAvery 2018-11-12 08:32:30 +01:00
ed0296889a Fixed initial housing settings and added another logmessage upon land purchase Mordred 2018-11-11 23:55:34 +01:00
c5c76ebe13 Fixed initial housing settings and added another logmessage upon land purchase Mordred 2018-11-11 23:55:34 +01:00
979209b3f6 Merge branch 'housing' of https://github.com/SapphireMordred/Sapphire into housing Mordred 2018-11-11 17:21:02 +01:00
570b92313a Merge branch 'housing' of https://github.com/SapphireMordred/Sapphire into housing Mordred 2018-11-11 17:21:02 +01:00
1c3dbe6542 Only allow buying one private land Mordred 2018-11-11 17:20:47 +01:00
382bc91f53 Only allow buying one private land Mordred 2018-11-11 17:20:47 +01:00
d54d19c342 Travis fix mordred 2018-11-11 15:37:57 +01:00
eb49dc378d Travis fix mordred 2018-11-11 15:37:57 +01:00
8c5fbbedad fixed errors AriAvery 2018-11-11 14:53:19 +01:00
6181ced227 fixed errors AriAvery 2018-11-11 14:53:19 +01:00
4bf5644cce fixes AriAvery 2018-11-11 14:34:56 +01:00
d46d4fe068 fixes AriAvery 2018-11-11 14:34:56 +01:00
8f118c4ec8 Signs + rename AriAvery 2018-11-11 14:27:39 +01:00
aa9e1e2450 Signs + rename AriAvery 2018-11-11 14:27:39 +01:00
cd8aff1a40 Merge pull request #2 from SapphireMordred/housing XeAri 2018-11-11 12:38:19 +01:00
67b1b2edd6

Merge pull request #2 from SapphireMordred/housing XeAri 2018-11-11 12:38:19 +01:00
ec6aa1d4d6 Some additions Mordred 2018-11-11 12:10:57 +01:00
492aaae449 Some additions Mordred 2018-11-11 12:10:57 +01:00
8c5f7f4825 Merge pull request #1 from SapphireMordred/housing XeAri 2018-11-11 10:47:21 +01:00
93ee3d1e27

Merge pull request #1 from SapphireMordred/housing XeAri 2018-11-11 10:47:21 +01:00
c320604cd7 Cleanup and errorhandling Mordred 2018-11-10 23:47:19 +01:00
3cb4e79211 Cleanup and errorhandling Mordred 2018-11-10 23:47:19 +01:00
9c4d965ff6 Merge pull request #422 from XeAri/housing Mordred 2018-11-10 22:26:25 +01:00
ca87619161

Merge pull request #422 from XeAri/housing Mordred 2018-11-10 22:26:25 +01:00
8ac9636fc6 Fixed typos Mordred 2018-11-10 22:04:40 +01:00
2cd15779cd

Fixed typos Mordred 2018-11-10 22:04:40 +01:00
d6f42e7bf0 :/ XeAri 2018-11-10 19:15:04 +01:00
cb828c051d

:/ XeAri 2018-11-10 19:15:04 +01:00
746335a099 Merge branch 'housing' into housing XeAri 2018-11-10 19:11:43 +01:00
97724d1871

Merge branch 'housing' into housing XeAri 2018-11-10 19:11:43 +01:00
5db5b09e40 House fixes 2 AriAvery 2018-11-10 19:00:41 +01:00
6c004eef76 House fixes 2 AriAvery 2018-11-10 19:00:41 +01:00
f941846f13 House fixes AriAvery 2018-11-10 19:00:13 +01:00
dadc8184e9 House fixes AriAvery 2018-11-10 19:00:13 +01:00
d1750ebb69 Start of land interaction Mordred 2018-11-10 12:48:19 +01:00
155b59785b Start of land interaction Mordred 2018-11-10 12:48:19 +01:00
93794ed4fe Actually send gc information, too Mordred 2018-11-09 21:36:40 +01:00
61edc8248b Actually send gc information, too Mordred 2018-11-09 21:36:40 +01:00
c5e3330182 Merge branch 'housing' of https://github.com/SapphireMordred/Sapphire into housing mordred 2018-11-09 11:27:57 +01:00
721b1c745a Merge branch 'housing' of https://github.com/SapphireMordred/Sapphire into housing mordred 2018-11-09 11:27:57 +01:00
8fcee959c6 Merge pull request #421 from XeAri/housing Mordred 2018-11-09 11:13:10 +01:00
b6195c99fb

Merge pull request #421 from XeAri/housing Mordred 2018-11-09 11:13:10 +01:00
1c97a7138c housing handler fix AriAvery 2018-11-09 11:11:32 +01:00
07750857bf housing handler fix AriAvery 2018-11-09 11:11:32 +01:00
e1f58a9875 Merge remote-tracking branch 'origin/develop' into housing mordred 2018-11-09 11:10:34 +01:00
872139b3ef Merge remote-tracking branch 'origin/develop' into housing mordred 2018-11-09 11:10:34 +01:00
d0c3a356a1 Merge pull request #420 from XeAri/housing Mordred 2018-11-09 10:58:35 +01:00
910113c35f

Merge pull request #420 from XeAri/housing Mordred 2018-11-09 10:58:35 +01:00
4babbd59b4 fixes AriAvery 2018-11-09 10:53:11 +01:00
3d494e6949 fixes AriAvery 2018-11-09 10:53:11 +01:00
c726d7074b removed senseless case AriAvery 2018-11-09 10:39:56 +01:00
191bb15332 removed senseless case AriAvery 2018-11-09 10:39:56 +01:00
d6118e9d80 :/ AriAvery 2018-11-09 10:00:36 +01:00
964ec2afa3 :/ AriAvery 2018-11-09 10:00:36 +01:00
9cc2cd633f added min prices AriAvery 2018-11-09 09:49:43 +01:00
0ad312aed9 added min prices AriAvery 2018-11-09 09:49:43 +01:00
c551a766f3 fixed style 2 AriAvery 2018-11-08 22:19:26 +01:00
6525a8e4f1 fixed style 2 AriAvery 2018-11-08 22:19:26 +01:00
84c5555cdd fixed style AriAvery 2018-11-08 22:17:25 +01:00
aee2d26efc fixed style AriAvery 2018-11-08 22:17:25 +01:00
9dcc966622 added housing debugHandler AriAvery 2018-11-08 10:54:37 +01:00
38f1cb0d89 added housing debugHandler AriAvery 2018-11-08 10:54:37 +01:00
49b3e35e15 class fix AriAvery 2018-11-07 13:16:25 +01:00
df9a1c3697 class fix AriAvery 2018-11-07 13:16:25 +01:00
e73613f443 More stuff AriAvery 2018-11-07 11:59:59 +01:00
cd589033ad More stuff AriAvery 2018-11-07 11:59:59 +01:00
e832c078d5 added Land Update function AriAvery 2018-11-07 11:56:49 +01:00
150a3f8a64 added Land Update function AriAvery 2018-11-07 11:56:49 +01:00
0f86374264 added devaluation timer AriAvery 2018-11-07 11:08:07 +01:00
b1fdff5400 added devaluation timer AriAvery 2018-11-07 11:08:07 +01:00
23d3542088 removed space AriAvery 2018-11-07 10:49:02 +01:00
e43ae8ed2e removed space AriAvery 2018-11-07 10:49:02 +01:00
903b38f32b some fix AriAvery 2018-11-07 09:27:57 +01:00
6ca53568d0 some fix AriAvery 2018-11-07 09:27:57 +01:00
5aacca21c2 added housing item UI AriAvery 2018-11-07 09:05:03 +01:00
7b5057f99b added housing item UI AriAvery 2018-11-07 09:05:03 +01:00
3559db8892 Sending quest info on loading finish, fixes housing login crash Mordred 2018-11-06 23:36:34 +01:00
a72f3b122c Sending quest info on loading finish, fixes housing login crash Mordred 2018-11-06 23:36:34 +01:00
22c3b45c64 Fixed various small offset issues / packet sizes Mordred 2018-11-06 23:25:37 +01:00
1f1b524d6f Fixed various small offset issues / packet sizes Mordred 2018-11-06 23:25:37 +01:00
fa80e53bd4 Field size fix mordred 2018-11-06 13:05:39 +01:00
bd0cf1718a Field size fix mordred 2018-11-06 13:05:39 +01:00
4f296b0fb3 Create lookup for housing zones by landsetId, load housing zone from stored territoryId in player mordred 2018-11-06 11:11:07 +01:00
8456067730 Create lookup for housing zones by landsetId, load housing zone from stored territoryId in player mordred 2018-11-06 11:11:07 +01:00
02e968fbc2 Added getter and setter for territoryId to player mordred 2018-11-06 10:48:46 +01:00
c0a0594463 Added getter and setter for territoryId to player mordred 2018-11-06 10:48:46 +01:00
43a9124ce7 Store and load territoryID mordred 2018-11-06 10:36:45 +01:00
c9242a04a4 Store and load territoryID mordred 2018-11-06 10:36:45 +01:00
71603f58da Merge pull request #419 from NotAdam/develop Mordred 2018-11-06 08:49:37 +01:00
ce26c04f3c

Merge pull request #419 from NotAdam/develop Mordred 2018-11-06 08:49:37 +01:00
141bf9325a correctly copy default config file if it doesn't exist NotAdam 2018-11-06 18:35:02 +11:00
8e23292e82 correctly copy default config file if it doesn't exist NotAdam 2018-11-06 18:35:02 +11:00
9f7500ba75 Expanded debug string Mordred 2018-11-05 23:39:08 +01:00
fe2a6b8052 Expanded debug string Mordred 2018-11-05 23:39:08 +01:00
c512a63b92 Use territoryType instead of TerritoryId, also refactor variables to reflect the change Mordred 2018-11-05 23:07:39 +01:00