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

b49cbc0644 Use precompiled headers for scripts and some libraries Mordred Admin 2018-02-28 11:51:44 +01:00
6934df80f2 More include improvements Mordred Admin 2018-02-28 11:14:25 +01:00
aca7508d00 More include improvements Mordred Admin 2018-02-28 11:14:25 +01:00
72e8fa36e8 Rearranged includes for potential speed increases Mordred Admin 2018-02-28 10:26:03 +01:00
083a3aa239 Rearranged includes for potential speed increases Mordred Admin 2018-02-28 10:26:03 +01:00
fae163eafa Fixed eobjects getting incorrect ids, fixed actors not properly removing from cells Mordred 2018-02-28 00:03:26 +01:00
e4d6711ad4 Fixed eobjects getting incorrect ids, fixed actors not properly removing from cells Mordred 2018-02-28 00:03:26 +01:00
40797f425e Merge pull request #256 from GokuWeedLord/actor_rewrite Mordred 2018-02-27 17:41:48 +01:00
fa3039e769

Merge pull request #256 from GokuWeedLord/actor_rewrite Mordred 2018-02-27 17:41:48 +01:00
a299b9f7e6 Merge remote-tracking branch 'upstream/actor_rewrite' into actor_rewrite Adam 2018-02-27 23:05:52 +11:00
4f4af97b26 Merge remote-tracking branch 'upstream/actor_rewrite' into actor_rewrite Adam 2018-02-27 23:05:52 +11:00
d4c3250ab0 eobj state cmd and some ontalk fixes Adam 2018-02-27 23:05:42 +11:00
6d6c3c0f90 eobj state cmd and some ontalk fixes Adam 2018-02-27 23:05:42 +11:00
d068e24476 Build fix by excluding pcb_reader and event_object_dumper for now Mordred Admin 2018-02-27 09:32:50 +01:00
2d45e32b08 Build fix by excluding pcb_reader and event_object_dumper for now Mordred Admin 2018-02-27 09:32:50 +01:00
737a3a12f9 restructure instance script folder Adam 2018-02-27 17:08:38 +11:00
7a7674b943 restructure instance script folder Adam 2018-02-27 17:08:38 +11:00
e15c34a74d Added instance script dumper Mordred 2018-02-26 23:50:50 +01:00
a7bef9e244 Added instance script dumper Mordred 2018-02-26 23:50:50 +01:00
8e41e35a4e Added all barebone scripts Mordred 2018-02-26 23:43:19 +01:00
b9da9eed66 Added all barebone scripts Mordred 2018-02-26 23:43:19 +01:00
cc1614c04b Merge pull request #255 from GokuWeedLord/actor_rewrite Mordred 2018-02-26 22:06:31 +01:00
c4cbf256e3

Merge pull request #255 from GokuWeedLord/actor_rewrite Mordred 2018-02-26 22:06:31 +01:00
699a9fac8f Update Sastasha.cpp Mordred 2018-02-26 19:33:31 +01:00
0e64bf76d2

Update Sastasha.cpp Mordred 2018-02-26 19:33:31 +01:00
efd00c719f eobj interaction callbacks, eobj spawning fixed, sastasha instance eobjs Adam 2018-02-27 02:13:01 +11:00
4afc9e91b7 eobj interaction callbacks, eobj spawning fixed, sastasha instance eobjs Adam 2018-02-27 02:13:01 +11:00
60def9134d fix possible null pointer access & eobj state update Adam 2018-02-25 21:46:34 +11:00
4137379853 fix possible null pointer access & eobj state update Adam 2018-02-25 21:46:34 +11:00
d98ad3b315 Merge pull request #254 from GokuWeedLord/actor_rewrite Mordred 2018-02-25 09:41:27 +01:00
3257522d31

