sapphire

mirrors/sapphire

Fork 0

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

14361ff182

Merge pull request #759 from Skyliegirl33/gearset-implementation Mordred 2022-01-21 22:56:13 +01:00
57da97236f Some more cleanup in regards of zones Mordred 2022-01-21 22:55:14 +01:00
ae3d57a492 Clean up quest_parser Rushi 2022-01-21 21:58:46 +01:00
7e8209c11b Minor code cleanups Mordred 2022-01-21 08:41:48 +01:00
0d73f42bcd

Merge pull request #757 from dude22072/ArcCleanup Mordred 2022-01-21 01:03:09 +01:00
d00be5cd88 Properly fade out dead mobs Mordred 2022-01-21 00:42:40 +01:00
f98747df64

Merge pull request #758 from hkAlice/threepointoh Mordred 2022-01-21 00:41:57 +01:00
53c4ea962b fick linux build; Alice Ogeda 2022-01-20 20:34:00 -03:00
e44902fa75 remove more unused scripts; Alice Ogeda 2022-01-20 20:27:01 -03:00
4eca7355c2 Merge branch 'ThreePointOh' of https://github.com/SapphireServer/Sapphire into threepointoh Alice Ogeda 2022-01-20 20:14:40 -03:00
1235ea99ac parse combo data in actionlut; check for nextcombo/ogcd to allow ogcd weaving in combos; Alice Ogeda 2022-01-20 20:14:34 -03:00
e5028fea52 More readability of packet commands Mordred 2022-01-20 23:40:18 +01:00
092e3eca76 Removed test tasks and moved info print on task execute to taskmgr Mordred 2022-01-20 22:45:48 +01:00
097a00b913 Task for dead bnpc removal Mordred 2022-01-20 22:42:26 +01:00
00ecce8406 Merge branch 'ThreePointOh' of https://github.com/SapphireServer/Sapphire into threepointoh Alice Ogeda 2022-01-20 17:39:24 -03:00
24708040d0 some ogcd checks; Alice Ogeda 2022-01-20 17:39:22 -03:00
e7eb8df433 Basic Task system, proper zone initializing Mordred 2022-01-20 21:37:14 +01:00
1da2cce4da ARC clang cleanup dude22072 2022-01-19 13:53:00 -06:00
8eb0638848 Some clang-tidy cleanups Mordred 2022-01-19 17:55:29 +01:00
125c02d127 Very very simplistic mob exp Mordred 2022-01-19 17:22:56 +01:00
31010a4cf5

Merge pull request #756 from dude22072/ThreePointOh Mordred 2022-01-19 08:23:56 +01:00
588a692c73 Remove unneeded ampersands dude22072 2022-01-18 19:00:54 -06:00
f89a677bd3 CNJ reference formatting fix dude22072 2022-01-18 18:53:16 -06:00
d19c2dd5bb CommonGen enum adjustments. Mordred 2022-01-19 00:45:33 +01:00
1270f496b8 Weather works again. Mordred 2022-01-19 00:18:50 +01:00
aa0c318494 More cleanup of territoryMgr in preparation of new move logic Mordred 2022-01-18 23:47:35 +01:00
7bde6c9c00 Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh Mordred 2022-01-18 08:12:08 +01:00
9ab636662d Added triggerOwner to bnpc Mordred 2022-01-18 08:03:49 +01:00
8f6e76dc55 CNJ Quests dude22072 2022-01-18 00:07:49 -06:00
d21b2d3ea2

Merge pull request #755 from dude22072/ThreePointOh Adam 2022-01-18 14:37:53 +11:00
8ff1faf666 Fix ClsArc004 dude22072 2022-01-17 20:33:05 -06:00
00f0c1b431 Clean up of move logic for housing territories, potentially some breakage. Needs to be tested still Mordred 2022-01-18 00:21:38 +01:00
7402327d26

