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

• ca5d1d3982 gcc warnings ShelbyZ 2017-11-01 22:24:50 -07:00
• 9fd4155121 Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into gcc_warnings ShelbyZ 2017-11-01 21:45:34 -07:00
• 1592afd664 Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into gcc_warnings ShelbyZ 2017-11-01 21:45:34 -07:00
• 4b9fe8e1a8 fixed a sql but when grabbing a new 64 bit uid Mordred 2017-11-01 23:28:32 +01:00
• 54031902ee fixed a sql but when grabbing a new 64 bit uid Mordred 2017-11-01 23:28:32 +01:00
• b8441c009f Merge pull request #163 from goaaats/master Mordred 2017-10-31 14:12:19 +01:00
• 4710eacb76
  Merge pull request #163 from goaaats/master Mordred 2017-10-31 14:12:19 +01:00
• c23860a61d Set debug working path for generated solutions goaaats 2017-10-31 13:36:03 +01:00
• fe278843c7 Set debug working path for generated solutions goaaats 2017-10-31 13:36:03 +01:00
• c6acf51957 Merge pull request #162 from ShelbyZ/last_warnings Mordred 2017-10-31 07:58:04 +01:00
• c05d665358
  Merge pull request #162 from ShelbyZ/last_warnings Mordred 2017-10-31 07:58:04 +01:00
• 9aeda0dadc Silence unchecked iterators for server_rest ShelbyZ 2017-10-30 19:11:54 -07:00
• e8b25f1562 Silence unchecked iterators for server_rest ShelbyZ 2017-10-30 19:11:54 -07:00
• 9c13feb9c5 Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into last_warnings ShelbyZ 2017-10-30 16:31:55 -07:00
• 6134b7006c Merge remote-tracking branch 'refs/remotes/SapphireMordred/master' into last_warnings ShelbyZ 2017-10-30 16:31:55 -07:00
• c41353cf4f Merge pull request #161 from itsMaru/SQL_REWRITE_OWN Mordred 2017-10-30 22:06:51 +01:00
• 04c7b9d78d
  Merge pull request #161 from itsMaru/SQL_REWRITE_OWN Mordred 2017-10-30 22:06:51 +01:00
