sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 19: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

8dd19cf815 auto hide entrance circle Adam 2018-03-06 13:33:10 +11:00
39e379747d auto hide entrance circle Adam 2018-03-06 13:33:10 +11:00
76ccca75a9 Merge actor_rewrite Maru 2018-03-05 22:09:14 -03:00
63288704bb Initializing point; Maru 2018-03-05 22:07:41 -03:00
0833bdd76c Merge remote-tracking branch 'origin/master' into actor_rewrite Mordred 2018-03-06 00:10:36 +01:00
ec0335b64a Merge remote-tracking branch 'origin/master' into actor_rewrite Mordred 2018-03-06 00:10:36 +01:00
37e7c2e51b Basic event play for directors, still buggy. Also some small fixes all around Mordred 2018-03-05 23:01:55 +01:00
22402651e9 Basic event play for directors, still buggy. Also some small fixes all around Mordred 2018-03-05 23:01:55 +01:00
b3497ee06f Merge pull request #265 from NotAdam/actor_rewrite Mordred 2018-03-05 21:07:46 +01:00
5781232516

Merge pull request #265 from NotAdam/actor_rewrite Mordred 2018-03-05 21:07:46 +01:00
edd843fdd0 formatting Mordred 2018-03-05 14:35:03 +01:00
97ae0ac742

formatting Mordred 2018-03-05 14:35:03 +01:00
38f018240d formatting Mordred 2018-03-05 14:34:34 +01:00
df29f674df

formatting Mordred 2018-03-05 14:34:34 +01:00
33429a0284 better handling of EventStart IPC for instances Adam 2018-03-05 22:40:11 +11:00
0de9fb05cf better handling of EventStart IPC for instances Adam 2018-03-05 22:40:11 +11:00
0aae810e16 fix onEnterTerritory events Adam 2018-03-05 22:10:14 +11:00
8fd1a2e3df fix onEnterTerritory events Adam 2018-03-05 22:10:14 +11:00
4496f8c144 add zone opcode Adam 2018-03-05 17:01:37 +11:00
b26a6f3317 add zone opcode Adam 2018-03-05 17:01:37 +11:00
3be616eddb Fixed boundByDuty state so duty menu works in instance Mordred 2018-03-04 17:53:40 +01:00
be46ec837d Fixed boundByDuty state so duty menu works in instance Mordred 2018-03-04 17:53:40 +01:00
8963f560c8 Merge pull request #264 from NotAdam/actor_rewrite Mordred 2018-03-04 10:25:52 +01:00
77d7e95c07

Merge pull request #264 from NotAdam/actor_rewrite Mordred 2018-03-04 10:25:52 +01:00
4d4a1e3515 build fix? Adam 2018-03-04 18:13:05 +11:00
2f126e8dec build fix? Adam 2018-03-04 18:13:05 +11:00
0e5528077e new instance scripts with eobj rotation Adam 2018-03-04 17:51:32 +11:00
2c6253e37c new instance scripts with eobj rotation Adam 2018-03-04 17:51:32 +11:00
9dcb271a63 use subfolders for instancecontenttype and export eobj rotation Adam 2018-03-04 17:49:18 +11:00
628f01e2eb use subfolders for instancecontenttype and export eobj rotation Adam 2018-03-04 17:49:18 +11:00
bb35edd56b fix rotation in objectspawn ipc and send it too Adam 2018-03-04 17:41:17 +11:00
6255df16f2 fix rotation in objectspawn ipc and send it too Adam 2018-03-04 17:41:17 +11:00
7659521233 Instance parser updated to map sgb content to EObjects Mordred 2018-03-04 00:16:44 +01:00
0e9e155e53 Instance parser updated to map sgb content to EObjects Mordred 2018-03-04 00:16:44 +01:00
3747b89b67 Fixed an inventory bug to to invalid size Mordred 2018-03-04 00:12:33 +01:00
619d39e6f8 Fixed an inventory bug to to invalid size Mordred 2018-03-04 00:12:33 +01:00
3249d72306

Merge 4ac664f36d into 60661e32bd Cassiope 2018-03-03 08:54:28 +00:00
4ac664f36d Qualifiers Maru 2018-03-02 10:18:54 -03:00
f1c7c7e701 Ｂｕｉｌｄｓｕｃｃｅｅｄｅｄ. Maru 2018-03-02 10:11:03 -03:00
ab580c67e3 Fix Travis Build Maru 2018-03-02 09:55:03 -03:00
435d8c1492 More style stuff; Maru 2018-03-02 08:25:48 -03:00
92eade2e1d 🗣 💩 Maru 2018-03-02 08:13:45 -03:00
d30420f738 🚮 Maru 2018-03-02 07:39:38 -03:00
d7d15ec685 Framework; Refactors, styling, other minor stuff; Maru 2018-03-02 07:22:25 -03:00
ce954b5d79 Merge master (framework) Maru 2018-03-02 22:26:51 -03:00
15ec99fc7a Merge pull request #261 from itsMaru/master Mordred 2018-03-03 00:28:15 +01:00
60661e32bd

Merge pull request #261 from itsMaru/master Mordred 2018-03-03 00:28:15 +01:00
76967fe990 Merge pull request #262 from takhlaq/opening_quest Mordred 2018-03-03 00:26:54 +01:00
dc6fab5eb6