Merge pull request #754 from Skyliegirl33/gearset-implementation Mordred 2022-01-16 23:19:48 +01:00
c19df0e637 More formatting Rushi 2022-01-16 23:19:10 +01:00
637fe3614d Remove logging line Rushi 2022-01-16 22:56:49 +01:00
62dabd571c Fix formatting Rushi 2022-01-16 22:53:02 +01:00
2f9a56e6a1 Add missing namespace Rushi 2022-01-16 22:49:58 +01:00
575fb37854 Implement mount unlocking Rushi 2022-01-16 22:48:55 +01:00
e0398b0dbb Fix Mount struct Rushi 2022-01-16 22:45:56 +01:00
b9032f551e Fix for quests being added on decline Mordred 2022-01-16 22:22:27 +01:00
3eb5fbf6fa OnWithin and OnOutside range have been adjusted to include Quest object, minor fix to onEmote function quest updates Mordred 2022-01-16 19:40:21 +01:00
27b218fd78 Removed old code to further simplify warp mechanics Mordred 2022-01-16 11:57:04 +01:00
1085403677

Merge pull request #753 from dude22072/ThreePointOh Mordred 2022-01-16 10:57:16 +01:00
026059ee15 More ARC cleanup dude22072 2022-01-15 22:10:42 -06:00
8767991e7a Removal of more territory move logic Mordred 2022-01-15 23:28:06 +01:00
79981909de Various smaller cleanups Mordred 2022-01-15 22:48:27 +01:00
3f6f31b848 Hopefully a fix for effects breaking in instanced zones Mordred 2022-01-14 23:13:47 +01:00
d245dcfd2f

Merge pull request #752 from Skyliegirl33/gearset-implementation Mordred 2022-01-14 20:05:40 +01:00
3063174652 Fix unlock quest for Archer Rushi 2022-01-14 19:07:38 +01:00
d449c97a9f Add support for unlocking gear sets Rushi 2022-01-14 19:06:23 +01:00
df58683c6f Fix compilation issues on *NIX platforms Rushi 2022-01-14 19:02:50 +01:00
f093aba377 Fixed event item action, also changed the way the action interrupt grace period works Mordred 2022-01-14 12:51:37 +01:00
7fa20f2a3a

Merge pull request #751 from dude22072/ThreePointOh Mordred 2022-01-14 08:45:39 +01:00
cfcc29acbd More ARC formatting dude22072 2022-01-14 01:44:35 -06:00
55d212ddf6 ARC quests formatting dude22072 2022-01-14 01:26:54 -06:00
991e0551c3

Merge pull request #733 from Taezen/develop Mordred 2022-01-14 08:19:10 +01:00
ad1f1fd45d

Merge pull request #750 from hkAlice/threepointoh Mordred 2022-01-14 08:04:55 +01:00
c4b7b1e0a0 Fix for eobj struct Mordred 2022-01-14 08:02:55 +01:00
d78523a072 Implement ARC questline dude22072 2022-01-13 23:18:53 -06:00
27a800cc5e expose playermgr() to nativescript; fix friendlist insert on new character; Alice Ogeda 2022-01-14 01:34:58 -03:00
0714a56e56 Fix for setLevelForClass Mordred 2022-01-13 23:41:24 +01:00
d978197b3d Friendly bnpcs no longer fight eachother Mordred 2022-01-13 22:51:47 +01:00
c19d4d4b25 Forgot to include quest param in debug print Mordred 2022-01-13 21:02:00 +01:00
bb0d60966b Merge branch 'ThreePointOh' of https://github.com/SapphireMordred/Sapphire into ThreePointOh Mordred 2022-01-13 21:01:04 +01:00
549d2adbcb Various small clean ups Mordred 2022-01-13 21:00:56 +01:00
cefbdb6fac Added quest to EObj hit event Mordred 2022-01-13 21:00:47 +01:00
daf9ff30d8