Merge pull request #254 from GokuWeedLord/actor_rewrite Mordred 2018-02-25 09:41:27 +01:00
6b089af4af cmake test Adam 2018-02-25 17:24:00 +11:00
c210b5ebef cmake test Adam 2018-02-25 17:24:00 +11:00
3cf0a233b1 redirect ontalk events inside instances to instancecontent ptr Adam 2018-02-25 17:23:52 +11:00
8a3ed93fbc redirect ontalk events inside instances to instancecontent ptr Adam 2018-02-25 17:23:52 +11:00
1235ce264b more opcodes Adam 2018-02-25 15:16:42 +11:00
b6cfa339d6 more opcodes Adam 2018-02-25 15:16:42 +11:00
8504ee7e12 Simplified syntax for eobj registering, added test script for thousand maws Mordred 2018-02-25 01:23:40 +01:00
e548e148e5 Simplified syntax for eobj registering, added test script for thousand maws Mordred 2018-02-25 01:23:40 +01:00
2ce7d91096 Improved timing on instance starting Mordred 2018-02-24 23:53:32 +01:00
67c2cb7971 Improved timing on instance starting Mordred 2018-02-24 23:53:32 +01:00
2b3512ad64 Fixed eventObject not using correct object id Mordred 2018-02-24 15:21:18 +01:00
8cf15061d0 Fixed eventObject not using correct object id Mordred 2018-02-24 15:21:18 +01:00
c6c2210471 Added onEnterTerritory for IC, also changed the way IC is called Mordred 2018-02-24 15:19:32 +01:00
65242d2dee Added onEnterTerritory for IC, also changed the way IC is called Mordred 2018-02-24 15:19:32 +01:00
1a1349b33c Use make shared in instance scripts for eobjs Mordred 2018-02-24 09:40:44 +01:00
c7e15bf52a Use make shared in instance scripts for eobjs Mordred 2018-02-24 09:40:44 +01:00
7bf58b315a EObjects are now given a name and can be retrieved using it Mordred 2018-02-24 00:07:07 +01:00
acee4d4b51 EObjects are now given a name and can be retrieved using it Mordred 2018-02-24 00:07:07 +01:00
0a177c3470 EventObjects are not properly spawned and initialized Mordred 2018-02-23 23:47:21 +01:00
f9722b5e2e EventObjects are not properly spawned and initialized Mordred 2018-02-23 23:47:21 +01:00
20f87d7236 Warrior of light in init ui Mordred 2018-02-22 23:13:31 +01:00
c53642bf7d Warrior of light in init ui Mordred 2018-02-22 23:13:31 +01:00
d05f523eb9 More transitional work towards actors as base Mordred 2018-02-22 22:15:32 +01:00
99520f4923 More transitional work towards actors as base Mordred 2018-02-22 22:15:32 +01:00
8b5d30802d More stuff moved over to actor baseclass Mordred 2018-02-22 18:12:36 +01:00
692ca9d56e More stuff moved over to actor baseclass Mordred 2018-02-22 18:12:36 +01:00
9fd3d59488 Added type checks for possibly object kinds Mordred 2018-02-22 17:06:30 +01:00
cb9a93db6c Added type checks for possibly object kinds Mordred 2018-02-22 17:06:30 +01:00
dc1a7e4ae1 Actors are now used as base for any entity Mordred 2018-02-22 15:31:10 +01:00
6e5737f401 Actors are now used as base for any entity Mordred 2018-02-22 15:31:10 +01:00
b806535f11 Fixed an issue with teleport not picking the correct target position, eventaction unlocks player now Mordred 2018-02-21 23:30:35 +01:00
29918f5807 Fixed an issue with teleport not picking the correct target position, eventaction unlocks player now Mordred 2018-02-21 23:30:35 +01:00
c2a95a2d7e In range restructuring Mordred 2018-02-21 18:06:52 +01:00
c1fb728a05 In range restructuring Mordred 2018-02-21 18:06:52 +01:00
b8a366fb29 Removed battlenpc for cleanup work Mordred 2018-02-21 12:48:27 +01:00
f12c431173 Removed battlenpc for cleanup work Mordred 2018-02-21 12:48:27 +01:00
8e38ffdb56 Build fix Mordred 2018-02-21 11:28:34 +01:00
684735ee55 Build fix Mordred 2018-02-21 11:28:34 +01:00
322dce393d Started stripping actors - readding after rewrite Mordred 2018-02-20 23:42:09 +01:00
7073211411 Started stripping actors - readding after rewrite Mordred 2018-02-20 23:42:09 +01:00
c664c5de90 Renaming classes in preperation of actor rework Mordred 2018-02-20 22:46:44 +01:00
9a4e7533c6 Renaming classes in preperation of actor rework Mordred 2018-02-20 22:46:44 +01:00
6ec8601214 Revert "Changeing base access type of actors to gameobject" Mordred 2018-02-19 22:00:32 +01:00
ba511a23e2 Revert "Changeing base access type of actors to gameobject" Mordred 2018-02-19 22:00:32 +01:00
4457a45aa3 Changeing base access type of actors to gameobject Mordred 2018-02-18 23:48:51 +01:00
7d916f7d86 Changeing base access type of actors to gameobject Mordred 2018-02-18 23:48:51 +01:00
7fddb75c46 Simplified in range logic Mordred 2018-02-18 22:53:12 +01:00
c4206ee9bc Simplified in range logic Mordred 2018-02-18 22:53:12 +01:00
e99cfbe787 Added comment to spawn packet indicating field meaning of type Mordred 2018-02-18 02:12:15 +01:00
62f69040b4 Added comment to spawn packet indicating field meaning of type Mordred 2018-02-18 02:12:15 +01:00
48658ede62 Added Waymarks trigger to enum, fixed initial array sizes for new chars Mordred 2018-02-18 02:05:25 +01:00
237d3cc7a6 Added Waymarks trigger to enum, fixed initial array sizes for new chars Mordred 2018-02-18 02:05:25 +01:00
a69ccd33df More cleanup of actionhandler Mordred 2018-02-18 01:50:20 +01:00
883916aa48 More cleanup of actionhandler Mordred 2018-02-18 01:50:20 +01:00
c09ec03921 Actionhandler cleaned up a bit Mordred 2018-02-17 01:20:40 +01:00
1f37416202 Actionhandler cleaned up a bit Mordred 2018-02-17 01:20:40 +01:00
8c1835437f Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-02-15 23:50:40 +01:00
b9a78b72fd Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-02-15 23:50:40 +01:00
5d8b5786d6 removed all unused state flags, mapped more client actions Mordred 2018-02-15 23:50:28 +01:00
b8cbdf3fa5 removed all unused state flags, mapped more client actions Mordred 2018-02-15 23:50:28 +01:00
909ac5c619 Merge pull request #253 from GokuWeedLord/develop Mordred 2018-02-15 10:12:07 +01:00
66d029467b

Merge pull request #253 from GokuWeedLord/develop Mordred 2018-02-15 10:12:07 +01:00
6864f217a7 add todo note Adam 2018-02-15 19:44:54 +11:00
48a1fd502a add todo note Adam 2018-02-15 19:44:54 +11:00
0d8a2aaf8c fix compile warning Adam 2018-02-15 19:27:44 +11:00
cb44147564 fix compile warning Adam 2018-02-15 19:27:44 +11:00
50f90d960b More zone refactoring, general style fixes Mordred 2018-02-14 21:11:23 +01:00
ddb4247588 More zone refactoring, general style fixes Mordred 2018-02-14 21:11:23 +01:00
48162e2966 refactoring of session update loop in zone Mordred 2018-02-14 20:44:35 +01:00