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

#974

#974

#975

#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

Mono Color

• e6ef80209d fix derp collett 2020-01-24 08:08:51 +09:00
• 66a2021e95 these bytes are mounts as well. collett 2020-01-23 23:23:13 +09:00
• a7d527bf0a these bytes are mounts as well. collett 2020-01-23 23:23:13 +09:00
• 5dfe320fb8 these bytes are mounts as well. collett 2020-01-23 23:23:13 +09:00
• ca35fe7425 don't bother checking script/lut exists. if nether exists then send empty effect so other players can see it. collett 2020-01-23 23:11:50 +09:00
• 29da401de7 Fix moundId type. collett 2020-01-23 22:43:16 +09:00
• d60dff5838 Fix moundId type. collett 2020-01-23 22:43:16 +09:00
• d4afee03a6 Implement mount action. collett 2020-01-23 22:36:01 +09:00
• 4839fcc577 Implement mount action. collett 2020-01-23 22:36:01 +09:00
• 8d10a34174 Implement mount action and unlock mount list collett 2020-01-23 22:27:05 +09:00
• faa763fdf7 unlock everything for now. collett 2020-01-23 18:42:19 +09:00
• a31098b4bf Implement heavy shot, straight shot. collett 2020-01-23 18:23:15 +09:00
• fd47ffb347 Merge remote-tracking branch 'remotes/origin/develop' into develop_c collett 2020-01-23 17:41:30 +09:00
• 7dccbeee57 Merge pull request #630 from collett8192/update_position_handler Adam 2020-01-22 20:30:30 +11:00
• 1fd79e3b87
  Merge pull request #630 from collett8192/update_position_handler Adam 2020-01-22 20:30:30 +11:00
• 8b6f8aef8d Fix update position packet. collett 2020-01-22 17:55:40 +09:00
• 911349a1dd Fix update position packet. collett 2020-01-22 17:55:40 +09:00
• a366042d28 use markToRemove instead of removing status directly collett 2020-01-22 01:20:39 +09:00
• dff0033464 Merge remote-tracking branch 'remotes/origin/develop' into develop_c collett 2020-01-20 16:56:58 +09:00
• 91974b4e71 Merge pull request #629 from collett8192/misc_fix Adam 2020-01-20 09:15:21 +11:00
• 5af0f6ab03
  Merge pull request #629 from collett8192/misc_fix Adam 2020-01-20 09:15:21 +11:00
