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

7dbab22aed

Merge pull request #430 from NotAdam/housing Mordred 2018-11-21 09:23:55 +01:00
fe2c757faa HousingAethernet script NotAdam 2018-11-21 17:17:47 +11:00
eb16625fef HousingAethernet script NotAdam 2018-11-21 17:17:47 +11:00
e4d38347d8 HousingAethernet event type NotAdam 2018-11-21 10:27:52 +11:00
3abf1e4e5f HousingAethernet event type NotAdam 2018-11-21 10:27:52 +11:00
bafb3c1f0d Found a typo in opcodes Mordred 2018-11-21 09:09:27 +01:00
88129210e4

Found a typo in opcodes Mordred 2018-11-21 09:09:27 +01:00
b6590fbe14 Brief event cleanup Mordred 2018-11-20 23:24:37 +01:00
b7f144b132 Brief event cleanup Mordred 2018-11-20 23:24:37 +01:00
54f3936542 ServerZone -> ServerMgr Mordred 2018-11-20 21:32:13 +01:00
a746bd5e60 ServerZone -> ServerMgr Mordred 2018-11-20 21:32:13 +01:00
b723e092f9 Added checks to relinquishing land Mordred 2018-11-20 21:21:22 +01:00
017391e899 Added checks to relinquishing land Mordred 2018-11-20 21:21:22 +01:00
035edebfb4 Typo fix Mordred 2018-11-20 17:15:23 +01:00
e998fbb694 Typo fix Mordred 2018-11-20 17:15:23 +01:00
2b580afb16 Merge pull request #429 from XeAri/patch-1 Mordred 2018-11-20 17:14:59 +01:00
34347f80d7

Merge pull request #429 from XeAri/patch-1 Mordred 2018-11-20 17:14:59 +01:00
e44c729177 Update GameConnection.cpp XeAri 2018-11-20 16:09:03 +01:00
ffda04af2f

Update GameConnection.cpp XeAri 2018-11-20 16:09:03 +01:00
08b7e63e3e Fixed housing preset handler XeAri 2018-11-20 16:08:29 +01:00
47d244dc84

Fixed housing preset handler XeAri 2018-11-20 16:08:29 +01:00
003f9db8c9 Merge pull request #9 from SapphireMordred/housing XeAri 2018-11-20 14:09:23 +01:00
5f32b3629d

Merge pull request #9 from SapphireMordred/housing XeAri 2018-11-20 14:09:23 +01:00
cfca3f4e2f Merge pull request #428 from NotAdam/housing Mordred 2018-11-20 13:21:54 +01:00
3f9b3e6425

Merge pull request #428 from NotAdam/housing Mordred 2018-11-20 13:21:54 +01:00
5eac985253 remove unused defines NotAdam 2018-11-20 22:55:17 +11:00
fc214f3545 remove unused defines NotAdam 2018-11-20 22:55:17 +11:00
6106e7bc45 Add ward selection, ward info & some script cleanup NotAdam 2018-11-20 22:52:57 +11:00
7cf925d1c3 Add ward selection, ward info & some script cleanup NotAdam 2018-11-20 22:52:57 +11:00
867c336e6a Merge pull request #8 from SapphireMordred/housing XeAri 2018-11-20 09:18:07 +01:00
5ea6e820f4

Merge pull request #8 from SapphireMordred/housing XeAri 2018-11-20 09:18:07 +01:00
9194432439 Slight event changes for multiple nested events Mordred 2018-11-19 23:52:35 +01:00
9f2d57417e Slight event changes for multiple nested events Mordred 2018-11-19 23:52:35 +01:00
3c9a34a63a Merge pull request #427 from XeAri/housing Mordred 2018-11-19 12:37:05 +01:00
6b28c97a27

Merge pull request #427 from XeAri/housing Mordred 2018-11-19 12:37:05 +01:00
d27ae703ec Update House.h Mordred 2018-11-19 12:03:24 +01:00
fe114c8022

Update House.h Mordred 2018-11-19 12:03:24 +01:00
06b107c747 next fix AriAvery 2018-11-19 11:56:53 +01:00
7d6e927401 next fix AriAvery 2018-11-19 11:56:53 +01:00
edf4177b9f Cleanup HousingMgr + Style AriAvery 2018-11-19 11:55:29 +01:00
df6d019762 Cleanup HousingMgr + Style AriAvery 2018-11-19 11:55:29 +01:00
d5faa15d0a upps AriAvery 2018-11-19 10:35:48 +01:00
d6ebb2345a upps AriAvery 2018-11-19 10:35:48 +01:00
f0b157cab7 Merge branch 'housing' of https://github.com/XeAri/Sapphire into housing AriAvery 2018-11-19 10:33:38 +01:00
c39680b112 Merge branch 'housing' of https://github.com/XeAri/Sapphire into housing AriAvery 2018-11-19 10:33:38 +01:00
b188455c3e D: AriAvery 2018-11-19 10:32:58 +01:00
363fc3c3ce D: AriAvery 2018-11-19 10:32:58 +01:00
bc3c683c92 Update House.cpp Mordred 2018-11-19 10:04:54 +01:00
d3573566a8

Update House.cpp Mordred 2018-11-19 10:04:54 +01:00
762b5f4047 house class + fixes AriAvery 2018-11-19 09:40:44 +01:00
8561967851 house class + fixes AriAvery 2018-11-19 09:40:44 +01:00
282e6acbfc Merge pull request #7 from SapphireMordred/housing XeAri 2018-11-19 09:12:19 +01:00
0d7d23ad37

