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

#1

#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

#135

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#153

#154

#155

#156

#157

#158

#158

#159

#16

#16

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#173

#174

#175

#176

#177

#179

#18

#184

#185

#186

#187

#188

#189

#19

#190

#191

#191

#193

#193

#194

#195

#196

#196

#197

#198

#199

#2

#200

#201

#202

#203

#204

#206

#207

#208

#209

#209

#21

#211

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#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

#263

#264

#265

#266

#267

#267

#268

#269

#269

#27

#270

#271

#272

#273

#274

#275

#276

#278

#279

#279

#28

#280

#281

#282

#283

#285

#286

#287

#288

#289

#29

#29

#290

#290

#291

#292

#293

#294

#295

#295

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#316

#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

#362

#363

#364

#365

#366

#367

#368

#369

#370

#371

#372

#373

#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

#4

#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

#49

#499

#5

#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

#6

#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

#7

#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

#79

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#8

#8

#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

#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

#9

#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

#960

#961

#962

#963

#964

#965

#967

#969

#97

#970

#971

#972

#973

#974

#974

#975

#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

Mono Color

• 543c659140
  Merge pull request #384 from NotAdam/develop Mordred 2018-09-18 12:21:56 +02:00
• fd7a688b10 opcode updates - part 1 #383 NotAdam 2018-09-18 20:20:25 +10:00
• c106bddf4a opcode updates - part 1 #383 NotAdam 2018-09-18 20:20:25 +10:00
• 9f8d9bfe9d Merged to master Mordred Admin 2018-09-18 08:39:08 +02:00
• d0a10d33e6 Merged to master v4.36 Mordred Admin 2018-09-18 08:39:08 +02:00
• 7870737205 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Maru 2018-09-18 00:36:43 -03:00
• 9bf6e6386b Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Maru 2018-09-18 00:36:43 -03:00
• 93e254a88c Indices for models also adjusted Mordred 2018-09-17 23:28:29 +02:00
• b51af5fd66 Indices for models also adjusted Mordred 2018-09-17 23:28:29 +02:00
• 6eb71b76e4 Fixed neck and ear being mixed up Mordred 2018-09-17 23:26:56 +02:00
• 60c23d986e Fixed neck and ear being mixed up Mordred 2018-09-17 23:26:56 +02:00
• ddb3b69bd6 Merge branch 'bnpc' of https://github.com/SapphireMordred/Sapphire into bnpc Mordred 2018-09-17 23:10:59 +02:00
• 275ac206a9 Merge branch 'bnpc' of https://github.com/SapphireMordred/Sapphire into bnpc Mordred 2018-09-17 23:10:59 +02:00
• 827250f9cd Inventory fix Mordred 2018-09-17 22:52:57 +02:00
• 6ff116a9e1 Inventory fix Mordred 2018-09-17 22:52:57 +02:00
• f8370a3bbc Merge dayo Maru 2018-09-17 15:30:09 -03:00
• a316230030 Merge dayo Maru 2018-09-17 15:30:09 -03:00
• 2694e7df51 Merge https://github.com/SapphireMordred/Sapphire into develop Maru 2018-09-17 15:29:29 -03:00
• d7fa8b5401 Merge https://github.com/SapphireMordred/Sapphire into develop Maru 2018-09-17 15:29:29 -03:00
• 27fe651259 Merge error fix Mordred Admin 2018-09-17 14:15:08 +02:00
• b51e24ca18 Merge error fix Mordred Admin 2018-09-17 14:15:08 +02:00
• 238ea28d75 Merge develop into bnpc Mordred Admin 2018-09-17 14:04:40 +02:00
• 150ce725bc Merge develop into bnpc Mordred Admin 2018-09-17 14:04:40 +02:00
• 197d846a85 Fixed discovery information not being used correctly. Mordred 2018-09-17 08:41:09 +02:00
• 95b549a5bf
  Fixed discovery information not being used correctly. Mordred 2018-09-17 08:41:09 +02:00
• 5b8c508e3b indentation off Dantestyle 2018-09-16 21:30:00 +02:00
• d97970802b Mobs can now be spawned from templates using debug commands Mordred 2018-09-13 22:14:31 +02:00
• eccb946a4c Mobs can now be spawned from templates using debug commands Mordred 2018-09-13 22:14:31 +02:00
• 0b97f8e68c Merge pull request #382 from takhlaq/develop Mordred 2018-09-13 12:41:35 +02:00
• 56e346b946
  Merge pull request #382 from takhlaq/develop Mordred 2018-09-13 12:41:35 +02:00