Merge pull request #749 from hkAlice/threepointoh Mordred 2022-01-13 15:47:29 +01:00
16ce89cb48 revert sheet check for action and fix combo; Alice Ogeda 2022-01-13 11:45:40 -03:00
be8d885e39 Aethery bools fix and potential action flags. Mordred 2022-01-12 23:16:49 +01:00
c5c8199bd2 More cleanup and a session removal bug fixed Mordred 2022-01-12 22:28:39 +01:00
775b1e5641 Cleanup of the server mainloop Mordred 2022-01-12 15:10:54 +01:00
1472041262 get/setCurrentTerritory now completely removed Mordred 2022-01-12 11:11:47 +01:00
fda2353e78 Small type conversion warnings fixed Mordred 2022-01-11 14:42:45 +01:00
eee27910ec Missed one getCurrentTerri call. Mordred 2022-01-11 00:22:58 +01:00
1f1e761016 Removed old getZoneId function, more detangleing. Mordred 2022-01-11 00:18:00 +01:00
0c1bbfb8d0 Removing references to getCurrentTerritory in preparation for further detangleing Mordred 2022-01-10 23:50:44 +01:00
2e66750748

Merge pull request #748 from hkAlice/happy-feet Mordred 2022-01-10 23:44:01 +01:00
4cecf791f6 remove test line for multiple source effects in one cast; Alice Ogeda 2022-01-10 19:34:51 -03:00
3d5bcc7d67 slight effect rework; support multiple ct/tg per action for both aoe and singletarget; fix several inconsistencies with effect packets; Alice Ogeda 2022-01-10 19:31:21 -03:00
3b02afe99b Screenmessage when zoning, some effect packet 1 cleanup Mordred 2022-01-07 21:22:55 +01:00
beca9ccb3b Allow setting or target and source effects in single target effect packet Mordred 2022-01-06 20:50:00 +01:00
4fccaef569 Renamed an actor control according to use Mordred 2022-01-06 20:44:35 +01:00
f0871c6217 Improved pathfinding, changed action packet to use the right variant for auto attacks, scaled fall damage Mordred 2022-01-06 20:25:50 +01:00
67d3d28a75

Merge pull request #747 from hkAlice/slippin-fallin-cant-get-up Mordred 2022-01-06 00:59:57 +01:00
25a179ab3a fall dmg calc; adjustments to falling state in movehandler; Alice Ogeda 2022-01-05 20:56:02 -03:00
ab1fbd833e Improve path finding and stop position of mobs, also auto attack distance fixed Mordred 2022-01-04 22:51:29 +01:00
a5ba5bb2fb Further improvement of damage calculations Mordred 2022-01-03 13:24:33 +01:00
76dfa7912e Dmg calc reworked Mordred 2022-01-02 23:31:02 +01:00
d9e7e42a6d Basic actions are functional Mordred 2022-01-02 22:32:17 +01:00
c4129924ea Fixed sprint action Mordred 2022-01-02 16:41:38 +01:00
4b74b8bfc8 It is now possible to deaggro striking dummies properly... Mordred 2021-12-31 16:20:11 +01:00
514c507dcf Renabled Bnpc dmg calc, striking dummies are now invincible. Mordred 2021-12-31 14:57:18 +01:00
d244ad437b Spawn overworld mobs with accurate MaxHp Mordred 2021-12-30 13:57:08 +01:00
b7aaeb38b1 Fixed some small linkshell issues Mordred 2021-12-22 23:17:35 +01:00
34139a8937 Implemented a kill quest as a test again Mordred 2021-12-22 00:40:11 +01:00
9f83094c43 sendEventNotice has been moved from player to eventMgr, reformatted scripts Mordred 2021-12-21 13:48:24 +01:00
d6dd81ad1b Forward entity and name id to the onKill event Mordred 2021-12-21 12:19:35 +01:00
532645fc88 Various quest script adjustments. Mordred 2021-12-21 12:02:22 +01:00
495a675f35 Fixed an exp ui issue Mordred 2021-12-21 11:46:40 +01:00
296dbb9904 GiveQuestRewards is no longer used in quests, but called automatically on finish Mordred 2021-12-21 01:05:08 +01:00