Merge pull request #7 from SapphireMordred/housing XeAri 2018-11-19 09:12:19 +01:00
7164ca3ddd Basic land relinquishing added Mordred 2018-11-17 01:16:44 +01:00
519b51ff85 Basic land relinquishing added Mordred 2018-11-17 01:16:44 +01:00
4915b62d7b Do not use the current zone for landdetail lookup but the provided territoryId Mordred 2018-11-16 17:07:22 +01:00
39ba1785c3 Do not use the current zone for landdetail lookup but the provided territoryId Mordred 2018-11-16 17:07:22 +01:00
32fae0c986 Merge pull request #426 from XeAri/housing Mordred 2018-11-16 12:19:30 +01:00
2aca215f51

Merge pull request #426 from XeAri/housing Mordred 2018-11-16 12:19:30 +01:00
664ccf2434 Update house.sql XeAri 2018-11-16 12:17:42 +01:00
f050ce8808

Update house.sql XeAri 2018-11-16 12:17:42 +01:00
c21d9fd9e7 Update house.sql XeAri 2018-11-16 12:17:32 +01:00
45e7dc3d3e

Update house.sql XeAri 2018-11-16 12:17:32 +01:00
3443dad247 sql tables AriAvery 2018-11-16 12:16:08 +01:00
6339148850 sql tables AriAvery 2018-11-16 12:16:08 +01:00
218febd2fe Merge pull request #6 from SapphireMordred/housing XeAri 2018-11-16 12:14:53 +01:00
4f40dc4a5d

Merge pull request #6 from SapphireMordred/housing XeAri 2018-11-16 12:14:53 +01:00
db6a2e099b Use the right packet to update permission + cleanup + new clienttrigger Mordred 2018-11-15 22:30:59 +01:00
6f8abf951b Use the right packet to update permission + cleanup + new clienttrigger Mordred 2018-11-15 22:30:59 +01:00
c855710178 More housing functionality move to mgr and small cleanups mordred 2018-11-15 12:40:02 +01:00
d0e99ea7fd More housing functionality move to mgr and small cleanups mordred 2018-11-15 12:40:02 +01:00
fffa93bd81 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Matheus Ogeda 2018-11-14 18:46:06 -02:00
4457a18ca0 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Matheus Ogeda 2018-11-14 18:46:06 -02:00
99be183f46 Removed old mysql lib Mordred 2018-11-14 16:54:09 +01:00
2e9c5f522c Removed old mysql lib Mordred 2018-11-14 16:54:09 +01:00
b0fd8beb0b Cleanup of housing definitions mordred 2018-11-14 10:00:16 +01:00
a7bc521ebc Cleanup of housing definitions mordred 2018-11-14 10:00:16 +01:00
ddcfdd1631 Decouple land from packet struct data, add worldId to serverZone mordred 2018-11-14 09:22:17 +01:00
64aef089b1 Decouple land from packet struct data, add worldId to serverZone mordred 2018-11-14 09:22:17 +01:00
361b0b463b Started moveing more housing code into HousingMgr Mordred 2018-11-13 23:46:10 +01:00
c1b52da7ab Started moveing more housing code into HousingMgr Mordred 2018-11-13 23:46:10 +01:00
a8040d9236 Added land type storage / loading / usage Mordred 2018-11-13 19:48:22 +01:00
70b7862f9f Added land type storage / loading / usage Mordred 2018-11-13 19:48:22 +01:00
a3fd364837 Merge pull request #425 from NotAdam/housing Mordred 2018-11-13 11:51:10 +01:00
24f0cb5df7

Merge pull request #425 from NotAdam/housing Mordred 2018-11-13 11:51:10 +01:00
1898d7bf5c move all script classes to Sapphire::ScriptAPI namespace NotAdam 2018-11-13 21:34:44 +11:00
63bf781f7a move all script classes to Sapphire::ScriptAPI namespace NotAdam 2018-11-13 21:34:44 +11:00
67e74268a0 expose framework to scripts NotAdam 2018-11-13 20:43:29 +11:00
619f55689f expose framework to scripts NotAdam 2018-11-13 20:43:29 +11:00
6596b5a6d5 Fixed sign structure and lookup of owner name Mordred 2018-11-13 00:03:09 +01:00
abc0960e03 Fixed sign structure and lookup of owner name Mordred 2018-11-13 00:03:09 +01:00
fea43d25f9 Merge pull request #423 from XeAri/housing Mordred 2018-11-12 10:03:29 +01:00
c7c586d3fb

Merge pull request #423 from XeAri/housing Mordred 2018-11-12 10:03:29 +01:00
4763451da9 moving init name to purcahse AriAvery 2018-11-12 09:54:15 +01:00
a3a271439b moving init name to purcahse AriAvery 2018-11-12 09:54:15 +01:00
c4cb8ecb7c setting land name like retail AriAvery 2018-11-12 09:40:20 +01:00
502fbf7019 setting land name like retail AriAvery 2018-11-12 09:40:20 +01:00
c9eb1bafce name fixes AriAvery 2018-11-12 09:32:20 +01:00
762f01366d name fixes AriAvery 2018-11-12 09:32:20 +01:00
1a618ee410 Update ClientZoneDef.h XeAri 2018-11-12 08:43:24 +01:00