sapphire

mirrors/sapphire

Fork 0

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

e8ab570502 refactoring of session update loop in zone Mordred 2018-02-14 20:44:35 +01:00
6b801474b7 Build fix... Mordred 2018-02-14 19:17:10 +01:00
b95d741cd8 Build fix... Mordred 2018-02-14 19:17:10 +01:00
d832efdbc1 Appveyor fix Mordred 2018-02-14 18:24:59 +01:00
d7f8b55b08 Appveyor fix Mordred 2018-02-14 18:24:59 +01:00
0dba611358 Actually generate the version strings correctly Mordred Admin 2018-02-14 14:46:18 +01:00
2e3a596c2d Actually generate the version strings correctly Mordred Admin 2018-02-14 14:46:18 +01:00
df61b53d1a Cleaned up generated exd stuff Mordred Admin 2018-02-14 12:31:47 +01:00
c54ebbe53c Cleaned up generated exd stuff Mordred Admin 2018-02-14 12:31:47 +01:00
8bcd5f8fe5 Fixed an issue where offline chars were not removed properly Mordred 2018-02-13 22:37:45 +01:00
0d4b846e79 Fixed an issue where offline chars were not removed properly Mordred 2018-02-13 22:37:45 +01:00
677c583d80 updated submodule Mordred 2018-02-13 19:37:04 +01:00
607143ea7c updated submodule Mordred 2018-02-13 19:37:04 +01:00
bcf06b44b0 Updated submodules Mordred Admin 2018-02-13 15:11:34 +01:00
fe9554511f Updated submodules Mordred Admin 2018-02-13 15:11:34 +01:00
63a06dba44 Further clean up in range stuff Mordred 2018-02-11 23:52:44 +01:00
649bd7d8e6 Further clean up in range stuff Mordred 2018-02-11 23:52:44 +01:00
66d7dbab4f In range containers no longer declared publicly Mordred 2018-02-11 22:57:00 +01:00
cee84cd9ff In range containers no longer declared publicly Mordred 2018-02-11 22:57:00 +01:00
0598577c90 Merge pull request #252 from goaaats/develop Mordred 2018-02-11 17:26:14 +01:00
f0a649b53f

Merge pull request #252 from goaaats/develop Mordred 2018-02-11 17:26:14 +01:00
56f20a735c Update submodule again goaaats 2018-02-11 17:20:54 +01:00
6cf4bf471a Update submodule again goaaats 2018-02-11 17:20:54 +01:00
15345d36d2 Fix pcb_reader, quest_parser goaaats 2018-02-11 16:50:31 +01:00
7d3a3b8c66 Fix pcb_reader, quest_parser goaaats 2018-02-11 16:50:31 +01:00
1bc05bed4d Update libraries goaaats 2018-02-11 13:59:38 +01:00
e018914eb9 Update libraries goaaats 2018-02-11 13:59:38 +01:00
aad89ff683 Merge pull request #251 from GokuWeedLord/instancescripting Mordred 2018-02-10 15:56:21 +01:00
7229984c07

Merge pull request #251 from GokuWeedLord/instancescripting Mordred 2018-02-10 15:56:21 +01:00
bea3cae216 huhuhu Adam 2018-02-10 22:35:02 +11:00
8280700e81 huhuhu Adam 2018-02-10 22:35:02 +11:00
530cf8a37a move instance objects to zone from instancecontent Adam 2018-02-10 21:53:16 +11:00
31a9ed45a6 move instance objects to zone from instancecontent Adam 2018-02-10 21:53:16 +11:00
d51c5924c5 rename objectcontrol -> objectspawn Adam 2018-02-10 21:51:02 +11:00
3d1555209e rename objectcontrol -> objectspawn Adam 2018-02-10 21:51:02 +11:00
5d5c1cad30 [huge brain image] Adam 2018-02-10 17:56:03 +11:00
69a0af66e5 [huge brain image] Adam 2018-02-10 17:56:03 +11:00
4022b28eb2 fix indentation Adam 2018-02-10 15:45:06 +11:00
cc3ceeebd5 fix indentation Adam 2018-02-10 15:45:06 +11:00
bc5004598d Merge remote-tracking branch 'upstream/develop' into instancescripting Adam 2018-02-10 14:05:12 +11:00
727207ec08 Merge remote-tracking branch 'upstream/develop' into instancescripting Adam 2018-02-10 14:05:12 +11:00
32f0e30e8e instane obj spawning Adam 2018-02-10 14:03:59 +11:00
2f6bc9e1eb instane obj spawning Adam 2018-02-10 14:03:59 +11:00
2000d5d2f8 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain Mordred 2018-02-10 01:21:31 +01:00
1f415a0d05 Majorly refactored usage of shared_ptr also added GameObject into Actor inheritance chain Mordred 2018-02-10 01:21:31 +01:00
f2a407c5e4 Merge pull request #250 from GokuWeedLord/instancescripting Mordred 2018-02-09 17:40:31 +01:00
ac8e0eb7e4

Merge pull request #250 from GokuWeedLord/instancescripting Mordred 2018-02-09 17:40:31 +01:00
0c54d41304 instance objects, gameobj implementation Adam 2018-02-10 02:47:32 +11:00
01e22b679d instance objects, gameobj implementation Adam 2018-02-10 02:47:32 +11:00
5b08bca9d8 Merge branch 'develop' into instancescripting Adam 2018-02-09 23:50:26 +11:00
23d958e768 Merge branch 'develop' into instancescripting Adam 2018-02-09 23:50:26 +11:00
f209f97492 Merge pull request #249 from GokuWeedLord/feature/wsl Mordred 2018-02-09 12:31:18 +01:00
8573bfa7db

