sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-06-02 06:17:45 +00:00

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

#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

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#179

#18

#184

#185

#186

#187

#188

#189

#19

#190

#191

#193

#194

#195

#196

#197

#198

#199

#200

#201

#202

#203

#204

#206

#207

#208

#209

#21

#211

#212

#213

#214

#215

#216

#217

#218

#219

#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

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#278

#279

#28

#280

#281

#282

#283

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#297

#298

#299

#30

#300

#301

#302

#303

#304

#305

#306

#307

#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

#363

#364

#365

#366

#367

#368

#369

#370

#371

#372

#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

#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

#499

#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

#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

#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

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#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

#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

#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

#961

#962

#963

#964

#965

#967

#969

#97

#970

#971

#972

#973

#974

#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

aa0857ccad forgot space Biscuit Boy 2018-08-28 15:09:03 +10:00
3deeaadcef Added wireframe rendering actorcontrol type and gm wireframe command Biscuit Boy 2018-08-28 15:02:59 +10:00
cf3ad7628f Added wireframe rendering actorcontrol type and gm wireframe command Biscuit Boy 2018-08-28 15:02:59 +10:00
c3e715128f Some cleanups in preperation for bnpcs Mordred 2018-08-28 00:17:51 +02:00
5302db1fcb Some cleanups in preperation for bnpcs Mordred 2018-08-28 00:17:51 +02:00
0b08f535c6 Basic class to hold BNpcTemplate information Mordred 2018-08-26 23:53:30 +02:00
ac68133fa3 Basic class to hold BNpcTemplate information Mordred 2018-08-26 23:53:30 +02:00
96833753c1 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-08-26 11:47:10 +02:00
fffea9014f Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-08-26 11:47:10 +02:00
a563e4068c Simplistic parser for mobs Mordred 2018-08-26 11:46:56 +02:00
95b6d3370c Simplistic parser for mobs Mordred 2018-08-26 11:46:56 +02:00
84393acf15 Merge pull request #377 from NotAdam/develop Mordred 2018-08-26 11:00:44 +02:00
2fe3a4d156

Merge pull request #377 from NotAdam/develop Mordred 2018-08-26 11:00:44 +02:00
ceefd5e531 update submodule NotAdam 2018-08-26 18:55:21 +10:00
15796c74ff update submodule NotAdam 2018-08-26 18:55:21 +10:00
abbff07e77 minor fixes NotAdam 2018-08-26 18:48:45 +10:00
ff43c45f67 minor fixes NotAdam 2018-08-26 18:48:45 +10:00
e68b302f42 fix db storage for classjobs, improve switching between classes NotAdam 2018-08-26 16:19:05 +10:00
be1a5d53f3 fix db storage for classjobs, improve switching between classes NotAdam 2018-08-26 16:19:05 +10:00
78ddbb3672 more consistent enum naming NotAdam 2018-08-25 22:58:13 +10:00
81de462cbd more consistent enum naming NotAdam 2018-08-25 22:58:13 +10:00
7131c254ea EquipSlot -> GearSetSlot NotAdam 2018-08-25 22:56:46 +10:00
7f448494ed EquipSlot -> GearSetSlot NotAdam 2018-08-25 22:56:46 +10:00
8a3b63d276 cleanup unnecessary debug output NotAdam 2018-08-25 22:41:03 +10:00
2859e3731b cleanup unnecessary debug output NotAdam 2018-08-25 22:41:03 +10:00
4cab50f77c correctly store items in armory/inventory based on client flag NotAdam 2018-08-25 22:38:07 +10:00
55ae5290f6 correctly store items in armory/inventory based on client flag NotAdam 2018-08-25 22:38:07 +10:00
a86fc2794b cleanup stack calc code NotAdam 2018-08-25 20:52:20 +10:00
7c5c39cd42 cleanup stack calc code NotAdam 2018-08-25 20:52:20 +10:00
d1568c75f9 update submodule NotAdam 2018-08-25 20:48:27 +10:00
9026358913 update submodule NotAdam 2018-08-25 20:48:27 +10:00
ae282c7030 correctly preserve hq/lq stacks & cap quantity correctly NotAdam 2018-08-25 19:27:38 +10:00
479bf32938 correctly preserve hq/lq stacks & cap quantity correctly NotAdam 2018-08-25 19:27:38 +10:00
84c5191377 correctly update items and select slot NotAdam 2018-08-25 00:37:21 +10:00
86de3d98a2 correctly update items and select slot NotAdam 2018-08-25 00:37:21 +10:00
1b7d11bb43 addItem is way less retarded now, stacks are automagically filled first NotAdam 2018-08-25 00:15:26 +10:00
901168d810 addItem is way less retarded now, stacks are automagically filled first NotAdam 2018-08-25 00:15:26 +10:00
7caa2121b5 Merge pull request #375 from NotAdam/feature/clang Mordred 2018-08-23 15:46:30 +02:00
69f6d868bc

