sapphire

mirrors/sapphire

Fork 0

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

a4c189b71e attempt to fix build Tahir Akhlaq 2018-03-22 22:44:40 +00:00
349fa1d788 Added discovery parser Mordred 2018-03-22 23:01:55 +01:00
0afb688374 Added discovery parser Mordred 2018-03-22 23:01:55 +01:00
189d852285 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite Mordred 2018-03-22 22:59:12 +01:00
5e64a59374 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite Mordred 2018-03-22 22:59:12 +01:00
7c3f0190df update_discovery.sql now contains well over 4000 new maprange entries for discovery Mordred 2018-03-22 22:58:52 +01:00
706b33b0cd update_discovery.sql now contains well over 4000 new maprange entries for discovery Mordred 2018-03-22 22:58:52 +01:00
a471d49c78 remove bindscene macro and move to wrapper func Adam 2018-03-22 23:45:17 +11:00
00a7c1c6d3 remove bindscene macro and move to wrapper func Adam 2018-03-22 23:45:17 +11:00
48172deaad

Merge e6e3e92742 into 4f16667765 Maru 2018-03-22 04:29:30 +00:00
5ade7b5524 Merge pull request #281 from perize/pvp_duel_poc Mordred 2018-03-21 15:21:45 +01:00
4f16667765

Merge pull request #281 from perize/pvp_duel_poc Mordred 2018-03-21 15:21:45 +01:00
34de90ac97 update submodule Adam 2018-03-22 00:54:00 +11:00
bda2a51362 update submodule Adam 2018-03-22 00:54:00 +11:00
4f75d21b21 fix zone crash from an invalid class instance ptr Adam 2018-03-21 19:07:05 +11:00
8984a98b34 fix zone crash from an invalid class instance ptr Adam 2018-03-21 19:07:05 +11:00
c24c215208 fix infinite callback loop Adam 2018-03-20 23:56:06 +11:00
a1c531932c fix infinite callback loop Adam 2018-03-20 23:56:06 +11:00
ee715a62af fix formatting again Adam 2018-03-20 22:43:16 +11:00
660709becb fix formatting again Adam 2018-03-20 22:43:16 +11:00
eb1ced20b2 fix formatting Adam 2018-03-20 22:33:51 +11:00
66fbc9931b fix formatting Adam 2018-03-20 22:33:51 +11:00
6304e097e4 eventPlay -> playScene, added playSceneChain Adam 2018-03-20 22:08:25 +11:00
dd8ed62430 eventPlay -> playScene, added playSceneChain Adam 2018-03-20 22:08:25 +11:00
1771ed14b4 proper festival handling (woah) Adam 2018-03-20 20:30:05 +11:00
d7006574ac proper festival handling (woah) Adam 2018-03-20 20:30:05 +11:00
14c57be9b4 Is this what you want from me linux?! Mordred 2018-03-20 09:51:59 +01:00
d95aaba887

Is this what you want from me linux?! Mordred 2018-03-20 09:51:59 +01:00
7577bd316f replay def Perize 2018-03-20 17:45:00 +09:00
1696a292e5 replay def Perize 2018-03-20 17:45:00 +09:00
e506a42dea Structure changes, adjustments to flow; Maru 2018-03-20 01:44:04 -03:00
4c77868d1c Simplified scripts a bit, a bit easier on the eyes Mordred 2018-03-20 00:05:54 +01:00
836279de09 Simplified scripts a bit, a bit easier on the eyes Mordred 2018-03-20 00:05:54 +01:00
e6e3e92742 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite Maru 2018-03-19 16:44:15 -03:00
c1cd763fba More work on entries; WIP change to find next 0 on vector; Maru 2018-03-19 05:58:17 -03:00
45f526f195 Merge pull request #280 from perize/pvp_duel_poc Mordred 2018-03-18 11:44:49 +01:00
642282ca21

Merge pull request #280 from perize/pvp_duel_poc Mordred 2018-03-18 11:44:49 +01:00
8f699b846f typo fix Perize 2018-03-18 19:32:42 +09:00
506ecfc19b typo fix Perize 2018-03-18 19:32:42 +09:00
f6a32e11c4 Added the duty action because why not Perize 2018-03-18 19:06:32 +09:00
d74c49218d Added the duty action because why not Perize 2018-03-18 19:06:32 +09:00
89be947e1e Update Ipcs.h Mordred 2018-03-18 10:23:59 +01:00
4a723907ef