Merge pull request #249 from GokuWeedLord/feature/wsl Mordred 2018-02-09 12:31:18 +01:00
42e0a7c09a builds should work now... probably Adam 2018-02-09 20:25:18 +11:00
ca42ed228d builds should work now... probably Adam 2018-02-09 20:25:18 +11:00
99eb4c7d17 fix script builds and logging issues on WSL Adam 2018-02-09 20:11:30 +11:00
9d8f3648a0 fix script builds and logging issues on WSL Adam 2018-02-09 20:11:30 +11:00
6594dd1dc4 Missing virtual destructor implementation Mordred Admin 2018-02-09 08:32:28 +01:00
3ef490693b Missing virtual destructor implementation Mordred Admin 2018-02-09 08:32:28 +01:00
e7b8c2cb22 New base class for anything actor related, not being used yet Mordred 2018-02-09 00:55:44 +01:00
e1dafd3d5e New base class for anything actor related, not being used yet Mordred 2018-02-09 00:55:44 +01:00
61dfd16d7b instance scripting stuff Adam 2018-02-09 02:34:43 +11:00
d3bdd8856a instance scripting stuff Adam 2018-02-09 02:34:43 +11:00
1f40bcf91b Merge pull request #247 from GokuWeedLord/develop Mordred 2018-02-08 15:30:28 +01:00
6cc95cc73e

Merge pull request #247 from GokuWeedLord/develop Mordred 2018-02-08 15:30:28 +01:00
e635f0b184 Merge pull request #248 from goaaats/develop Mordred 2018-02-08 15:30:18 +01:00
e115b0bc16

Merge pull request #248 from goaaats/develop Mordred 2018-02-08 15:30:18 +01:00
76dcba3f7f comment added Mordred 2018-02-08 15:29:46 +01:00
abf1194a7a

comment added Mordred 2018-02-08 15:29:46 +01:00
38661033fa Handle via inRangeSet goaaats 2018-02-08 15:25:59 +01:00
cb787b44f5 Handle via inRangeSet goaaats 2018-02-08 15:25:59 +01:00
2383fb4321 Implement correct handling for private areas goaaats 2018-02-08 15:05:29 +01:00
9790594016 Implement correct handling for private areas goaaats 2018-02-08 15:05:29 +01:00
bb5c97ed2f fix instance expire time Adam 2018-02-09 00:04:46 +11:00
1e7c2adefb fix instance expire time Adam 2018-02-09 00:04:46 +11:00
4ccc2cfc26 Merge remote-tracking branch 'upstream/develop' into develop Adam 2018-02-08 23:58:30 +11:00
7205e9f82c Merge remote-tracking branch 'upstream/develop' into develop Adam 2018-02-08 23:58:30 +11:00
6f84e9ef41 restructure script folder hierachy to remove unnecessary build targets Adam 2018-02-08 23:28:52 +11:00
bf404f7371 restructure script folder hierachy to remove unnecessary build targets Adam 2018-02-08 23:28:52 +11:00
06bf24a606 pcb_reader dumps hierachyId now Adam 2018-02-08 23:28:30 +11:00
89f995376e pcb_reader dumps hierachyId now Adam 2018-02-08 23:28:30 +11:00
cf6d997405 Merge pull request #246 from GokuWeedLord/develop Mordred 2018-02-08 11:40:51 +01:00
dae8d74fc3

Merge pull request #246 from GokuWeedLord/develop Mordred 2018-02-08 11:40:51 +01:00
2347568293 fix pcb_reader ignoring windows paths in arguments Adam 2018-02-08 20:29:39 +11:00
10f6e43148 fix pcb_reader ignoring windows paths in arguments Adam 2018-02-08 20:29:39 +11:00
4f748d7d3b persist effect packet opcode Adam 2018-02-08 19:41:27 +11:00
c4991c8c52 persist effect packet opcode Adam 2018-02-08 19:41:27 +11:00
aa9ca62e6b Merge pull request #245 from takhlaq/pcb_reader Mordred 2018-02-08 07:53:25 +01:00
145a421f62

Merge pull request #245 from takhlaq/pcb_reader Mordred 2018-02-08 07:53:25 +01:00
6a32729540 added instancecontent.csv dump to pcb_reader Tahir Akhlaq 2018-02-07 22:13:20 +00:00
bb97e1160b added instancecontent.csv dump to pcb_reader Tahir Akhlaq 2018-02-07 22:13:20 +00:00
5fdf126594 Merge pull request #244 from GokuWeedLord/develop Mordred 2018-02-07 06:14:28 +01:00
4dc5d107a8

Merge pull request #244 from GokuWeedLord/develop Mordred 2018-02-07 06:14:28 +01:00
f94a8ceee5 remove exddata from sapphire_zone Adam 2018-02-07 14:27:52 +11:00
7528db3b83 remove exddata from sapphire_zone Adam 2018-02-07 14:27:52 +11:00
609a92fd49 update generated exd data Adam 2018-02-07 13:33:02 +11:00
b74083c06c update generated exd data Adam 2018-02-07 13:33:02 +11:00
0cb304083d More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value> Mordred 2018-02-07 00:00:48 +01:00
4e1c82c2be More preparational director logic, state inside can be modified with !instance <instanceId> <varIdx> <value> Mordred 2018-02-07 00:00:48 +01:00
59da08be28 Style fix Mordred 2018-02-06 00:03:08 +01:00