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

#1

#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

#135

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#153

#154

#155

#156

#157

#158

#158

#159

#16

#16

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#173

#174

#175

#176

#177

#179

#18

#184

#185

#186

#187

#188

#189

#19

#190

#191

#191

#193

#193

#194

#195

#196

#196

#197

#198

#199

#2

#200

#201

#202

#203

#204

#206

#207

#208

#209

#209

#21

#211

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#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

#263

#264

#265

#266

#267

#267

#268

#269

#269

#27

#270

#271

#272

#273

#274

#275

#276

#278

#279

#279

#28

#280

#281

#282

#283

#285

#286

#287

#288

#289

#29

#29

#290

#290

#291

#292

#293

#294

#295

#295

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#305

#306

#307

#316

#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

#362

#363

#364

#365

#366

#367

#368

#369

#370

#371

#372

#373

#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

#4

#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

#49

#499

#5

#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

#6

#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

#7

#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

#79

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#8

#8

#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

#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

#9

#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

#960

#961

#962

#963

#964

#965

#967

#969

#97

#970

#971

#972

#973

#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

Mono Color

• bf3368224a
  Merge pull request #973 from arieshi255/fix-mapmgr master Mordred 2025-01-17 23:31:27 +01:00
• a2c8ee1845 Update map icons on quest completion Rushi 2025-01-17 23:15:27 +01:00
• 6739d8634c
  Merge pull request #972 from arieshi255/fixup-cf Mordred 2025-01-17 21:17:34 +01:00
• bb17030c68 Add an enum for content flags instead of using magic numbers Rushi 2025-01-17 21:16:58 +01:00
• a5919cbbd2 [3.x] wip: Fix Duty Finder to work again Rushi 2025-01-17 19:15:44 +01:00
• c50f4e04f3
  Merge pull request #971 from arieshi255/fix-mapmgr Mordred 2025-01-17 09:12:17 +01:00
• db0798b423 [3.x] Fix some MapMgr issues Rushi 2025-01-10 21:32:48 +01:00
• a14b44f654 Encounter handling moved to scripts, removed obsolete EncounterFight implementation those_who_fight Mordred 2025-01-16 12:12:27 +01:00
• e3b53b5e19 Fix for BNpcs positions not being updated properly through timelines and removal of unnused code Mordred 2025-01-15 13:58:08 +01:00
• 866103c9d5 Timpoint for actiontimeline Mordred 2025-01-13 12:53:40 +01:00
• d08906e736 Fixed pathing being reset properly Mordred 2025-01-12 21:16:55 +01:00
• c0aed54dfe Fixed spawning issues and navi problems in encounters Mordred 2025-01-11 21:58:27 +01:00
• 25ab437d3d Stop bnpcs from moving when they have an active action #2 Mordred 2025-01-07 22:55:43 +01:00
• 996717250d Stop bnpcs from moving when they have an active action Mordred 2025-01-07 22:54:53 +01:00
• 130c603f33
  Merge pull request #970 from hkAlice/bs-stuff hkAlice 2025-01-07 18:40:55 -03:00
• 33a8212f0c fix ifrit nail kill not pushing ifrit hellfire; Alice Ogeda 2025-01-07 18:40:19 -03:00
• d951a198d7 Removed pragma region Mordred 2025-01-07 15:55:24 +01:00
• 0f982a46d1 Fixed battleTalk Mordred 2025-01-07 14:22:42 +01:00
• beeae1b5c8 Maintarget logic improved in AOE packet generation Mordred 2025-01-06 20:17:09 +01:00
• 1eb202faa8 Always send AOE effects as AOE packet, regardless of targetcount. Also allow setting position of aoe effect Mordred 2025-01-06 15:35:17 +01:00
• 46cbd436f9
  Merge pull request #969 from hkAlice/bs-stuff hkAlice 2025-01-05 17:54:31 -03:00
• d0cd9c4947 fick timepoints not firing together; Alice Ogeda 2025-01-05 17:53:07 -03:00
• 135b056f52 Changed position checks to recude moveactor spam, also fixed actions not fireing on idle actors Mordred 2025-01-04 23:15:50 +01:00
• f19d3167ca
  Merge pull request #928 from hkAlice/bs-stuff Mordred 2025-01-04 16:51:41 +01:00
