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

• ac958f2e06 Update CONTRIBUTING.md Mordred 2017-12-04 15:48:46 +01:00
• 0eb5c4d182
  Update CONTRIBUTING.md Mordred 2017-12-04 15:48:46 +01:00
• 7504ab5ebf Merge branch 'master' of https://github.com/SapphireMordred/Sapphire into party_crap Maru 2017-12-04 08:01:14 -02:00
• 0e8f3ea6db Cleanup and simplification of rest server Mordred Admin 2017-12-04 11:00:08 +01:00
• 65e90edb1b Cleanup and simplification of rest server Mordred Admin 2017-12-04 11:00:08 +01:00
• 51f2ec961e Merge Maru 2017-12-04 07:37:58 -02:00
• bfc550be2b Moved new orchestrion field to update.sql Mordred 2017-12-03 23:43:45 +01:00
• d797123742 Moved new orchestrion field to update.sql Mordred 2017-12-03 23:43:45 +01:00
• ca90e8ce6f Merge pull request #190 from goaaats/work Mordred 2017-12-03 19:36:35 +01:00
• 49e5465017
  Merge pull request #190 from goaaats/work Mordred 2017-12-03 19:36:35 +01:00
• 6a3686f413 * Forgot SQL file goaaats 2017-12-03 19:24:54 +01:00
• 8152f67959 * Forgot SQL file goaaats 2017-12-03 19:24:54 +01:00
• 81efd6f015 Merge pull request #189 from goaaats/work Mordred 2017-12-03 18:13:21 +01:00
• 0a0304d157
  Merge pull request #189 from goaaats/work Mordred 2017-12-03 18:13:21 +01:00
• bbac0d5169 Moved rotation funciton, not inlined anymore Mordred 2017-12-03 18:11:56 +01:00
• aa2cfb5685 Moved rotation funciton, not inlined anymore Mordred 2017-12-03 18:11:56 +01:00
• a71bd83a7c * Orchestrion + Mount SQL loading/saving goaaats 2017-12-03 17:24:11 +01:00
• 7a0d932f82 * Orchestrion + Mount SQL loading/saving goaaats 2017-12-03 17:24:11 +01:00
• 60c1d56e73 Merge pull request #188 from goaaats/work Mordred 2017-12-02 23:58:22 +01:00
• 1edfc8490d
  Merge pull request #188 from goaaats/work Mordred 2017-12-02 23:58:22 +01:00
• b7de4d5762 * Better fix for logout issue goaaats 2017-12-02 20:45:31 +01:00
• 91b8aec97d * Better fix for logout issue goaaats 2017-12-02 20:45:31 +01:00
• 78eaa2d833 * Fix logout dc goaaats 2017-12-02 17:50:08 +01:00
• 497f555eb4 * Fix logout dc goaaats 2017-12-02 17:50:08 +01:00
• 7019e2368b * Add def for legacy mark equip flag goaaats 2017-12-02 17:49:38 +01:00
• dbe289385a * Add def for legacy mark equip flag goaaats 2017-12-02 17:49:38 +01:00
• f8fec2fb5b Qualifier removed from generated file aswell as from generator itself, once again. Mordred Admin 2017-12-01 08:44:21 +01:00
• 1e29e66101 Qualifier removed from generated file aswell as from generator itself, once again. Mordred Admin 2017-12-01 08:44:21 +01:00
• 7c82ae8264 Remove the right extra qualifier this time Mordred 2017-12-01 00:06:50 +01:00
• a42dbd7b96 Remove the right extra qualifier this time Mordred 2017-12-01 00:06:50 +01:00
• 954b4a9173 wrong change... not supposed to remove qualifier on header Mordred 2017-12-01 00:03:24 +01:00
• b5500d2f64 wrong change... not supposed to remove qualifier on header Mordred 2017-12-01 00:03:24 +01:00
• 35409e1cc7 we sure want linux to build this too Mordred 2017-12-01 00:01:19 +01:00
• 791a1dfb7e we sure want linux to build this too Mordred 2017-12-01 00:01:19 +01:00
• af4f3229a9 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred 2017-11-30 23:43:39 +01:00
• f01eaf5710 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred 2017-11-30 23:43:39 +01:00
• e75c392b9f Greatly improved exd struct gen and also updated struct test Mordred 2017-11-30 23:41:27 +01:00
• 6b4cc97f4d Greatly improved exd struct gen and also updated struct test Mordred 2017-11-30 23:41:27 +01:00
• fdb52038db Merge pull request #187 from ayyaruq/fix/cmake-vs2017 Mordred 2017-11-30 15:38:42 +01:00
• 1a4667b9eb
  Merge pull request #187 from ayyaruq/fix/cmake-vs2017 Mordred 2017-11-30 15:38:42 +01:00
