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

#976

#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

Mono Color

• d2dc84fa83 Merge pull request #477 from NotAdam/develop Mordred 2019-01-10 16:57:18 +01:00
• dd381b16d5
  Merge pull request #477 from NotAdam/develop Mordred 2019-01-10 16:57:18 +01:00
• d3e6514af1 change itemcontainer back to use u8s for slots, some cleanup NotAdam 2019-01-10 22:01:58 +11:00
• 0c672c4bb9 change itemcontainer back to use u8s for slots, some cleanup NotAdam 2019-01-10 22:01:58 +11:00
• a1b4f98032 slightly change behaviour for items that can't be loaded for a house NotAdam 2019-01-10 21:08:19 +11:00
• 746b6109a6 slightly change behaviour for items that can't be loaded for a house NotAdam 2019-01-10 21:08:19 +11:00
• c1f7d9ddef cleanup old setrot calls using float -> u16 NotAdam 2019-01-10 20:50:16 +11:00
• 61ae4cb887 cleanup old setrot calls using float -> u16 NotAdam 2019-01-10 20:50:16 +11:00
• 6e6ffc7cf3 fix housing object init structure, game no longer crashes/doesn't load NotAdam 2019-01-10 20:38:27 +11:00
• 25023e2ed1 fix housing object init structure, game no longer crashes/doesn't load NotAdam 2019-01-10 20:38:27 +11:00
• 22e73a0da8 additional playerspawn fields and fix logging into housing zones NotAdam 2019-01-10 17:34:22 +11:00
• 93df29e22e additional playerspawn fields and fix logging into housing zones NotAdam 2019-01-10 17:34:22 +11:00
• c03dc6dc80 initial pass to fix housing issues NotAdam 2019-01-10 15:03:25 +11:00
• da40b9e97f initial pass to fix housing issues NotAdam 2019-01-10 15:03:25 +11:00
• 1cc38c0cca Fixed black screen on new character, fixed servernotice size, initial initui adjustments. Mordred 2019-01-09 23:57:49 +01:00
• cfabc721dd Fixed black screen on new character, fixed servernotice size, initial initui adjustments. Mordred 2019-01-09 23:57:49 +01:00
• 07d0dc59ea Merge pull request #471 from JeidoUran/crashes_fix Adam 2019-01-09 18:58:06 +11:00
• 3da3852861
  Merge pull request #471 from JeidoUran/crashes_fix Adam 2019-01-09 18:58:06 +11:00
• 2a626ebc29 Added a field for bluemage to player Mordred 2019-01-08 23:58:14 +01:00
• 11433f8ead Added a field for bluemage to player Mordred 2019-01-08 23:58:14 +01:00
• 902e78e432 style Dantestyle 2019-01-08 23:28:19 +01:00
• 734bad10be Merge pull request #476 from takhlaq/develop Mordred 2019-01-08 21:40:46 +01:00
• 033b05a0eb
  Merge pull request #476 from takhlaq/develop Mordred 2019-01-08 21:40:46 +01:00
• 062f2d3114 apparently /std:c++17 is needed even if CMAKE_CXX_COMPILER is 17 Tahir Akhlaq 2019-01-08 20:35:41 +00:00
• ae44a58bcc apparently /std:c++17 is needed even if CMAKE_CXX_COMPILER is 17 Tahir Akhlaq 2019-01-08 20:35:41 +00:00
• 5b90ca72cc Updated CommonGen.h for bluemage Mordred 2019-01-08 21:20:37 +01:00
• 3f62c65aea Updated CommonGen.h for bluemage Mordred 2019-01-08 21:20:37 +01:00
• e1875bc4c8 Even more opcode updates Mordred 2019-01-08 17:26:13 +01:00
• 47911e924f Even more opcode updates Mordred 2019-01-08 17:26:13 +01:00
• 69f8fe13ac Further opdating opcodes Mordred 2019-01-08 17:12:13 +01:00
• 9a3d84b6b2 Further opdating opcodes Mordred 2019-01-08 17:12:13 +01:00
• 6f0f05eb30 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2019-01-08 17:09:18 +01:00
• 7fa7cc8716 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2019-01-08 17:09:18 +01:00
• fcf5ef93e5 Merge pull request #475 from NotAdam/develop Mordred 2019-01-08 17:09:12 +01:00
• eaf7362f4e
  Merge pull request #475 from NotAdam/develop Mordred 2019-01-08 17:09:12 +01:00