Merge pull request #262 from takhlaq/opening_quest Mordred 2018-03-03 00:26:54 +01:00
c0acf3aad8 fixed limsa and uldah intro quest Tahir Akhlaq 2018-03-02 16:27:04 +00:00
ad082ae176 fixed limsa and uldah intro quest Tahir Akhlaq 2018-03-02 16:27:04 +00:00
c9a41a148f Qualifiers Maru 2018-03-02 10:18:54 -03:00
6d65274d13 Qualifiers Maru 2018-03-02 10:18:54 -03:00
7d1c77b8b3 Ｂｕｉｌｄｓｕｃｃｅｅｄｅｄ. Maru 2018-03-02 10:11:03 -03:00
e31b3c35ef Ｂｕｉｌｄｓｕｃｃｅｅｄｅｄ. Maru 2018-03-02 10:11:03 -03:00
834978ad7f Fix Travis Build Maru 2018-03-02 09:55:03 -03:00
c93c6e24f1 Fix Travis Build Maru 2018-03-02 09:55:03 -03:00
2856353dd6 More style stuff; Maru 2018-03-02 08:25:48 -03:00
52468262f3 More style stuff; Maru 2018-03-02 08:25:48 -03:00
77c044cd9d 🗣 💩 Maru 2018-03-02 08:13:45 -03:00
b7f2ed462e 🗣 💩 Maru 2018-03-02 08:13:45 -03:00
92bb6187cd 🚮 Maru 2018-03-02 07:39:38 -03:00
2c67263135 🚮 Maru 2018-03-02 07:39:38 -03:00
b3318f14a3 Framework; Refactors, styling, other minor stuff; Maru 2018-03-02 07:22:25 -03:00
a61aef2c1e Framework; Refactors, styling, other minor stuff; Maru 2018-03-02 07:22:25 -03:00
2f17286c77 Merging sucks sometimes you know that Maru 2018-03-02 03:15:06 -03:00
4dd1db1dc2 Merge sapphire master Maru 2018-03-02 02:54:09 -03:00
a164e7d3ce Merge pull request #260 from GokuWeedLord/actor_rewrite Mordred 2018-03-02 06:10:44 +01:00
489d254f9b

Merge pull request #260 from GokuWeedLord/actor_rewrite Mordred 2018-03-02 06:10:44 +01:00
9a0041e093 set weatheroverride debug command and assert fix in spawnindexallocator Adam 2018-03-02 15:29:48 +11:00
8437ff3cbc set weatheroverride debug command and assert fix in spawnindexallocator Adam 2018-03-02 15:29:48 +11:00
facba12fed fix stupid return type mistake Adam 2018-03-02 11:39:52 +11:00
4e597d8acd fix stupid return type mistake Adam 2018-03-02 11:39:52 +11:00
f1121b52b2 Object despawning added Mordred 2018-03-01 23:17:35 +01:00
78d660a1ce Object despawning added Mordred 2018-03-01 23:17:35 +01:00
1392e7e411 Merge pull request #259 from GokuWeedLord/actor_rewrite Mordred 2018-03-01 22:41:49 +01:00
40fccfb481

Merge pull request #259 from GokuWeedLord/actor_rewrite Mordred 2018-03-01 22:41:49 +01:00
edebe804f1 Merge remote-tracking branch 'upstream/actor_rewrite' into actor_rewrite Adam 2018-03-02 02:55:08 +11:00
a086593eb5 Merge remote-tracking branch 'upstream/actor_rewrite' into actor_rewrite Adam 2018-03-02 02:55:08 +11:00
416269dc63 move eobj/player spawnindex generation to common manager Adam 2018-03-02 02:55:02 +11:00
810d71f262 move eobj/player spawnindex generation to common manager Adam 2018-03-02 02:55:02 +11:00
78b5ed525d Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite Mordred 2018-03-01 16:32:28 +01:00
783057723e Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite Mordred 2018-03-01 16:32:28 +01:00
99bbfa0eb3 More include stuff Mordred 2018-03-01 16:31:58 +01:00
220ebfd763 More include stuff Mordred 2018-03-01 16:31:58 +01:00
979c321572 Merge pull request #258 from ShelbyZ/actor_rewrite_minor_cmake_changes Mordred 2018-03-01 08:13:33 +01:00
13c2dec004

Merge pull request #258 from ShelbyZ/actor_rewrite_minor_cmake_changes Mordred 2018-03-01 08:13:33 +01:00
38913e7649 Merge pull request #257 from GokuWeedLord/actor_rewrite Mordred 2018-03-01 08:13:17 +01:00
20bb4f452d

Merge pull request #257 from GokuWeedLord/actor_rewrite Mordred 2018-03-01 08:13:17 +01:00
8e2859d038 Minor updates for actor_rewrite branch ShelbyZ 2018-02-28 20:51:47 -08:00
644d83e514 Minor updates for actor_rewrite branch ShelbyZ 2018-02-28 20:51:47 -08:00
0ff4acf8c8 note to self Adam 2018-02-28 23:58:11 +11:00
af8cfeeb58 note to self Adam 2018-02-28 23:58:11 +11:00
439eeaaaf9 fix eobj out of bounds allocation client crash Adam 2018-02-28 23:53:20 +11:00
d024f0a396 fix eobj out of bounds allocation client crash Adam 2018-02-28 23:53:20 +11:00
56af490008 ignore cotire generated files Adam 2018-02-28 22:25:34 +11:00
521c62013c ignore cotire generated files Adam 2018-02-28 22:25:34 +11:00
841e292e9b director sequence/branch setters & debug command Adam 2018-02-28 22:25:11 +11:00
416366c144 director sequence/branch setters & debug command Adam 2018-02-28 22:25:11 +11:00
e0f0414a75 Use precompiled headers for scripts and some libraries Mordred Admin 2018-02-28 11:51:44 +01:00