• 83353086be Small acc creation fixes; Maru 2017-10-30 01:17:49 -02:00
• 42c3becd8f Small acc creation fixes; Maru 2017-10-30 01:17:49 -02:00
• 9d7e071b1c Removed old database class entirely, some minor cleanups Mordred 2017-10-28 22:47:25 +02:00
• 42df7b7d13 Removed old database class entirely, some minor cleanups Mordred 2017-10-28 22:47:25 +02:00
• a73e9850e0 libraries updated Mordred 2017-10-28 01:34:34 +02:00
• dbdf3c0016 libraries updated Mordred 2017-10-28 01:34:34 +02:00
• 4d167ad22f Simplified usage of new database class Mordred Admin 2017-10-27 14:01:50 +02:00
• 19decb8e39 Simplified usage of new database class Mordred Admin 2017-10-27 14:01:50 +02:00
• 55dcdc2b87 Removed unnused includes Mordred Admin 2017-10-27 09:06:16 +02:00
• 50c68c4468 Removed unnused includes Mordred Admin 2017-10-27 09:06:16 +02:00
• 186c6792a9 updated submodules once again Mordred Admin 2017-10-27 08:45:23 +02:00
• d85b172799 updated submodules once again Mordred Admin 2017-10-27 08:45:23 +02:00
• ee919e4e2c Updated submodules Mordred Admin 2017-10-27 08:43:45 +02:00
• 95960fa509 Updated submodules Mordred Admin 2017-10-27 08:43:45 +02:00
• 55d10a16ea Almost done porting... Mordred 2017-10-27 00:10:13 +02:00
• db5cf9c45c Almost done porting... Mordred 2017-10-27 00:10:13 +02:00
• c8207c8537 Ported DebugCommandHandler naively Mordred Admin 2017-10-26 15:22:58 +02:00
• dff1a5a28e Ported DebugCommandHandler naively Mordred Admin 2017-10-26 15:22:58 +02:00
• 491cdcd59a Removed reference to database where unused Mordred Admin 2017-10-26 14:40:58 +02:00
• 7e3c03ca32 Removed reference to database where unused Mordred Admin 2017-10-26 14:40:58 +02:00
• 8f935492f4 Old db class removed entirely from REST server. Also some cleanups Mordred Admin 2017-10-26 12:16:34 +02:00
• ff859cebfb Old db class removed entirely from REST server. Also some cleanups Mordred Admin 2017-10-26 12:16:34 +02:00
• 48f2069072 Fixed a overflow warning and return type error Mordred Admin 2017-10-26 08:33:05 +02:00
• f6354736da Fixed a overflow warning and return type error Mordred Admin 2017-10-26 08:33:05 +02:00
• d7b54b5b6d PlayerMinimal almost completely ported Mordred 2017-10-26 00:13:41 +02:00
• a8c1741964 PlayerMinimal almost completely ported Mordred 2017-10-26 00:13:41 +02:00
• d73246a4c9 Initial inventory container creation ported Mordred 2017-10-25 23:24:47 +02:00
• 00e717491b Initial inventory container creation ported Mordred 2017-10-25 23:24:47 +02:00
• 2113e45a5b Merge http://www.github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN Mordred Admin 2017-10-25 14:49:35 +02:00
• ec72cf6836 Merge http://www.github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN Mordred Admin 2017-10-25 14:49:35 +02:00
• 4364d1aa2c Merge 63554cba23 into 5c69e98c46 perize 2017-10-24 21:00:08 +00:00
• e27b348971 Merge pull request #159 from ShelbyZ/unbork_rest Mordred 2017-10-24 22:59:49 +02:00
• 5c69e98c46 Merge pull request #159 from ShelbyZ/unbork_rest Mordred 2017-10-24 22:59:49 +02:00
• a837bd1db7 Merge Maru 2017-10-24 16:01:04 -02:00
• 7b7038bac2 Merge Maru 2017-10-24 16:01:04 -02:00
• 5c1015fc2a Path comparison is causing issues ShelbyZ 2017-10-24 10:51:51 -07:00
• b202703afb Path comparison is causing issues ShelbyZ 2017-10-24 10:51:51 -07:00
• 63554cba23 Test commit Perize 2017-10-24 15:31:11 +09:00
• d5e24c97e5 Merge pull request #157 from ShelbyZ/static_cast_round_2 Mordred 2017-10-24 07:52:43 +02:00
• 64eac677a5 Merge pull request #157 from ShelbyZ/static_cast_round_2 Mordred 2017-10-24 07:52:43 +02:00
• 419df1ea88 new layout for charaquest table Mordred 2017-10-24 00:00:22 +02:00
• 6bdcc79ede new layout for charaquest table Mordred 2017-10-24 00:00:22 +02:00
• 73286e24ca fixed an issue with binary fields bit read incorrectly Mordred 2017-10-23 23:55:25 +02:00
• 3564964a8a fixed an issue with binary fields bit read incorrectly Mordred 2017-10-23 23:55:25 +02:00
• 3ae890cc78 Fixing linkshellid to uint64_t ShelbyZ 2017-10-23 08:33:47 -07:00
• 24f937fd61 Fixing linkshellid to uint64_t ShelbyZ 2017-10-23 08:33:47 -07:00
• ca2691d45c Merge pull request #155 from ShelbyZ/unchecked_iters Mordred 2017-10-23 08:08:28 +02:00
• 86cd16f5c1 Merge pull request #155 from ShelbyZ/unchecked_iters Mordred 2017-10-23 08:08:28 +02:00
• ff832b298a Merge pull request #156 from ShelbyZ/upgrade_item_quantity_bitness Mordred 2017-10-23 08:08:07 +02:00
• 792db89718 Merge pull request #156 from ShelbyZ/upgrade_item_quantity_bitness Mordred 2017-10-23 08:08:07 +02:00
• 05e5221f2e More static_cast ShelbyZ 2017-10-22 20:51:25 -07:00
• c9a53b5d2b More static_cast ShelbyZ 2017-10-22 20:51:25 -07:00
• 6ed2a850c7 Quantity treated as uint32_t at packet level ShelbyZ 2017-10-22 18:53:58 -07:00
• 818f617661 Quantity treated as uint32_t at packet level ShelbyZ 2017-10-22 18:53:58 -07:00
• 5f38a17663 Addressing unchecked iterator issues with core project ShelbyZ 2017-10-22 18:11:00 -07:00
• b15fc7164c Addressing unchecked iterator issues with core project ShelbyZ 2017-10-22 18:11:00 -07:00
• 09d565a854 Merge pull request #154 from ShelbyZ/compiler_flags Mordred 2017-10-22 20:08:01 +02:00
• d37efcef52 Merge pull request #154 from ShelbyZ/compiler_flags Mordred 2017-10-22 20:08:01 +02:00
• b17098414b Need to disable SAFESEH before /ZI ShelbyZ 2017-10-22 10:43:33 -07:00
• a162a7caea Need to disable SAFESEH before /ZI ShelbyZ 2017-10-22 10:43:33 -07:00
• 4d2c890aba Merge pull request #152 from GokuWeedLord/feature/launcherchanges Mordred 2017-10-22 18:40:33 +02:00
• f87ac64fec Merge pull request #152 from GokuWeedLord/feature/launcherchanges Mordred 2017-10-22 18:40:33 +02:00
• 5840b2b7fd Merge e5c1dcc78c into c2223f52b5 Shelby Hagman 2017-10-22 16:30:18 +00:00
• c6c3bf4a25 Removing comment ShelbyZ 2017-10-22 09:29:22 -07:00
• e5c1dcc78c Removing comment ShelbyZ 2017-10-22 09:29:22 -07:00
• 08366ae11c Correctly applying /ZI for debug ShelbyZ 2017-10-22 09:28:19 -07:00
• 1d511299f8 Correctly applying /ZI for debug ShelbyZ 2017-10-22 09:28:19 -07:00
• 531d5cf9be _blank creates an empty frame while opening the page in the default web browser GokuWeedLord 2017-10-22 21:46:55 +11:00
• 80d623ae95 _blank creates an empty frame while opening the page in the default web browser GokuWeedLord 2017-10-22 21:46:55 +11:00
• 0b5d55abea add server commit history to login page GokuWeedLord 2017-10-22 21:39:54 +11:00
• 0429cd9d1c add server commit history to login page GokuWeedLord 2017-10-22 21:39:54 +11:00
• 876e6045df Merge pull request #151 from ShelbyZ/compiler_flags Mordred 2017-10-22 11:02:46 +02:00
• c2223f52b5 Merge pull request #151 from ShelbyZ/compiler_flags Mordred 2017-10-22 11:02:46 +02:00
• f303307fd0 Merge pull request #150 from ShelbyZ/unreferenced Mordred 2017-10-22 11:01:56 +02:00
• 711243f302 Merge pull request #150 from ShelbyZ/unreferenced Mordred 2017-10-22 11:01:56 +02:00
• 9065b4ccea Fix up Flags around Edit and Continue ShelbyZ 2017-10-21 22:09:03 -07:00
• e50fd76062 Fix up Flags around Edit and Continue ShelbyZ 2017-10-21 22:09:03 -07:00
• 35906f3af3 Remove unreferenced parameters ShelbyZ 2017-10-21 20:47:50 -07:00
• f8796e1ecc Remove unreferenced parameters ShelbyZ 2017-10-21 20:47:50 -07:00
• 013a875a8d Merge pull request #149 from GokuWeedLord/feature/debugfixes Mordred 2017-10-21 16:51:23 +02:00
• b0e7c74dd9 Merge pull request #149 from GokuWeedLord/feature/debugfixes Mordred 2017-10-21 16:51:23 +02:00
• 7db9ea07d6 !unlock and !help debug commands GokuWeedLord 2017-10-21 23:41:09 +11:00
• 7707b4a750 !unlock and !help debug commands GokuWeedLord 2017-10-21 23:41:09 +11:00