• 75edbdbcd4 myerge; Alice Ogeda 2025-01-04 12:28:50 -03:00
• 62fa2a4a04 fix crash on HW+ skills related; aligned action struct a tiny bit more; Alice Ogeda 2025-01-03 05:08:22 -03:00
• f2805e951c myerge squashy; Alice Ogeda 2025-01-03 02:46:22 -03:00
• ee72f2e447 fix crash on mobkills due to misuse of classjob index; Alice Ogeda 2025-01-02 23:56:59 -03:00
• 952391ae4f Song learn functions moved Mordred 2025-01-02 16:06:47 +01:00
• 495f651bce levelup logic moved to playerMgr Mordred 2025-01-02 13:25:18 +01:00
• 8a3d8775fe Removed old gainExp function in player Mordred 2025-01-02 09:55:21 +01:00
• 78b800e36e exitInstance moved to playerMgr Mordred 2025-01-02 09:48:51 +01:00
• 168cfb1a36 Cleanups in player Mordred 2025-01-02 09:22:10 +01:00
• 4a46b3dd80
  Merge pull request #965 from hkAlice/i-need-speed hkAlice 2024-08-09 20:07:37 -03:00
• c1fdf38587
  Merge pull request #967 from Miralqir/master hkAlice 2024-08-09 20:06:50 -03:00
• 66dca3e04d Remove distribution specific code in FindMySQL.cmake Miralqir 2024-08-09 14:31:08 +03:00
• 967d8b1422 Make FindMySQL.cmake work on Gentoo Miralqir 2024-08-09 05:06:18 +03:00
• 086dfb7133 Fix CMake Policy CMP0153 warning Miralqir 2024-08-09 04:44:13 +03:00
• 2e353fd473 Remove pre-C++17 Filesystem library support Miralqir 2024-08-09 04:17:28 +03:00
• 32bea19f2c
  Merge pull request #964 from arieshi255/fix-clang Sapphire_Retail hkAlice 2024-07-28 05:15:17 -03:00
• 42174f19df cache eobj/enpc exd; fix crash on aoe skills; add unlockall; Alice Ogeda 2024-07-27 22:37:09 -03:00
• 569fdc4128 Fix building on Clang and add Oodle support for Linux targets Rushi 2024-01-16 08:41:55 +01:00
• 2a0e423051
  Merge pull request #963 from arieshi255/fix-lut Mordred 2024-06-27 13:43:32 +02:00
• e2e6b3e15d Throw exception if duplicate definitions of actions are found Rushi 2024-06-27 12:58:58 +02:00
• 73094fb85c fix incorrect radius for bnpc - pass filters to snapshot - fix replay not formatting debug message correctly Tahir 2024-06-26 20:44:36 +01:00
• 88ae073089
  Merge pull request #962 from arieshi255/actions-fixup hkAlice 2024-06-26 16:09:56 -03:00
• 0acff69b46 Add isFacingTarget and helper functions Rushi 2024-06-26 20:48:20 +02:00
• 907e625ffe
  Merge pull request #961 from collett8192/retail Mordred 2024-06-26 13:32:15 +02:00
• 3727306613 add chara dirty flag, move bnpc position updates to tick - add knockback - use pos set in action rather than always using source actor Tahir 2024-06-25 17:41:14 +01:00
• 7363ca03ff update CeremonySetActorAppearance collett 2024-06-25 17:14:58 +09:00
• e794df50ba Merge branch 'bs-stuff' of https://github.com/hkAlice/Sapphire into bs-stuff-rebase2 Tahir 2024-06-25 03:15:15 +01:00
• b38afc0256 add left/right to nudge command - fix Common::Util::getOffsettedPosition - fix action timepoint getting stuck (todo: fix actions legit) Tahir 2024-06-25 03:14:33 +01:00
• 34fc49f153 added cbt; Alice Ogeda 2024-06-24 22:48:04 -03:00
• cf2d6108e1 fick director bgm; Alice Ogeda 2024-06-24 22:33:45 -03:00
• 75a2fcbb63 reference conditions globally in timeline - add PhaseActive and GetAction conditions - refactor ifrit to use controller Tahir 2024-06-24 22:45:06 +01:00
• 9445bc0260 fix 0 duration timepoints Tahir 2024-06-24 18:41:18 +01:00
• 973af39dd5
  Merge b588f424b5 into 1a99b56c8b Reyli 2024-06-24 05:45:05 +00:00