• 1834d8e3d2 moved examine packet to its own class - fixed accessory display in examine packet - fixed accessory display in playerspawn packet Tahir Akhlaq 2018-09-13 11:08:24 +01:00
• 5ca9b8f90b moved examine packet to its own class - fixed accessory display in examine packet - fixed accessory display in playerspawn packet Tahir Akhlaq 2018-09-13 11:08:24 +01:00
• b3794218a5 Merge pull request #4 from AcedArmy/develop Tahir Akhlaq 2018-09-12 12:30:24 +01:00
• 0796644a21
  Merge pull request #4 from AcedArmy/develop Tahir Akhlaq 2018-09-12 12:30:24 +01:00
• 80942a168c Add some missing examine unknowns Biscuit Boy 2018-09-12 17:58:19 +10:00
• 46f79fca4e Add some missing examine unknowns Biscuit Boy 2018-09-12 17:58:19 +10:00
• 629b54ce39 added equip models for examine (todo: main/sub/accessories) - added stub for item crafter name request Tahir Akhlaq 2018-09-11 17:46:04 +01:00
• 8d6ec91757 added equip models for examine (todo: main/sub/accessories) - added stub for item crafter name request Tahir Akhlaq 2018-09-11 17:46:04 +01:00
• 18dc8aa377 More BNpc work, close to actual spawning Mordred 2018-09-10 23:57:14 +02:00
• 01a147b561 More BNpc work, close to actual spawning Mordred 2018-09-10 23:57:14 +02:00
• f7f5992abd moved examine handling out of client trigger switch and into its own function Tahir Akhlaq 2018-09-10 15:01:13 +01:00
• e487a9ae24 moved examine handling out of client trigger switch and into its own function Tahir Akhlaq 2018-09-10 15:01:13 +01:00
• bffebd0bc7 added basic examine functionality - todo: fix gear models not displaying Tahir Akhlaq 2018-09-10 14:34:24 +01:00
• afc4d89d22 added basic examine functionality - todo: fix gear models not displaying Tahir Akhlaq 2018-09-10 14:34:24 +01:00
• df3b6774dd Update bnpctemplate.sql Mordred 2018-09-10 15:33:50 +02:00
• 772c63dd8a
  Update bnpctemplate.sql Mordred 2018-09-10 15:33:50 +02:00
• a5fabcf818 Update bnpctemplate.sql Mordred 2018-09-10 15:20:29 +02:00
• 9b8b68b468
  Update bnpctemplate.sql Mordred 2018-09-10 15:20:29 +02:00
• 9624d08b4c Working towards getting bnpcs back in the game Mordred 2018-09-09 23:56:22 +02:00
• 0d767e4986 Working towards getting bnpcs back in the game Mordred 2018-09-09 23:56:22 +02:00
• 27bbd595da
  Merge branch 'develop' into ClassQuest_arc DantestyleXD 2018-09-07 00:37:57 +02:00
• 78e8f98942 Merge pull request #380 from NotAdam/develop Mordred 2018-09-06 14:23:20 +02:00
• 611a68f50d
  Merge pull request #380 from NotAdam/develop Mordred 2018-09-06 14:23:20 +02:00
