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

• 518ba5898a Travis... why do you hate me... Mordred 2017-08-09 17:32:41 +02:00
• 30d35f1bf4 ... Travis... Mordred 2017-08-09 17:30:17 +02:00
• 983d39521e ... Travis... Mordred 2017-08-09 17:30:17 +02:00
• 4ecaa3703b Fair enough travis... well played... Mordred 2017-08-09 17:26:34 +02:00
• 847910f183 Fair enough travis... well played... Mordred 2017-08-09 17:26:34 +02:00
• b946c90845 asdf amibu 2017-08-09 17:26:18 +02:00
• 04d054fc6a Why amibu 2017-08-09 17:24:55 +02:00
• 264540ecda traviiis amibu 2017-08-09 17:23:39 +02:00
• b9c684bc32 another travis test Mordred 2017-08-09 17:23:02 +02:00
• 77da4d1b4d another travis test Mordred 2017-08-09 17:23:02 +02:00
• e8cdef7027 travis test Mordred 2017-08-09 17:19:06 +02:00
• ceeafa6737 travis test Mordred 2017-08-09 17:19:06 +02:00
• a1af369669 Merge 14e62baa9e into f586640906 amibu01 2017-08-09 15:17:27 +00:00
• 14e62baa9e travis amibu 2017-08-09 17:17:17 +02:00
• 2d1305f73c Merge pull request #17 from Minoost/matchmaking SapphireMordred 2017-08-09 17:15:33 +02:00
• f586640906 Merge pull request #17 from Minoost/matchmaking SapphireMordred 2017-08-09 17:15:33 +02:00
• f6b4a98b35 Travis? amibu 2017-08-09 17:15:16 +02:00
• 2588a5f3ab Merge branch 'master' into matchmaking Adam 2017-08-10 00:14:03 +09:00
• 0914e1dbd5 Merge branch 'master' into matchmaking Minho Kang 2017-08-10 00:14:03 +09:00
• 113092f243 Try more travis amibu 2017-08-09 17:11:29 +02:00
• 5febb5080f More travis amibu 2017-08-09 17:08:12 +02:00
• 77997606ed More travis amibu 2017-08-09 17:05:03 +02:00
• ff06374d09 Travis amibu 2017-08-09 17:01:06 +02:00
• f198f4cee1 Travis messing around amibu 2017-08-09 16:58:09 +02:00
• a652cfdbaf I messed up amibu 2017-08-09 16:55:30 +02:00
• 65dfbd32cb Merge pull request #15 from amibu01/master SapphireMordred 2017-08-09 16:38:24 +02:00
• 2d0c3070da Merge pull request #15 from amibu01/master SapphireMordred 2017-08-09 16:38:24 +02:00
• 5e2a9927f1 Test .travis.yml amibu 2017-08-09 16:36:19 +02:00
• e49dff4d4d Test .travis.yml amibu 2017-08-09 16:36:19 +02:00
• ba9d80d0e3 Merge pull request #14 from Minoost/master SapphireMordred 2017-08-09 16:26:54 +02:00
• 5334367c34 Merge pull request #14 from Minoost/master SapphireMordred 2017-08-09 16:26:54 +02:00
• 1ad797d583 Add libraries as a submodule Adam 2017-08-09 23:19:14 +09:00
• 77aec38a75 Add libraries as a submodule Minho Kang 2017-08-09 23:19:14 +09:00
• 1a8660e322 Add dutyreg packet definition and opcodes Adam 2017-08-09 23:15:55 +09:00
• 3fa66835f5 Add dutyreg packet definition and opcodes Minho Kang 2017-08-09 23:15:55 +09:00
• 6235c834aa Merge remote-tracking branch 'upstream/master' Adam 2017-08-09 23:14:46 +09:00
• 405d7983c1 Merge remote-tracking branch 'upstream/master' Minho Kang 2017-08-09 23:14:46 +09:00
• 337c45d000 PoC Skill Scripting amibu 2017-08-09 16:08:43 +02:00
• 78452638df PoC Skill Scripting amibu 2017-08-09 16:08:43 +02:00
• b2d07cc175 Merge pull request #13 from AcedArmy/Updated-Zoneline-1317533 SapphireMordred 2017-08-09 15:28:16 +02:00
• caca1b1439 Merge pull request #13 from AcedArmy/Updated-Zoneline-1317533 SapphireMordred 2017-08-09 15:28:16 +02:00
• d382b4d113 Updated Zoneline 1317533 Biscuit Boy 2017-08-09 23:17:15 +10:00
• c40c7574bb Updated Zoneline 1317533 Biscuit Boy 2017-08-09 23:17:15 +10:00
• fc4a2c5062 Merge pull request #12 from takhlaq/editorconfig SapphireMordred 2017-08-09 15:09:23 +02:00
• d6c93f7cad Merge pull request #12 from takhlaq/editorconfig SapphireMordred 2017-08-09 15:09:23 +02:00
• bd6a32781b Merge pull request #11 from amibu01/master SapphireMordred 2017-08-09 15:04:12 +02:00
• 7a04724bc6 Merge pull request #11 from amibu01/master SapphireMordred 2017-08-09 15:04:12 +02:00
• e6c9c959f2 ZoneLine chat output amibu 2017-08-09 15:02:24 +02:00
• 757105403a ZoneLine chat output amibu 2017-08-09 15:02:24 +02:00
• da93ea0de2 add editorconfig file Tahir Akhlaq 2017-08-09 13:44:57 +01:00
• 962a11ee72 add editorconfig file Tahir Akhlaq 2017-08-09 13:44:57 +01:00
• 2881fd43ed Merge pull request #10 from amibu01/master SapphireMordred 2017-08-09 14:41:23 +02:00
• 188db87409 Merge pull request #10 from amibu01/master SapphireMordred 2017-08-09 14:41:23 +02:00
• eeee74d523 Add "@set classjob" command amibu 2017-08-09 14:38:46 +02:00
• 4c2339ccfa Add "@set classjob" command amibu 2017-08-09 14:38:46 +02:00
• 3924e5450c Please use spaces instead of tabs Mordred Admin 2017-08-09 10:30:18 +02:00
• d939f55836 Please use spaces instead of tabs Mordred Admin 2017-08-09 10:30:18 +02:00
• b00aadf19e Merge pull request #9 from zynjec/master SapphireMordred 2017-08-09 00:38:30 +02:00
• 38e42eaf7c Merge pull request #9 from zynjec/master SapphireMordred 2017-08-09 00:38:30 +02:00
• 1f10c555f8 Fixed level 0 and no weapon bug Mordred 2017-08-09 00:36:26 +02:00
• 686d55dafc Fixed level 0 and no weapon bug Mordred 2017-08-09 00:36:26 +02:00
• 7bc9873ed4 Standardize log location Zynjec 2017-08-08 18:35:31 -04:00
• 43d29984e2 Standardize log location Zynjec 2017-08-08 18:35:31 -04:00
• 1f523d9ced Merge e376ef00b4 into e81d7c2538 Zynjec 2017-08-08 22:01:14 +00:00
• 5ccba7ce61 Merge pull request #7 from amibu01/master SapphireMordred 2017-08-08 22:50:47 +02:00
• e943187d10 PS4 insert html amibu 2017-08-08 22:56:48 +02:00
• c1d287b15b Added hacky PS4 support back amibu 2017-08-08 22:55:02 +02:00
• e81d7c2538 Merge pull request #7 from amibu01/master SapphireMordred 2017-08-08 22:50:47 +02:00
• 226b0d5f8a PS4 insert html amibu 2017-08-08 22:56:48 +02:00
• 97580d6460 Added hacky PS4 support back amibu 2017-08-08 22:55:02 +02:00
• e376ef00b4 Merge pull request #1 from SapphireMordred/master zynjec 2017-08-08 15:40:10 -04:00
• cb9a672cdd Merge pull request #6 from zynjec/patch-1 SapphireMordred 2017-08-08 21:35:31 +02:00
• 8bf197c3c9 Merge pull request #6 from zynjec/patch-1 SapphireMordred 2017-08-08 21:35:31 +02:00
• 5579e5ab34 Updated table name in 'discovery_pos' zynjec 2017-08-08 15:17:34 -04:00
• c258bffb2a Updated table name in 'discovery_pos' zynjec 2017-08-08 15:17:34 -04:00
• b94499e901 Merge pull request #5 from Minoost/master SapphireMordred 2017-08-08 19:51:40 +02:00
• 9fa34626c0 Merge pull request #5 from Minoost/master SapphireMordred 2017-08-08 19:51:40 +02:00
• 5d40abc877 Merge pull request #4 from amibu01/master SapphireMordred 2017-08-08 19:51:21 +02:00
• 24b10a25c6 Merge pull request #4 from amibu01/master SapphireMordred 2017-08-08 19:51:21 +02:00
• d4a86366dd Added unlockaetheryte command amibu 2017-08-08 19:24:41 +02:00
• 81a1c006f7 Added unlockaetheryte command amibu 2017-08-08 19:24:41 +02:00
• 1a4706a8df Merge remote-tracking branch 'upstream/master' Adam 2017-08-09 01:52:22 +09:00
• 861957fe33 Merge remote-tracking branch 'upstream/master' Minho Kang 2017-08-09 01:52:22 +09:00
• d67e6fdabd Fix zoneline handler Adam 2017-08-09 01:49:23 +09:00
• 4ea0da2505 Fix zoneline handler Minho Kang 2017-08-09 01:49:23 +09:00
• 28370ebd30 GM command opcodes amibu 2017-08-08 18:22:18 +02:00
• 1151e19154 GM command opcodes amibu 2017-08-08 18:22:18 +02:00
• c28fcdd02b Set expansion level, update gitignore for libraries amibu 2017-08-08 18:05:56 +02:00
• 45b2fa55b7 Set expansion level, update gitignore for libraries amibu 2017-08-08 18:05:56 +02:00
• 72a631a961 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred Admin 2017-08-08 18:04:29 +02:00
• b6d89381ab Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred Admin 2017-08-08 18:04:29 +02:00
• 2758b4e536 Added field for expansion in InitUI Mordred Admin 2017-08-08 18:03:39 +02:00
• 9267fc7ebf Merge pull request #3 from Minoost/master SapphireMordred 2017-08-08 14:05:42 +02:00
• b0d8679f66 Merge pull request #3 from Minoost/master SapphireMordred 2017-08-08 14:05:42 +02:00
• 004c665f03 Merge branch 'master' into master Minho Kang 2017-08-08 21:04:22 +09:00
• 569ae6eac1 Merge branch 'master' into master Minho Kang 2017-08-08 21:04:22 +09:00
• 015fa17628 Add gitignore and fix UtilMath::clamp Adam 2017-08-08 21:01:09 +09:00
• 3c6b8276b8 Add gitignore and fix UtilMath::clamp Minho Kang 2017-08-08 21:01:09 +09:00
• 4ca8b7ab28 Merge pull request #2 from amibu01/master SapphireMordred 2017-08-08 13:16:05 +02:00
• cd2982a158 Fix for StatusIcons amibu 2017-08-08 13:18:55 +02:00