• b588f424b5 Reverted struct bracket initialization from Intellisense warning Reyli 2024-06-24 00:44:22 -05:00
• 6111461aef Removing C style casts round 2 Reyli 2024-06-24 00:39:45 -05:00
• 8c952540d5 fix timeline advancing, add ifrit normal encounter script Tahir 2024-06-23 22:44:51 +01:00
• 2f4efec34d fix some timeline bugs, temporarily disable gambits Tahir 2024-06-23 01:30:07 +01:00
• ed156c4286 Removing C style casts round 1 Reyli 2024-06-22 18:17:58 -05:00
• 93840aff93 fix InitZone and enable flying collett 2024-06-22 23:55:06 +09:00
• 5dd893a0c7 Fix StatusEffect flags Rushi 2024-06-22 07:31:50 +02:00
• 7b2ea407e9 encounter timeline fix json parsing Tahir 2024-06-22 06:12:41 +01:00
• 29c990311b return const ref for Territory::getPlayers - timeline cleanup Tahir 2024-06-22 00:13:18 +01:00
• 26534d2a37 refactor timeline stuff, implement selectors Tahir 2024-06-21 19:46:14 +01:00
• 7cc3f65571 split encounter timeline stuff into separate files - todo: use selector in CastAction timepoint Tahir 2024-06-21 00:27:41 +01:00
• 8fb9846c0b wip: initial target select filter work - todo: hook this up to EncounterTimeline Tahir 2024-06-19 03:21:51 +01:00
• 011cf1b6d2 add position offset calcs Tahir 2024-06-19 03:18:37 +01:00
• 0e55c62e2d fix missing include in RNGMgr, expose rng engine Tahir 2024-06-19 02:44:46 +01:00
• 6f7198bd5a add debug command for actor move Tahir 2024-06-15 23:50:58 +01:00
• 8ce3dece5e wip: timeline refactor to use condition's ui assigned id Tahir 2024-05-28 12:32:53 +01:00
• b29971b9a3 wip: timeline refactor to use Territory instead of just InstanceContent (should support overworld now) Tahir 2024-05-27 01:45:37 +01:00
• 989e1eeff7 fix build Tahir 2024-05-23 19:40:10 +01:00
• e4024a677b wip: timeline shit - add BattleTalk handling including packets - add LogMessage handling - add SetCondition handling (allow conditions to toggle others on/off) - handle Director ops - add basic CastAction (prolly doesnt work) - add SpawnBNpc Tahir 2024-05-23 18:40:37 +01:00
• a4d712f32c wip: encounter timeline oops Tahir 2024-05-11 00:07:09 +01:00
• cf712cb3c8 wip: encounter timeline actually populate the entry before adding to cache Tahir 2024-05-10 23:39:06 +01:00
• 43f9254086 wip: refactor encounter timeline stuff to only modify state objects, cache should now work as intended - tldr: fast as fuck boi Tahir 2024-05-10 22:46:33 +01:00
• 025f57ce9b wip: more encounter timeline stuff Tahir 2024-05-10 17:42:39 +01:00
• 576930dcfc wip: encounter timeline use InstanceContentPtr instead of EncounterFightPtr Tahir 2024-05-10 15:48:42 +01:00
• f96c633c6c wip: encounter timepoint separate update from execute - todo: implement conditions and timepoint parsing for remaining types - todo: test lmao Tahir 2024-05-10 15:18:06 +01:00
• daf906d2ae wip: add encounter combat state parsing Tahir 2024-05-09 17:27:51 +01:00
• 959df68b63 fix build Tahir 2024-05-09 17:16:18 +01:00
• 342c30aa43 wip: refactor some encounter timeline stuff - todo: test if any of this actually works Tahir 2024-05-09 16:17:46 +01:00
• 05f9feb6ed wip: reorganise some timeline stuff Tahir 2024-05-06 20:13:53 +01:00
• 6c5df82306 more encounter timeline work Tahir 2024-05-06 01:45:42 +01:00
• 41ac3b88a6 fix build Tahir 2024-05-05 16:15:05 +01:00
• 9331fa3dd1 wip: encounter timeline parsing - todo: parse the json into usable data objects Tahir 2024-04-29 16:51:28 +01:00
• fd768eb18f fix crash on bnpc fsm nullptr; Alice Ogeda 2023-03-24 12:00:42 -03:00
• 6bd8dee22d EncounterFight and state refactor; Alice Ogeda 2023-03-24 11:21:09 -03:00
• 9d49139a0c return spaced player name in case of player not found in db; Alice Ogeda 2023-03-24 10:12:47 -03:00
• 9035d44c55 rezone player; wait for all players to unlock zone entrance; Alice Ogeda 2023-03-08 21:14:04 -03:00
• c8ab6debec more instancecontent work; Alice Ogeda 2023-03-08 17:18:13 -03:00
• a5fdc0b323 fix typos; Alice Ogeda 2023-03-08 16:37:13 -03:00
• 25dbd60cdf more duty reset work, respawn players on duty reset; Alice Ogeda 2023-03-08 16:36:13 -03:00
• a10c0cdc0f more work on duty resets; Alice Ogeda 2023-03-08 16:27:13 -03:00
• c1589c1f20 add timers and enrage mechanic; Alice Ogeda 2023-03-08 14:36:53 -03:00
• 77089d4083 add encounter to instancecontent; basic status handling; Alice Ogeda 2023-03-08 14:15:13 -03:00
• 69b767177e encounter status control; Alice Ogeda 2023-03-08 12:07:08 -03:00