Merge pull request #375 from NotAdam/feature/clang Mordred 2018-08-23 15:46:30 +02:00
cc07b4421e Merge pull request #376 from NotAdam/develop Mordred 2018-08-23 15:34:33 +02:00
1ff75d8478

Merge pull request #376 from NotAdam/develop Mordred 2018-08-23 15:34:33 +02:00
3396645e3c formatting NotAdam 2018-08-23 23:32:44 +10:00
629c219b39 formatting NotAdam 2018-08-23 23:32:44 +10:00
0583459ed2 fix some compile warnings NotAdam 2018-08-23 23:19:25 +10:00
44fa5e545d fix some compile warnings NotAdam 2018-08-23 23:19:25 +10:00
ae89163140 fix invalid ontalk case in quest script NotAdam 2018-08-23 22:59:22 +10:00
4079dd86bf fix invalid ontalk case in quest script NotAdam 2018-08-23 22:59:22 +10:00
946d7a37eb more chara flags NotAdam 2018-08-23 22:41:11 +10:00
8505f20e02 more chara flags NotAdam 2018-08-23 22:41:11 +10:00
f879262fff Revert "maybe it doesn't need this" NotAdam 2018-08-21 22:46:16 +10:00
61a6ed7f4f Revert "maybe it doesn't need this" NotAdam 2018-08-21 22:46:16 +10:00
2425cdc734 maybe it doesn't need this NotAdam 2018-08-21 22:46:16 +10:00
4c89f1b87a maybe it doesn't need this NotAdam 2018-08-21 22:46:16 +10:00
194801e776 maybe this works... NotAdam 2018-08-21 20:42:06 +10:00
09a89c6b56 maybe this works... NotAdam 2018-08-21 20:42:06 +10:00
30d2ea3ac5 change gcc to clang - more verbose code checks NotAdam 2018-08-21 20:36:03 +10:00
eae7bba255 change gcc to clang - more verbose code checks NotAdam 2018-08-21 20:36:03 +10:00
6f45da82a7 updated opcodes for social implementation Tahir Akhlaq 2018-08-17 17:15:24 +01:00
00f70b6119 change Common::ClientLanguage enum Tahir Akhlaq 2018-08-17 14:39:07 +01:00
4829e235d3 fix travis build Tahir Akhlaq 2018-08-17 14:26:08 +01:00
5ba94f0e52 fixed social update.sql query Tahir Akhlaq 2018-08-17 13:43:49 +01:00
42d2e5e2fa Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into social_implementation Tahir Akhlaq 2018-08-17 13:36:49 +01:00
38e4ca6c0f

Merge ec6729ebbd into b36402119e Tahir Akhlaq 2018-08-17 11:01:48 +00:00
ebc1a7992d Added another field to npcspawn Mordred 2018-08-13 21:44:48 +02:00
80e67c2846 Added another field to npcspawn Mordred 2018-08-13 21:44:48 +02:00
a335e19ee6 Merge pull request #372 from NotAdam/develop Mordred 2018-08-13 08:14:55 +02:00
f1d059f1e7