• 60e701dbdd enum/struct/packet updates, fix dot/hot tick, remove incorrect initial delay for player autoattacks. collett 2020-01-19 21:20:01 +09:00
• 78e0e4d985 enum/struct/packet updates, fix dot/hot tick, remove incorrect initial delay for player autoattacks. collett 2020-01-19 21:20:01 +09:00
• 3b3398e3e0 fix code following some commented things from old pr that are obvious better collett 2020-01-19 20:53:56 +09:00
• 39447bd39b really refresh status instead of remove and add new one. collett 2020-01-19 20:00:16 +09:00
• 3fb6657d7d fix lobby error message reading from packet incorrectly NotAdam 2020-01-18 12:32:17 +11:00
• 22b499c3f7 fix lobby error message reading from packet incorrectly NotAdam 2020-01-18 12:32:17 +11:00
• 1e431ee924 Merge branch 'action_data_update_pr' into develop_c collett 2020-01-17 18:37:39 +09:00
• e84f77ca20 Implement thin air. collett 2020-01-17 18:37:09 +09:00
• 33ed6c21cb Merge branch 'action_data_update_pr' into develop_c collett 2020-01-16 19:45:39 +09:00
• bb350ba250 Fix status effect list packet. collett 2020-01-16 19:44:28 +09:00
• e9f9a140d8 Merge remote-tracking branch 'remotes/origin/develop' into develop_c collett 2020-01-15 18:43:05 +09:00
• e3b39214b4 add mariadb 10.4 and 10.5 (alpha) to mysql lib discovery NotAdam 2020-01-15 20:05:29 +11:00
• e849f8221c add mariadb 10.4 and 10.5 (alpha) to mysql lib discovery NotAdam 2020-01-15 20:05:29 +11:00
• b576788cfd Merge branch 'action_data_update_pr' into develop_c collett 2020-01-15 18:29:54 +09:00
• 71d486e806 Implement benediction. collett 2020-01-15 18:29:27 +09:00
• 7a7a2f1724 Implement cure 1 proc. collett 2020-01-15 18:07:06 +09:00
• 2a50a0d076 Merge branch 'action_data_update_pr' into develop_c collett 2020-01-15 00:42:58 +09:00
• abf71f5dc0 clean up collett 2020-01-15 00:42:31 +09:00
• 5867224baf merge failed collett 2020-01-14 23:48:40 +09:00
• 0513025b6a Merge branch 'action_data_update_pr' into develop_c collett 2020-01-14 23:45:42 +09:00
• e677ee5ef8 Dots and hots should tick together one total number per tick. collett 2020-01-14 23:41:31 +09:00
• a8242fcf87 Implement swiftcast. collett 2020-01-14 23:24:06 +09:00
• bb4aab0acc let caller decide effect delay time collett 2020-01-14 22:34:19 +09:00
• 8c9228ff34 Merge branch 'misc_fix' into action_data_update_pr collett 2020-01-14 22:15:25 +09:00
• 09a596183b Merge branch 'misc_fix' into develop_c collett 2020-01-14 22:11:18 +09:00
• b3367cba63 Merge branch 'action_data_update_pr' into develop_c collett 2020-01-14 22:11:12 +09:00
• 983c772260 fix inaccurate animation lock time for casts collett 2020-01-14 22:01:11 +09:00
• 62f25b4b77 Implement presence of mind. collett 2020-01-14 21:59:05 +09:00
• d04b7a3519 Merge branch 'action_data_update_pr' into develop_c collett 2020-01-14 20:27:53 +09:00
• 651e8e2d3e remove initial auto attack wait time for players collett 2020-01-14 20:27:10 +09:00
• b6286da75e Merge branch 'action_data_update_pr' into develop_c collett 2020-01-14 17:39:45 +09:00
• 5b05900455 refreshed status keeps its old last tick time collett 2020-01-14 17:38:09 +09:00
• 271edea8ec fix dots & hots first tick not working collett 2020-01-14 17:37:25 +09:00
• 4592f955a3 Implement lucid dreaming. collett 2020-01-14 17:15:05 +09:00
• 32b677ad4d Merge remote-tracking branch 'remotes/origin/develop' into action_data_update_pr collett 2020-01-14 17:10:54 +09:00
• 8698ea415a clean up collett 2020-01-14 17:02:11 +09:00
• 4485f22040 Merge branch 'misc_fix' into develop_c collett 2020-01-13 19:36:20 +09:00
• fc66254da3 more animation lock stuff collett 2020-01-13 17:58:07 +09:00
• d62b32b4c1 Merge branch 'action_data_update_pr' into develop_c collett 2020-01-13 03:49:38 +09:00
• 685fd9c3bf move applyShieldProtection to chara collett 2020-01-13 03:48:42 +09:00
• f5b6dc7282 Merge branch 'action_data_update_pr' into develop_c collett 2020-01-13 03:06:07 +09:00
• 0573138e1b Implement shield buff, and script for adloquium as a demo. collett 2020-01-13 03:05:54 +09:00
• df472ae3e3 Merge branch 'action_data_update_pr' into develop_c collett 2020-01-12 21:17:48 +09:00
• 659786590c cannot absorb more than target remaining hp collett 2020-01-12 21:17:36 +09:00
• 86e37ef7f7 Merge branch 'action_data_update_pr' into develop_c collett 2020-01-12 20:59:00 +09:00
• 511fc2b35a Implement hp absorb. collett 2020-01-12 20:58:32 +09:00
• 57635ac69b Merge branch 'action_data_update_pr' into develop_c collett 2020-01-12 18:19:39 +09:00
• b9eaef6a85 must be correct combo to apply status if a combo action is used. collett 2020-01-12 18:19:23 +09:00
• 2ba1c4d940 Merge branch 'action_data_update_pr' into develop_c collett 2020-01-12 18:00:57 +09:00
• 64a1c4033b Create lut entry for auto attacks so we won't have three different places that do damage. collett 2020-01-12 17:46:18 +09:00
• 30461e8583 Merge branch 'action_data_update_pr' into develop_c collett 2020-01-12 03:48:53 +09:00
• e08643f380 Implement damage reflect trigger. Replace consts with enums in Common.h Use effect builder for autoattacks. Dumb mistake fixed. collett 2020-01-12 03:29:52 +09:00
• 24358891ad Merge branch 'action_data_update' into develop_c collett 2020-01-11 21:37:25 +09:00
• b83c70589e scale npc aa damage base on level collett 2020-01-11 21:37:07 +09:00
• fecd838fe7 Merge branch 'misc_fix' into action_data_update collett 2020-01-11 21:05:10 +09:00
• 36fe4a72e6 Merge branch 'action_data_update_pr' into action_data_update collett 2020-01-11 21:05:01 +09:00
• 0620aaa932 Update EffectResult packet and send proper animation lock time. collett 2020-01-11 21:02:11 +09:00
• 8d7c6f5188 Actually it is working and I'm going to do a separate PR alongside with some other related changes. collett 2020-01-11 20:54:24 +09:00
• a2958601a1 Merge branch 'action_data_update_pr' into action_data_update collett 2020-01-11 19:40:38 +09:00
• ed51e1537e this seems like a better value matching retail experience after playing with some artificial latency, and set the not functioning value just to match retail packet. collett 2020-01-11 19:39:18 +09:00
• a556d8dce4 fix status applying too fast. collett 2020-01-11 18:05:12 +09:00
• 3b140f36d3 Merge remote-tracking branch 'remotes/origin/develop' into action_data_update collett 2020-01-11 17:53:58 +09:00
• a9108f8dfc Merge branch 'action_data_update_pr' into action_data_update collett 2020-01-11 17:53:50 +09:00
• 43bf40cbb6 Merge remote-tracking branch 'remotes/origin/develop' into develop_c collett 2020-01-11 17:19:23 +09:00
• 1123292c7a Merge pull request #627 from NotAdam/develop Adam 2020-01-11 18:42:19 +11:00
• 5d5763c74e
  Merge pull request #627 from NotAdam/develop Adam 2020-01-11 18:42:19 +11:00