• 7f96238a92 Add VS2017 generator definitions Ay'yaruq Dotharl 2017-12-01 01:02:01 +11:00
• 345aa4deb1
  Add VS2017 generator definitions Ay'yaruq Dotharl 2017-12-01 01:02:01 +11:00
• 8174d4082c Even more refactoring for cleaner code Mordred 2017-11-28 17:43:00 +01:00
• 2a3fd0ff96 Even more refactoring for cleaner code Mordred 2017-11-28 17:43:00 +01:00
• ff0f793cb9 Enforcing style rules Mordred 2017-11-28 17:29:06 +01:00
• d0cb635ce3 Enforcing style rules Mordred 2017-11-28 17:29:06 +01:00
• 98fe5f7bbd More code quality improvment in script manager Mordred 2017-11-28 17:22:19 +01:00
• cf29b9e80c More code quality improvment in script manager Mordred 2017-11-28 17:22:19 +01:00
• 26a80fbcc6 Refactoring of event name generation Mordred 2017-11-28 17:16:12 +01:00
• f900bec801 Refactoring of event name generation Mordred 2017-11-28 17:16:12 +01:00
• 935f5f5eba Applied template simplification to chat channel packets Mordred 2017-11-28 17:06:44 +01:00
• 23a32e67db Applied template simplification to chat channel packets Mordred 2017-11-28 17:06:44 +01:00
• bd4dc893c4 refactoring various files Mordred 2017-11-28 00:09:36 +01:00
• 5f5ce9970b refactoring various files Mordred 2017-11-28 00:09:36 +01:00
• 7d00d5cb40 Merge pull request #186 from reiichi001/master Mordred 2017-11-27 19:51:50 +01:00
• ce9b8579a1
  Merge pull request #186 from reiichi001/master Mordred 2017-11-27 19:51:50 +01:00
• 9f7aefacc3 Add a more windows-friendly SQL import script. Always runs update.sql last. Robert Baker 2017-11-27 09:53:20 -08:00
• 7352a24a07 Add a more windows-friendly SQL import script. Always runs update.sql last. Robert Baker 2017-11-27 09:53:20 -08:00
• c65658e47b renamed type in actors to ObjKind as thats what it is called internally, also less ambugious to modelType which i also added an enum for Mordred 2017-11-26 01:12:26 +01:00
• 4c71428dc2 renamed type in actors to ObjKind as thats what it is called internally, also less ambugious to modelType which i also added an enum for Mordred 2017-11-26 01:12:26 +01:00
• 86cb3ace56 Merge pull request #185 from ayyaruq/fix/faster-travis Mordred 2017-11-25 22:23:23 +01:00
• 329e27a6e9
  Merge pull request #185 from ayyaruq/fix/faster-travis Mordred 2017-11-25 22:23:23 +01:00
• 7ed3ee6f80 Merge pull request #184 from ayyaruq/bugfix/183-hardcoded-chaiscripts-path Mordred 2017-11-25 22:22:23 +01:00
• a12d293b92
  Merge pull request #184 from ayyaruq/bugfix/183-hardcoded-chaiscripts-path Mordred 2017-11-25 22:22:23 +01:00
• 162e0046a1 Merge pull request #179 from GokuWeedLord/fix/charupdatetime Mordred 2017-11-25 22:21:46 +01:00
• 0bc24c0070
  Merge pull request #179 from GokuWeedLord/fix/charupdatetime Mordred 2017-11-25 22:21:46 +01:00
• d309f60d69 Update Travis config for hopefully builds Ay'yaruq Dotharl 2017-11-26 02:05:20 +11:00
• 0cfe37703c
  Update Travis config for hopefully builds Ay'yaruq Dotharl 2017-11-26 02:05:20 +11:00