Merge pull request #372 from NotAdam/develop Mordred 2018-08-13 08:14:55 +02:00
6601c387fc Field in npcspawn adjusted Mordred 2018-08-12 23:06:12 +02:00
6e6223504d Field in npcspawn adjusted Mordred 2018-08-12 23:06:12 +02:00
f8ee2a73e1 missed a ! during refactoring, oops NotAdam 2018-08-12 23:04:23 +10:00
05585ac24b missed a ! during refactoring, oops NotAdam 2018-08-12 23:04:23 +10:00
6354ff4eb0 Merge remote-tracking branch 'origin/develop' into develop NotAdam 2018-08-12 22:53:29 +10:00
4ec63805d7 Merge remote-tracking branch 'origin/develop' into develop NotAdam 2018-08-12 22:53:29 +10:00
347ec83ff3 additem returns an itemptr, handin item container NotAdam 2018-08-12 22:53:21 +10:00
8a2b472554 additem returns an itemptr, handin item container NotAdam 2018-08-12 22:53:21 +10:00
0a0dcf59ae fix item splitting NotAdam 2018-08-12 22:30:18 +10:00
ade63f9170 fix item splitting NotAdam 2018-08-12 22:30:18 +10:00
dd25fb2b66 Merge pull request #367 from DantestyleXD/Uldah_quests Mordred 2018-08-10 08:04:16 +02:00
4184736654

Merge pull request #367 from DantestyleXD/Uldah_quests Mordred 2018-08-10 08:04:16 +02:00
9447ef1600 Merge pull request #371 from NotAdam/develop Mordred 2018-08-10 08:03:35 +02:00
38960718a5

Merge pull request #371 from NotAdam/develop Mordred 2018-08-10 08:03:35 +02:00
06df14f41a Changed some fieldnames for consistency Mordred 2018-08-10 08:03:16 +02:00
ebf44583a3

Changed some fieldnames for consistency Mordred 2018-08-10 08:03:16 +02:00
1a95399a7e update FFXIVIpcNpcSpawn NotAdam 2018-08-08 22:57:16 +10:00
add1725596 update FFXIVIpcNpcSpawn NotAdam 2018-08-08 22:57:16 +10:00
1ab679721d Merge pull request #366 from DantestyleXD/DebugCommand Mordred 2018-08-05 12:06:18 +02:00
1f73f477a0

Merge pull request #366 from DantestyleXD/DebugCommand Mordred 2018-08-05 12:06:18 +02:00
7d7756ca42 Merge pull request #370 from takhlaq/discovery_layers Mordred 2018-08-05 12:05:42 +02:00
132a650bf3

Merge pull request #370 from takhlaq/discovery_layers Mordred 2018-08-05 12:05:42 +02:00
d17db449c0 fixing Dantestyle 2018-08-04 23:43:08 +02:00
f1aeddb0e4 fixing Dantestyle 2018-08-04 23:43:08 +02:00
c5099f564b SubWil028 and Sub029 added Dantestyle 2018-08-04 03:56:46 +02:00
60c80ca0c4 SubWil028 and Sub029 added Dantestyle 2018-08-04 03:56:46 +02:00
88dfbf7e8c fixed discovery legit Tahir Akhlaq 2018-08-03 16:54:46 +01:00
2a264af7cd fixed discovery legit Tahir Akhlaq 2018-08-03 16:54:46 +01:00
c244f1e07a SubWil004 and SubWil027 added Dantestyle 2018-08-03 01:20:21 +02:00
c554f8e971 SubWil004 and SubWil027 added Dantestyle 2018-08-03 01:20:21 +02:00
7987c3d4b3 Merge pull request #369 from itsMaru/develop Mordred 2018-08-03 00:56:22 +02:00
aab66a82c8

Merge pull request #369 from itsMaru/develop Mordred 2018-08-03 00:56:22 +02:00
1c2d97eb2f Include not needed; Maru 2018-08-02 19:49:50 -03:00