• 628a8dbd3e [ MSQ ] ManFst005 and ManWil005 added Dantestyle 2018-09-02 02:57:11 +02:00
• 896e4f6383 [ MSQ ] SubSea050 added Dantestyle 2018-09-01 23:02:18 +02:00
• 9017257568 [ MSQ ] SubWil025 added Dantestyle 2018-09-01 22:56:05 +02:00
• bf6a2c6340 typo x2 Dantestyle 2018-09-01 18:32:36 +02:00
• fbe09f2bb8 As per my habit Dantestyle 2018-09-01 17:05:50 +02:00
• 63ef3bafbd [MSQ] SubFst045 + SubSea051 added with a little fix for ManSea001 Dantestyle 2018-09-01 16:52:17 +02:00
• 9832ecb920 cleanup old festival vars NotAdam 2018-09-01 21:34:48 +10:00
• 0cffd54606 cleanup old festival vars NotAdam 2018-09-01 21:34:48 +10:00
• 0946b0636e allow for multiple festivals to run at once NotAdam 2018-09-01 20:55:28 +10:00
• d88efbf30d allow for multiple festivals to run at once NotAdam 2018-09-01 20:55:28 +10:00
• 92d9268e25 fix msvc builds? NotAdam 2018-09-01 14:36:04 +10:00
• 77d59fe664 fix msvc builds? NotAdam 2018-09-01 14:36:04 +10:00
• 72ea5d689b send stain/durability NotAdam 2018-09-01 00:00:19 +10:00
• 24c3c92b7f send stain/durability NotAdam 2018-09-01 00:00:19 +10:00
• 81bfd18b77 sql cleanup/improvements, add some fields for durability/stain NotAdam 2018-08-31 23:25:53 +10:00
• 8b00fe6012 sql cleanup/improvements, add some fields for durability/stain NotAdam 2018-08-31 23:25:53 +10:00
• 39e4cf09b9 incredible NotAdam 2018-08-31 23:02:45 +10:00
• 23344c02e6 incredible NotAdam 2018-08-31 23:02:45 +10:00
• d300c0a77e item handin collection & fix quest abandon NotAdam 2018-08-31 22:57:33 +10:00
• e0d6c1024e item handin collection & fix quest abandon NotAdam 2018-08-31 22:57:33 +10:00
• 016d1963f2 How did that slip through over all this time.. Mordred 2018-08-30 13:33:08 +02:00
• 4946d18583
  How did that slip through over all this time.. Mordred 2018-08-30 13:33:08 +02:00
• 3a3b86203c Update CONTRIBUTING.md Mordred 2018-08-30 13:32:12 +02:00
• c14ce6205c Update submodules and editorconfig Mordred Admin 2018-08-30 13:38:40 +02:00
• 4b18ca0dcf
  Update CONTRIBUTING.md Mordred 2018-08-30 13:32:12 +02:00
• e6d827342b Update submodules and editorconfig Mordred Admin 2018-08-30 13:38:40 +02:00
• 7655f4ca63 Update CONTRIBUTING.md Mordred 2018-08-30 13:31:33 +02:00
• 87478ea541
  Update CONTRIBUTING.md Mordred 2018-08-30 13:31:33 +02:00
• 8a9e0b027d Updated .editorconfig for 2 spaces Mordred 2018-08-30 11:39:39 +02:00
• 1552268dae
  Updated .editorconfig for 2 spaces Mordred 2018-08-30 11:39:39 +02:00
• 89dbbab066 Properly use new classes... at least let this compile Mordred 2018-08-29 22:03:10 +02:00
• d221758355 Properly use new classes... at least let this compile Mordred 2018-08-29 22:03:10 +02:00
• 51a292415e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-08-29 21:42:34 +02:00
• ab5f0c6955 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-08-29 21:42:34 +02:00
• e745bd0329 Code style adjusted for 2 spaces and various other small things, checkout CodeStyle.xml for details Mordred 2018-08-29 21:40:59 +02:00
• 89a9b16555 Code style adjusted for 2 spaces and various other small things, checkout CodeStyle.xml for details Mordred 2018-08-29 21:40:59 +02:00
• b3fd4c7e64 Merge pull request #379 from NotAdam/develop Mordred 2018-08-29 12:01:06 +02:00
• fc6dde28dc
  Merge pull request #379 from NotAdam/develop Mordred 2018-08-29 12:01:06 +02:00
• e32cf610af fix mob_parse on linux NotAdam 2018-08-29 19:58:48 +10:00
• 9c0b1235ad fix mob_parse on linux NotAdam 2018-08-29 19:58:48 +10:00
• 2a74f6908e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-08-28 19:07:53 +02:00
• 34c0f74139 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-08-28 19:07:53 +02:00
• eb5a567730 Simplified actorcontrol creation Mordred 2018-08-28 19:05:52 +02:00
• 7f7588ef1f Simplified actorcontrol creation Mordred 2018-08-28 19:05:52 +02:00
• b6d34fde3d Merge pull request #378 from AcedArmy/develop Mordred 2018-08-28 08:30:45 +02:00
• db856f5907
  Merge pull request #378 from AcedArmy/develop Mordred 2018-08-28 08:30:45 +02:00
• d134f2014e forgot space Biscuit Boy 2018-08-28 15:09:03 +10:00