sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 11: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

#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

7a0fd6d08a More opcode fixes, updated playerspawn struct Mordred 2018-01-31 18:57:04 +01:00
22f2f029c9 More opcode fixes, updated playerspawn struct Mordred 2018-01-31 18:57:04 +01:00
81e347d164 Various opcodes adjusted Mordred 2018-01-31 18:02:23 +01:00
56ae3bc583 Various opcodes adjusted Mordred 2018-01-31 18:02:23 +01:00
5dbdfc7284 Fixed serverMsg packet Mordred 2018-01-31 17:48:12 +01:00
458662721c Fixed serverMsg packet Mordred 2018-01-31 17:48:12 +01:00
e25399a010 Fixed cras on login due to wrong sociallist packet Mordred 2018-01-31 17:24:44 +01:00
7ca987b787 Fixed cras on login due to wrong sociallist packet Mordred 2018-01-31 17:24:44 +01:00
0e052e84c6 Added type for shared_ptr< exdSheet > Mordred Admin 2018-01-31 14:55:51 +01:00
d40e375e0c Added type for shared_ptr< exdSheet > Mordred Admin 2018-01-31 14:55:51 +01:00
413c9f1007 Style goaaats 2018-01-31 11:58:29 +01:00
6793cccaa0

Style goaaats 2018-01-31 11:58:29 +01:00
c0b3d3605b zone, api: Removed old EXD reader goaaats 2018-01-31 11:43:22 +01:00
8a5d497c21 zone, api: Removed old EXD reader goaaats 2018-01-31 11:43:22 +01:00
67b06bce25 Updated some client opcodes Mordred 2018-01-31 08:28:14 +01:00
d595515320

Updated some client opcodes Mordred 2018-01-31 08:28:14 +01:00
450464a23e Updated various opcodes Mordred 2018-01-31 08:22:08 +01:00
416c909e20

Updated various opcodes Mordred 2018-01-31 08:22:08 +01:00
d522a9cded Merge pull request #233 from perize/master Mordred 2018-01-31 06:29:40 +01:00
22247887bd

Merge pull request #233 from perize/master Mordred 2018-01-31 06:29:40 +01:00
992a44fc8a Temp fix for 4.2 shift in action excel Perize 2018-01-31 13:19:07 +09:00
1d82fd6d05 Temp fix for 4.2 shift in action excel Perize 2018-01-31 13:19:07 +09:00
83cd38c831 Fix macro inport on Windows Perize 2018-01-31 13:18:23 +09:00
fdaf295652 Fix macro inport on Windows Perize 2018-01-31 13:18:23 +09:00
16d5f7c8ee More potential opcode fixes Mordred 2018-01-30 23:39:43 +01:00
ae3011cdce More potential opcode fixes Mordred 2018-01-30 23:39:43 +01:00
7ca916e282 Merge pull request #231 from perize/420-network Mordred 2018-01-30 22:50:56 +01:00
6ec9166f01

Merge pull request #231 from perize/420-network Mordred 2018-01-30 22:50:56 +01:00
d21fa4f708 Update Ipcs.h Mordred 2018-01-30 22:50:40 +01:00
644b73086e

Update Ipcs.h Mordred 2018-01-30 22:50:40 +01:00
6259b139e5 Merge pull request #232 from GokuWeedLord/master Mordred 2018-01-30 16:07:19 +01:00
893674911d

Merge pull request #232 from GokuWeedLord/master Mordred 2018-01-30 16:07:19 +01:00
b3cda8ebe6 goat can finish this Adam 2018-01-31 02:06:11 +11:00
379c9eaf24 goat can finish this Adam 2018-01-31 02:06:11 +11:00
3606ea6ef6 update generated exd data and some generator fixes Adam 2018-01-31 01:47:58 +11:00
1ce2ca6d65 update generated exd data and some generator fixes Adam 2018-01-31 01:47:58 +11:00
d6bf277183 actually commit the fixed json... Adam 2018-01-31 01:37:23 +11:00
bc66801c34 actually commit the fixed json... Adam 2018-01-31 01:37:23 +11:00
3d8e56ede4 update ex.json and take optional param to exd_struct_gen to dat path Adam 2018-01-31 01:37:08 +11:00
8835c5457a update ex.json and take optional param to exd_struct_gen to dat path Adam 2018-01-31 01:37:08 +11:00
6bbe0385cd Removed extra qualifier Mordred 2018-01-30 14:47:27 +01:00
2ff4084f4e

Removed extra qualifier Mordred 2018-01-30 14:47:27 +01:00
f3d3b86dea Merge pull request #230 from perize/master Mordred 2018-01-30 13:27:08 +01:00
9b2e9af096