Update Ipcs.h Mordred 2018-03-18 10:23:59 +01:00
8e66d72671 Added pvp duel packetdef Perize 2018-03-18 17:40:00 +09:00
dcdca5927f Added pvp duel packetdef Perize 2018-03-18 17:40:00 +09:00
464b44299e Small woops; Maru 2018-03-18 03:27:20 -03:00
c596bd3be1 Merge actor_rewrite Maru 2018-03-18 03:26:33 -03:00
9f8d4d9674 Further changes to list type; Maru 2018-03-18 03:25:01 -03:00
44d158e4e0 std::set -> std::vector (investigate further) Maru 2018-03-18 01:26:40 -03:00
29428599e1 Further list handling; Maru 2018-03-18 01:25:38 -03:00
85803bc96c Get rid of old stuff; Maru 2018-03-17 21:47:23 -03:00
86b7b62351 More friends list work; Get session from 64bits id; Maru 2018-03-17 21:43:24 -03:00
fcc27defef Improved handling of actors in zones generally Mordred 2018-03-17 18:06:13 +01:00
c4ec162f0f Improved handling of actors in zones generally Mordred 2018-03-17 18:06:13 +01:00
c92ee8b7cd Fixed an issue where players were removed from the wrong zone Mordred 2018-03-17 11:36:56 +01:00
2d4d6c6579 Fixed an issue where players were removed from the wrong zone Mordred 2018-03-17 11:36:56 +01:00
7a4d5e86fb Message fix Maru 2018-03-16 19:41:22 -03:00
01249a69d0 No need for messages Maru 2018-03-16 19:28:31 -03:00
9ea48e2524 Small fix Maru 2018-03-16 19:24:54 -03:00
2eb1aed8bb Submodule flags Maru 2018-03-16 19:12:07 -03:00
c8963653b0 Cotire flag Maru 2018-03-16 19:11:25 -03:00
a0bf531315 Merge pull request #276 from NotAdam/actor_rewrite Mordred 2018-03-16 19:34:08 +01:00
f2684f6c7d

Merge pull request #276 from NotAdam/actor_rewrite Mordred 2018-03-16 19:34:08 +01:00
80241c0318 Merge pull request #278 from perize/actor_rewrite Mordred 2018-03-16 19:32:04 +01:00
10bcd4d0f9

Merge pull request #278 from perize/actor_rewrite Mordred 2018-03-16 19:32:04 +01:00
53ff01aa84 style Mordred 2018-03-16 19:31:42 +01:00
3ed58efc4e

style Mordred 2018-03-16 19:31:42 +01:00
705018102b fixed #277 Perize 2018-03-17 02:27:46 +09:00
c67c6a1ab2 fixed #277 Perize 2018-03-17 02:27:46 +09:00
9aa7656e44 some more initui figured out Adam 2018-03-17 01:25:44 +11:00
15dd60534c some more initui figured out Adam 2018-03-17 01:25:44 +11:00
0d3b4431e8 make cf choose a random instance, fix territorymgr spawning event instances Adam 2018-03-16 21:40:59 +11:00
39df53f7d0 make cf choose a random instance, fix territorymgr spawning event instances Adam 2018-03-16 21:40:59 +11:00
797f5ee8ff enable df and all df content Adam 2018-03-16 20:53:48 +11:00
7cc60a1463 enable df and all df content Adam 2018-03-16 20:53:48 +11:00
5d198c7743 fix zone crash when using a normal zones instance id vs zone id Adam 2018-03-16 20:33:28 +11:00
4f4341ac78 fix zone crash when using a normal zones instance id vs zone id Adam 2018-03-16 20:33:28 +11:00
84fc705101 initui updates Adam 2018-03-16 20:22:03 +11:00
1de00098e0 initui updates Adam 2018-03-16 20:22:03 +11:00
65d7bb3fef don't start instance until all bound players are present Adam 2018-03-16 19:43:36 +11:00
96bf9d506a don't start instance until all bound players are present Adam 2018-03-16 19:43:36 +11:00
801bb1b732 instance player binding done, minor refactoring Adam 2018-03-16 16:56:43 +11:00
00771da156 instance player binding done, minor refactoring Adam 2018-03-16 16:56:43 +11:00
f5ff43857e Basics of instance binding system Mordred 2018-03-15 23:37:21 +01:00
efa0a81d9e Basics of instance binding system Mordred 2018-03-15 23:37:21 +01:00
ac94e9beff Update some script flags Mordred 2018-03-15 20:03:29 +01:00
229443ad57 Update some script flags Mordred 2018-03-15 20:03:29 +01:00
5069bdd3e0 Begin refactor of social system Maru 2018-03-15 13:21:17 -03:00
e59728f820 Merge pull request #275 from Minoost/actor_rewrite Mordred 2018-03-15 12:46:59 +01:00
cbe027a570

Merge pull request #275 from Minoost/actor_rewrite Mordred 2018-03-15 12:46:59 +01:00
919abe5162 style fix Mordred 2018-03-15 12:24:34 +01:00
fa198efbb5

style fix Mordred 2018-03-15 12:24:34 +01:00
6bb3c4f45c Implement director wide bgm Adam 2018-03-15 19:57:35 +09:00
1e19a7b0ae Implement director wide bgm Mino 2018-03-15 19:57:35 +09:00
e2216b98c3 Merge pull request #274 from NotAdam/actor_rewrite Mordred 2018-03-15 11:33:41 +01:00
cdcbf5ee91

Merge pull request #274 from NotAdam/actor_rewrite Mordred 2018-03-15 11:33:41 +01:00
108268b107 bgm is set correctly for instances Adam 2018-03-15 20:48:35 +11:00
093f23c5c4 bgm is set correctly for instances Adam 2018-03-15 20:48:35 +11:00
f0319081f2 style points and packet def Adam 2018-03-15 18:06:12 +11:00
3f0cdfac73 style points and packet def Adam 2018-03-15 18:06:12 +11:00