• 12a0c75cbd Fix #183 hardcoded Chai scripts path Ay'yaruq Dotharl 2017-11-26 00:38:33 +11:00
• 9e900520a6
  Fix #183 hardcoded Chai scripts path Ay'yaruq Dotharl 2017-11-26 00:38:33 +11:00
• d10ce7504a Merge remote-tracking branch 'origin/SQL_REWRITE_OWN' Mordred 2017-11-25 00:24:30 +01:00
• e4ffaedf1f Merge remote-tracking branch 'origin/SQL_REWRITE_OWN' Mordred 2017-11-25 00:24:30 +01:00
• b0fef08c45 Use generated ItemUICategory; Check if field for item is valid; Maru 2017-11-24 18:13:42 -02:00
• 7a2f83afb2 Use generated ItemUICategory; Check if field for item is valid; Maru 2017-11-24 18:13:42 -02:00
• e7f3df940d Merge remote-tracking branch 'origin/SQL_REWRITE_OWN' Maru 2017-11-24 17:11:02 -02:00
• add49a250b Merge remote-tracking branch 'origin/SQL_REWRITE_OWN' Maru 2017-11-24 17:11:02 -02:00
• aeae64a8d5 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire into party_crap Tahir Akhlaq 2017-11-24 12:29:24 +00:00
• 3cae806ac3 fix invalid sql GokuWeedLord 2017-11-23 01:30:35 +11:00
• 6f28586a72 fix invalid sql GokuWeedLord 2017-11-23 01:30:35 +11:00
• b0219953ca add sql triggers to update UPDATE_DATE GokuWeedLord 2017-11-22 22:29:40 +11:00
• f12f48eff1 add sql triggers to update UPDATE_DATE GokuWeedLord 2017-11-22 22:29:40 +11:00
• be43ad6233 Revert "fix UPDATE_DATE in charainfo not being updated" GokuWeedLord 2017-11-22 22:23:11 +11:00
• 492b584091 Revert "fix UPDATE_DATE in charainfo not being updated" GokuWeedLord 2017-11-22 22:23:11 +11:00
• 06e6e45a31 fix UPDATE_DATE in charainfo not being updated GokuWeedLord 2017-11-22 21:34:36 +11:00
• 564256385c fix UPDATE_DATE in charainfo not being updated GokuWeedLord 2017-11-22 21:34:36 +11:00
• 2619e34fe0 Merge pull request #177 from perize/SQL_REWRITE_OWN Mordred 2017-11-22 08:22:59 +01:00
• c418b5e528
  Merge pull request #177 from perize/SQL_REWRITE_OWN Mordred 2017-11-22 08:22:59 +01:00
• 01060e20c9 Fix typo Perize 2017-11-22 10:13:49 +09:00
• 8bac927099 Fix typo Perize 2017-11-22 10:13:49 +09:00
• 9825ab9e9f Simplification of packet templates Mordred 2017-11-21 18:43:09 +01:00
• cfc8373f5d Simplification of packet templates Mordred 2017-11-21 18:43:09 +01:00
• 0cdb94f371 Updated submodule Mordred 2017-11-21 18:05:27 +01:00
• e034b46167 Updated submodule Mordred 2017-11-21 18:05:27 +01:00
• 434b483ef5 stub some group manager stuff Tahir Akhlaq 2017-11-21 17:01:05 +00:00
• a13f3bcafe Merge pull request #176 from takhlaq/patch-1 Mordred 2017-11-21 17:47:29 +01:00
• 7b8ce3777b
  Merge pull request #176 from takhlaq/patch-1 Mordred 2017-11-21 17:47:29 +01:00
• 7aee3d416b Merge pull request #175 from GokuWeedLord/feature/mounts Mordred 2017-11-21 17:47:19 +01:00
• 526be370d3
  Merge pull request #175 from GokuWeedLord/feature/mounts Mordred 2017-11-21 17:47:19 +01:00
• 0a1cf371bf Merge pull request #174 from itsMaru/others Mordred 2017-11-21 17:46:55 +01:00
• 4224f78242
  Merge pull request #174 from itsMaru/others Mordred 2017-11-21 17:46:55 +01:00