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

• c04b1c5386 Merge pull request #84 from itsmaru/master SapphireMordred 2017-09-06 19:14:19 +02:00
• e3f22108df Merge pull request #84 from itsmaru/master SapphireMordred 2017-09-06 19:14:19 +02:00
• 41475a0e76 Correctly send time left amibu 2017-09-06 18:29:47 +02:00
• e62c2ce6c1 Actually use the correct packet amibu 2017-09-06 18:25:49 +02:00
• 324f11c909 Merge pull request #85 from AcedArmy/master SapphireMordred 2017-09-06 08:24:16 +02:00
• 23bf5980ca Merge pull request #85 from AcedArmy/master SapphireMordred 2017-09-06 08:24:16 +02:00
• aae20d0d46 Spawn with effects amibu 2017-09-05 22:40:28 +02:00
• fce78bad49 Fix news.xml amibu 2017-09-05 21:33:26 +02:00
• aba22a319b Added getters for effects amibu 2017-09-05 21:30:50 +02:00
• f5d0264ee5 Updated Sapphire Launcher HTML with New Look Biscuit Boy 2017-09-06 04:20:30 +10:00
• 25ff8595b3 Updated Sapphire Launcher HTML with New Look Biscuit Boy 2017-09-06 04:20:30 +10:00
• a2c1d9f59a Might as well refactor a bit more; Maru 2017-09-05 00:37:22 -03:00
• 161d24f505 Might as well refactor a bit more; Maru 2017-09-05 00:37:22 -03:00
• fcbf5d81b9 🔥 Build ✔️ please Maru 2017-09-04 06:53:04 -03:00
• 353f2a3cd0 🔥 Build ✔️ please Maru 2017-09-04 06:53:04 -03:00
• f41adf5e73 Merge pull request #83 from takhlaq/edit_and_continue SapphireMordred 2017-09-04 08:15:53 +02:00
• b6a20b465c Merge pull request #83 from takhlaq/edit_and_continue SapphireMordred 2017-09-04 08:15:53 +02:00
• 610e824ac0 Redefining: ActionModel and ActionAspect; Action for removing status effect off from HUD; Maru 2017-09-04 01:36:19 -03:00
• 68e862d95b Redefining: ActionModel and ActionAspect; Action for removing status effect off from HUD; Maru 2017-09-04 01:36:19 -03:00
• 54a405f6cf updated CMakeSettings.json for edit and continue Tahir Akhlaq 2017-09-04 03:19:40 +01:00
• 10e7dee216 updated CMakeSettings.json for edit and continue Tahir Akhlaq 2017-09-04 03:19:40 +01:00
• b7a3ec8bdc Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Maru 2017-09-03 13:39:22 -03:00
• a8ce37b419 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Maru 2017-09-03 13:39:22 -03:00
• d3342d82af Merge pull request #82 from takhlaq/edit_and_continue SapphireMordred 2017-09-03 08:31:04 +02:00
• 0889564230 Merge pull request #82 from takhlaq/edit_and_continue SapphireMordred 2017-09-03 08:31:04 +02:00
• c7a6edc811 enabled edit and continue on windows - usage: tools > options > debugging > general > enable edit and continue (tick all options within its subtree) - attach vs to a server, edit its code, alt + f10 Tahir Akhlaq 2017-09-03 03:22:51 +01:00
• 0ecf2bd962 enabled edit and continue on windows - usage: tools > options > debugging > general > enable edit and continue (tick all options within its subtree) - attach vs to a server, edit its code, alt + f10 Tahir Akhlaq 2017-09-03 03:22:51 +01:00
• a9e3f2fc09 Definitions for Action type and aspect; Maru 2017-09-02 18:24:31 -03:00
• 2d15367c7d Definitions for Action type and aspect; Maru 2017-09-02 18:24:31 -03:00
• b9e3f3a0e7 Refactoring, what else Mordred 2017-09-02 23:20:05 +02:00
• 224ecadef1 What can i say but... more refactoring of db stuff Mordred 2017-09-01 23:21:35 +02:00
• 63346359c7 Database refactoring Mordred Admin 2017-09-01 17:00:09 +02:00
• 8770d8e801 Link to libsodium Minho Kang 2017-09-01 18:58:57 +09:00
• fb27cbc7ae Format Minho Kang 2017-09-01 18:42:36 +09:00
• f3acd9386e Link libsodium for VS2015 Minho Kang 2017-09-01 18:38:34 +09:00
• 6f7ec47014 Link libsodium on linux Minho Kang 2017-09-01 18:34:55 +09:00
• 48c92d6a7f updated submodule Mordred Admin 2017-09-01 11:26:30 +02:00
• b8bf3fc8a9 updated submodule Mordred Admin 2017-09-01 11:11:22 +02:00
• f52010469d updated submodule Mordred Admin 2017-09-01 11:11:22 +02:00
• a4914b903a Link to Win32 directory for x86 Minho Kang 2017-09-01 15:40:33 +09:00
• cf283d61e5 Use proper KDF (Argon2) to hash password Minho Kang 2017-09-01 14:18:31 +09:00
• 82f8a1a5b6 Fixed server_rest and more database code cleanup Mordred 2017-09-01 00:18:06 +02:00
• 5cbdee5ac7 tempalted getters for db fields Mordred 2017-08-31 23:29:45 +02:00
• 350fc84947 Removing some unused sql functions Mordred Admin 2017-08-31 11:23:14 +02:00
• fdf3dc5dd0 Fixed teleports instantly fading out without showing any animation on finish Mordred 2017-08-30 23:08:10 +02:00
• 0eeeb020eb Fixed teleports instantly fading out without showing any animation on finish Mordred 2017-08-30 23:08:10 +02:00
• 6dd28d46a8 Fixed teleport interruption wrongfully showing animation.\n Fixed Teleport interruption not resetting casting state. \n Changed GLOBAL keyword in chai to global Mordred 2017-08-30 18:45:34 +02:00
• a6ee31eb11 Fixed teleport interruption wrongfully showing animation.\n Fixed Teleport interruption not resetting casting state. \n Changed GLOBAL keyword in chai to global Mordred 2017-08-30 18:45:34 +02:00
• 29214026ae Merge pull request #80 from AcedArmy/master SapphireMordred 2017-08-30 16:55:47 +02:00
• 8ba20cd99c Merge pull request #80 from AcedArmy/master SapphireMordred 2017-08-30 16:55:47 +02:00
• d75370515a fixed default values in charaiteminventory SapphireMordred 2017-08-30 16:53:17 +02:00
• e18813a027 fixed default values in charaiteminventory SapphireMordred 2017-08-30 16:53:17 +02:00
• 6328eb5304 Update.sql Merged into other SQL's Biscuit Boy 2017-08-30 23:44:22 +10:00
• 3811923071 Update.sql Merged into other SQL's Biscuit Boy 2017-08-30 23:44:22 +10:00
• f392a76e8e Merge b48d2009e2 into 9479205d64 Biscuit Boy 2017-08-30 13:35:28 +00:00
• 4d01464988 Made it so update.sql no longer runs Biscuit Boy 2017-08-30 23:35:25 +10:00
• b48d2009e2 Made it so update.sql no longer runs Biscuit Boy 2017-08-30 23:35:25 +10:00
• 8b694badab Added Positions for Limsa Aethernet Biscuit Boy 2017-08-30 22:59:08 +10:00
• 624cd1c67b Added Positions for Limsa Aethernet Biscuit Boy 2017-08-30 22:59:08 +10:00
• 835e1846a1 Merge pull request #78 from AcedArmy/master SapphireMordred 2017-08-30 13:44:15 +02:00
• 9479205d64 Merge pull request #78 from AcedArmy/master SapphireMordred 2017-08-30 13:44:15 +02:00
• f6fe84cb99 Added all the Positions of Ul'dah's Aethernet Biscuit Boy 2017-08-30 21:27:57 +10:00
• 513b75b81f Added all the Positions of Ul'dah's Aethernet Biscuit Boy 2017-08-30 21:27:57 +10:00
• 77098ffde3 Removed setTeleporting Function Biscuit Boy 2017-08-30 21:25:47 +10:00
• d06fc29c37 Removed setTeleporting Function Biscuit Boy 2017-08-30 21:25:47 +10:00
• 3bfc518469 Merge pull request #77 from itsmaru/master SapphireMordred 2017-08-30 10:07:22 +02:00
• 9146e0515d Merge pull request #77 from itsmaru/master SapphireMordred 2017-08-30 10:07:22 +02:00
• 6f4cf03b4b Style; Maru 2017-08-30 01:53:46 -03:00
• 9edb75394a Style; Maru 2017-08-30 01:53:46 -03:00
• 302b50d8b3 Sorting out action effects (castbar, anim); Block heal and damage on dead actors; Maru 2017-08-30 01:52:20 -03:00
• 34568b6431 Sorting out action effects (castbar, anim); Block heal and damage on dead actors; Maru 2017-08-30 01:52:20 -03:00
• be182edbfb Base raise skill; Maru 2017-08-29 21:52:40 -03:00
• 5010aed6b3 Base raise skill; Maru 2017-08-29 21:52:40 -03:00
• 5897929016 Merge branch 'master' of https://github.com/itsmaru/Sapphire Maru 2017-08-29 20:44:36 -03:00
• be9482c11f Merge branch 'master' of https://github.com/itsmaru/Sapphire Maru 2017-08-29 20:44:36 -03:00
• 93a7df304e Fix issue #68 (Wrong cast time info sent when multiple players are in a zone) Maru 2017-08-29 20:28:51 -03:00
• 2779d00c6b Fix issue #68 (Wrong cast time info sent when multiple players are in a zone) Maru 2017-08-29 20:28:51 -03:00
• 167f0282a8 Also updated folder path in scriptmanager Mordred 2017-08-29 23:24:05 +02:00
• f7c8f98042 Also updated folder path in scriptmanager Mordred 2017-08-29 23:24:05 +02:00
• 89f4fe6f48 Moved script folder out of bin Mordred 2017-08-29 23:22:41 +02:00
• 3a93509476 Moved script folder out of bin Mordred 2017-08-29 23:22:41 +02:00
• 33768e50c0 Fixed a crash when no linkshells present Mordred 2017-08-29 17:35:25 +02:00
• 8a0396eac3 Fixed a crash when no linkshells present Mordred 2017-08-29 17:35:25 +02:00
• bf51a4d4c9 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred 2017-08-29 17:30:11 +02:00
• cd433904de Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred 2017-08-29 17:30:11 +02:00
• 0b1ad75f55 Removed serverId from config SapphireMordred 2017-08-29 12:06:13 +02:00
• 582cc4ce52 Removed serverId from config SapphireMordred 2017-08-29 12:06:13 +02:00
• 2f20a8254f Build fix Mordred Admin 2017-08-29 10:42:19 +02:00
• 93c5348e09 Build fix Mordred Admin 2017-08-29 10:42:19 +02:00
• 91155ea84b Lookup functions for linkshells Mordred 2017-08-28 23:43:52 +02:00
• b62e0bee51 Lookup functions for linkshells Mordred 2017-08-28 23:43:52 +02:00
• cd67fe2b52 simplified linkshell loading\n removed old serverId as it is not used anymore Mordred 2017-08-28 23:19:35 +02:00
• fbf6a84a61 simplified linkshell loading\n removed old serverId as it is not used anymore Mordred 2017-08-28 23:19:35 +02:00
• d7525b2471 Fixed building on newer GCC Maru 2017-08-28 16:13:23 -03:00
• 1237e34e2e Fixed building on newer GCC Maru 2017-08-28 16:13:23 -03:00
• 9049784b1a Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred 2017-08-28 18:36:55 +02:00
• 758635f87c Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred 2017-08-28 18:36:55 +02:00
• d1cec57259 Created linkshellMgr class and added basic linkshell caching Mordred 2017-08-28 18:36:51 +02:00
• 613c85e841 Created linkshellMgr class and added basic linkshell caching Mordred 2017-08-28 18:36:51 +02:00
• d3b5ef15b2 Merge pull request #76 from Minoost/build-cmake SapphireMordred 2017-08-28 18:30:12 +02:00