Merge pull request #230 from perize/master Mordred 2018-01-30 13:27:08 +01:00
7d41839f0d Correct server opcode (not verified yet) Perize 2018-01-30 21:20:22 +09:00
7b4da16e87 Correct server opcode (not verified yet) Perize 2018-01-30 21:20:22 +09:00
111aa8c383 Correct client opcode updatepos Perize 2018-01-30 19:45:39 +09:00
e986477bdb Correct client opcode updatepos Perize 2018-01-30 19:45:39 +09:00
709e1c1b94 Merge sopcode shift posted by @Adam Adam 2018-01-30 19:41:13 +09:00
c4382fcd42 Merge sopcode shift posted by @Adam Minho Kang 2018-01-30 19:41:13 +09:00
e9142af286 Fix ActionHandler Adam 2018-01-30 19:40:42 +09:00
e91546c971 Fix ActionHandler Minho Kang 2018-01-30 19:40:42 +09:00
d63ba00094 Do not build pcb_reader by default Mordred Admin 2018-01-30 08:04:50 +01:00
649ecbad53 Do not build pcb_reader by default v4.18 Mordred Admin 2018-01-30 08:04:50 +01:00
2a6c505f9f Merge remote-tracking branch 'origin/event_rewrite' Mordred Admin 2018-01-30 07:53:15 +01:00
0fc7d293ec Merge remote-tracking branch 'origin/event_rewrite' Mordred Admin 2018-01-30 07:53:15 +01:00
8afe739aaf Minor cleanup of InstanceContent class Mordred 2018-01-29 19:41:41 +01:00
53b499de23 Minor cleanup of InstanceContent class Mordred 2018-01-29 19:41:41 +01:00
88f8eb2cb5 Use InstanceContent name instead of placeName for InstanceContent Mordred 2018-01-29 19:35:57 +01:00
0b7468ead5 Use InstanceContent name instead of placeName for InstanceContent Mordred 2018-01-29 19:35:57 +01:00
530c9f996f Merge pull request #227 from GokuWeedLord/event_rewrite Mordred 2018-01-29 11:00:58 +01:00
003c659183

Merge pull request #227 from GokuWeedLord/event_rewrite Mordred 2018-01-29 11:00:58 +01:00
e708fc5624 Merge pull request #228 from AcedArmy/master Mordred 2018-01-29 11:00:28 +01:00
1ae00be022

Merge pull request #228 from AcedArmy/master Mordred 2018-01-29 11:00:28 +01:00
b01ed63f48 Updated ReqSearchInfoHandler Location Biscuit Boy 2018-01-29 20:49:18 +11:00
c4d80da33d Updated ReqSearchInfoHandler Location Biscuit Boy 2018-01-29 20:49:18 +11:00
58b2699fb9 return players to last zone if the instance doesnt exist Adam 2018-01-29 20:41:24 +11:00
1550414983 return players to last zone if the instance doesnt exist Adam 2018-01-29 20:41:24 +11:00
95bf84ca6d correctly remove InstanceContent zones Adam 2018-01-29 20:40:32 +11:00
0d0db3b41c correctly remove InstanceContent zones Adam 2018-01-29 20:40:32 +11:00
82c892b022 Updated SearchInfo Ipcs and Fixed OnlineStatus Biscuit Boy 2018-01-29 20:36:38 +11:00
a588cc53c4 Updated SearchInfo Ipcs and Fixed OnlineStatus Biscuit Boy 2018-01-29 20:36:38 +11:00
e9d0e5cbb8 createInstanceContent and some minor refactoring Adam 2018-01-29 19:40:27 +11:00
56c6b38966 createInstanceContent and some minor refactoring Adam 2018-01-29 19:40:27 +11:00
236c09fbd3 add some more mapped TerritoryIntendedUse values Adam 2018-01-29 18:10:43 +11:00
cbefc4cc1f add some more mapped TerritoryIntendedUse values Adam 2018-01-29 18:10:43 +11:00
36d64630d3 remove isPrivate param from constructors Adam 2018-01-29 18:10:11 +11:00
2ad9b0efaa remove isPrivate param from constructors Adam 2018-01-29 18:10:11 +11:00
7de0885b54 instance zoning and returning implemented Adam 2018-01-29 13:05:33 +11:00
20ee459e26 instance zoning and returning implemented Adam 2018-01-29 13:05:33 +11:00
97e2c08a9f fix weather in zones Adam 2018-01-29 13:03:52 +11:00
9e830ac677 fix weather in zones Adam 2018-01-29 13:03:52 +11:00
bccf6e200a Cleaning up zoneing code Mordred 2018-01-28 22:36:43 +01:00
ad88a058c2 Cleaning up zoneing code Mordred 2018-01-28 22:36:43 +01:00
4cf6602133 Merge pull request #226 from GokuWeedLord/event_rewrite Mordred 2018-01-28 15:26:31 +01:00
fb2320a742

Merge pull request #226 from GokuWeedLord/event_rewrite Mordred 2018-01-28 15:26:31 +01:00
9d2d819e18 instance removal command Adam 2018-01-29 00:52:11 +11:00
d1d93c9241 instance removal command Adam 2018-01-29 00:52:11 +11:00
339a089d47 gm teri accepts instance id Adam 2018-01-29 00:40:34 +11:00
d54f366712 gm teri accepts instance id Adam 2018-01-29 00:40:34 +11:00
5afe002c33 Merge remote-tracking branch 'upstream/event_rewrite' into event_rewrite Adam 2018-01-28 23:54:10 +11:00
47bcd612df Merge remote-tracking branch 'upstream/event_rewrite' into event_rewrite Adam 2018-01-28 23:54:10 +11:00
b05a05341c base implementation of instance creation Adam 2018-01-28 23:53:58 +11:00
ea47861f33 base implementation of instance creation Adam 2018-01-28 23:53:58 +11:00
63371153ae forgot proper namespace for Director Mordred 2018-01-28 13:52:53 +01:00
fa662d30b8 forgot proper namespace for Director Mordred 2018-01-28 13:52:53 +01:00
d9da17cd35 Begin of InstanceContent implementation Mordred 2018-01-28 13:49:51 +01:00
137cc944b3 Begin of InstanceContent implementation Mordred 2018-01-28 13:49:51 +01:00
04f5823c4b Removed author comment, we have git anyways. Mordred 2018-01-28 11:40:12 +01:00
2609a475a7 Removed author comment, we have git anyways. Mordred 2018-01-28 11:40:12 +01:00