• da67f6cae8 Very rudementary spawn implementation and db fix Mordred 2019-01-08 17:08:48 +01:00
• 195066b836 Very rudementary spawn implementation and db fix Mordred 2019-01-08 17:08:48 +01:00
• bddea64189 update client opcode update comments NotAdam 2019-01-08 22:50:16 +11:00
• 52e8425dfe update client opcode update comments NotAdam 2019-01-08 22:50:16 +11:00
• 76ea5d8a27 fix spawnpoint schema causing inserts to fail NotAdam 2019-01-08 22:37:29 +11:00
• b53f7e3b37 fix spawnpoint schema causing inserts to fail NotAdam 2019-01-08 22:37:29 +11:00
• 9f146f1bde fix initzone packet size/structure NotAdam 2019-01-08 21:49:31 +11:00
• a8732e4828 fix initzone packet size/structure NotAdam 2019-01-08 21:49:31 +11:00
• 32d55eff72 attempt at fixing client opcodes NotAdam 2019-01-08 20:36:31 +11:00
• c802b7f03b attempt at fixing client opcodes NotAdam 2019-01-08 20:36:31 +11:00
• b4a972c514 probably working server opcodes for 4.5 NotAdam 2019-01-08 19:36:22 +11:00
• 8ee41a461c probably working server opcodes for 4.5 NotAdam 2019-01-08 19:36:22 +11:00
• 47d18182c0 manually merge in some exd changes and some 4.5 opcodes NotAdam 2019-01-08 18:08:51 +11:00
• 8d183e4193 manually merge in some exd changes and some 4.5 opcodes NotAdam 2019-01-08 18:08:51 +11:00
• d2135592d0 Merge pull request #473 from NotAdam/develop Mordred 2019-01-07 13:43:55 +01:00
• c4a8bfa3f8
  Merge pull request #473 from NotAdam/develop Mordred 2019-01-07 13:43:55 +01:00