• b15864b541 move attack type enum to common.h collett 2020-01-11 16:33:19 +09:00
• a70f381e68 fix some warnings & world shouldn't crash when warming up object cache NotAdam 2020-01-11 18:20:06 +11:00
• 755c6b55c0 fix some warnings & world shouldn't crash when warming up object cache NotAdam 2020-01-11 18:20:06 +11:00
• 96a25c9a9e fix enum type collett 2020-01-10 23:51:09 +09:00
• 0724364d69 update attackType. remove healType as such thing does not exist. collett 2020-01-10 23:42:20 +09:00
• 896ce73175 Generic action handler update with status support. collett 2020-01-10 21:24:35 +09:00
• b391bc4aad remove gain job resource collett 2020-01-10 20:33:50 +09:00
• a6daa4ea8e more clean up collett 2020-01-10 19:58:53 +09:00
• f7ca365c8d status effect: heal cast multiplier, crit dh bonus fix multipliers not applying to dots/hots clean up hard-coded values. collett 2020-01-10 19:39:44 +09:00
• b744941620 status effect: heal receive multiplier collett 2020-01-10 02:17:41 +09:00
• e30ec77091 Merge branch 'develop_c' into action_data_update collett 2020-01-10 01:30:43 +09:00
• 4496e5fe1f Merge remote-tracking branch 'remotes/origin/develop' into develop_c collett 2020-01-10 01:30:12 +09:00
• e79d262442 update parse data collett 2020-01-10 01:27:44 +09:00