• 2776ecd6d4 update ini reading to use 'general' instead of 'parameters' NotAdam 2019-01-07 23:31:04 +11:00
• 6fea0a30e1 update ini reading to use 'general' instead of 'parameters' NotAdam 2019-01-07 23:31:04 +11:00
• 35def4d4f2 refactor parameters to general, fix build error NotAdam 2019-01-07 23:26:34 +11:00
• 4397c86dae refactor parameters to general, fix build error NotAdam 2019-01-07 23:26:34 +11:00
• 047d0328e0 remove old shit NotAdam 2019-01-07 23:20:50 +11:00
• 3cfc79e842 remove old shit NotAdam 2019-01-07 23:20:50 +11:00
• eb56f5fda2 cleanup db connection config NotAdam 2019-01-07 23:16:01 +11:00
• 5ec2d23a12 cleanup db connection config NotAdam 2019-01-07 23:16:01 +11:00
• bf0324cfea everything should be working again... NotAdam 2019-01-07 23:08:43 +11:00
• aa73b1c668 everything should be working again... NotAdam 2019-01-07 23:08:43 +11:00
• 03df0b242c lobby works again with new config stuff NotAdam 2019-01-07 23:00:09 +11:00
• cd1d8f8126 lobby works again with new config stuff NotAdam 2019-01-07 23:00:09 +11:00
• 3521ae7c8d shift a lot of config around NotAdam 2019-01-07 22:11:52 +11:00
• 7666e84693 shift a lot of config around NotAdam 2019-01-07 22:11:52 +11:00
• fff5951255 Merge remote-tracking branch 'origin/develop' mordred 2019-01-07 08:12:19 +01:00
• b6a0146d7b Merge remote-tracking branch 'origin/develop' v4.45 mordred 2019-01-07 08:12:19 +01:00
• 3f313fffd2 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2019-01-06 23:34:32 +01:00
• d6ec411c3c Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2019-01-06 23:34:32 +01:00
• c1a3fa5915 Extended schema for spawnpoints Mordred 2019-01-06 23:34:19 +01:00
• 5232909ccb Extended schema for spawnpoints Mordred 2019-01-06 23:34:19 +01:00
• 33de98df68 correct declare for arrays Dantestyle 2019-01-06 18:02:28 +01:00
• 880ea0a336 Added prepareZoning research + fixed typo JeidoUran 2019-01-06 16:32:06 +01:00
• 9c90b34c2b Added prepareZoning research + fixed typo JeidoUran 2019-01-06 16:32:06 +01:00
• 73f261927b More GM Call/Jump fixes JeidoUran 2019-01-06 16:25:51 +01:00
• ca3851d7d4 More GM Call/Jump fixes JeidoUran 2019-01-06 16:25:51 +01:00
• 092b343114 move all the old config calls to the new config object NotAdam 2019-01-07 00:03:48 +11:00
• c15f9be174 move all the old config calls to the new config object NotAdam 2019-01-07 00:03:48 +11:00
• 3349ccce42 initial move of all config items to a object NotAdam 2019-01-06 23:39:30 +11:00
• d0059f0717 initial move of all config items to a object NotAdam 2019-01-06 23:39:30 +11:00
• fc93308939 potential fix for missing cmake command under some configurations NotAdam 2019-01-06 17:38:34 +11:00
• 3a09cf8732 potential fix for missing cmake command under some configurations NotAdam 2019-01-06 17:38:34 +11:00
• 12c053cdda Changed 'u3b' to 'isGm' and made it a bool JeidoUran 2019-01-06 04:48:24 +01:00
• a5e6ca82ab Changed 'u3b' to 'isGm' and made it a bool JeidoUran 2019-01-06 04:48:24 +01:00
• 4678cfde3a Merge branch 'develop' into crashes_fix JeidoUran 2019-01-06 02:22:09 +01:00
• 8f1e7323d9 Merge branch 'develop' into crashes_fix JeidoUran 2019-01-06 02:22:09 +01:00
• e90bfc8dd2 Merge remote-tracking branch 'SapphireServer/develop' into develop JeidoUran 2019-01-06 02:20:17 +01:00
• bb2600b7f9 Merge remote-tracking branch 'SapphireServer/develop' into develop JeidoUran 2019-01-06 02:20:17 +01:00
• dbb93a3d94 Merge branch 'develop' into crashes_fix JeidoUran 2019-01-06 02:14:25 +01:00
• 4aa19d5ec0 Merge branch 'develop' into crashes_fix JeidoUran 2019-01-06 02:14:25 +01:00
• caee2ad1e7 Third Dantestyle 2019-01-06 02:12:55 +01:00
• 15e206430a Sending a /tell while acting as a GM will send a GM Tell JeidoUran 2019-01-06 02:03:33 +01:00
• 193288929d Sending a /tell while acting as a GM will send a GM Tell JeidoUran 2019-01-06 02:03:33 +01:00
• 32bfdefbc0 GM Jumping no longer crashes the server if used across instances, and works like GM Call JeidoUran 2019-01-06 01:47:07 +01:00
• 5d9084c279 GM Jumping no longer crashes the server if used across instances, and works like GM Call JeidoUran 2019-01-06 01:47:07 +01:00
• 265201b5d7 Second revision of quest_parse Dantestyle 2019-01-06 01:45:25 +01:00
• 40743986c3 First revision of quest_parse Dantestyle 2019-01-06 01:00:35 +01:00
• 2701872112 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred 2019-01-06 00:27:37 +01:00
• aea0bf333a Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred 2019-01-06 00:27:37 +01:00
• 572a6e1257 Updated sendNotice and sendUrgent calls Mordred 2019-01-06 00:26:26 +01:00