sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-06-29 01: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

#976

#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

babd47d772 add customisable log level to config NotAdam 2019-01-25 19:00:21 +11:00
0988b3abac Renamed params for clearity mordred 2019-01-25 08:50:44 +01:00
4e03fd86df Renamed params for clearity mordred 2019-01-25 08:50:44 +01:00
b319d5501f Navmeshes should now work again using bgpath mordred 2019-01-25 08:45:00 +01:00
18f23dbc64 Navmeshes should now work again using bgpath mordred 2019-01-25 08:45:00 +01:00
176ae00c08 Changed navigation to use meshes named by bg path instead of teriinfo name# mordred 2019-01-25 08:31:20 +01:00
e572acc011 Changed navigation to use meshes named by bg path instead of teriinfo name# mordred 2019-01-25 08:31:20 +01:00
b994989ed6 Merge pull request #503 from NotAdam/develop Mordred 2019-01-25 08:08:46 +01:00
db55a576b7

Merge pull request #503 from NotAdam/develop Mordred 2019-01-25 08:08:46 +01:00
8415b937b1 Merge pull request #504 from perize/develop Mordred 2019-01-25 07:59:24 +01:00
5be91a6b4e

Merge pull request #504 from perize/develop Mordred 2019-01-25 07:59:24 +01:00
68e80bbabf ffxivmon Perize 2019-01-25 15:21:09 +09:00
cad5636d63 ffxivmon Perize 2019-01-25 15:21:09 +09:00
145e0dea5b bit of cleanup and consistent startup log formatting NotAdam 2019-01-25 12:34:21 +11:00
75ec397af9 bit of cleanup and consistent startup log formatting NotAdam 2019-01-25 12:34:21 +11:00
1252390c2d fix config reading, alter territory loading output slightly NotAdam 2019-01-25 12:23:38 +11:00
dc520b730b fix config reading, alter territory loading output slightly NotAdam 2019-01-25 12:23:38 +11:00
727ce629a4 Merge pull request #502 from goaaats/pathfinding Mordred 2019-01-24 23:56:52 +01:00
3e3f637be1

Merge pull request #502 from goaaats/pathfinding Mordred 2019-01-24 23:56:52 +01:00
e6e095f7e8 Add default to world.ini.config goaaats 2019-01-24 22:33:01 +01:00
4ce89df526 Add default to world.ini.config goaaats 2019-01-24 22:33:01 +01:00
557ffcfcb2 Add navi mesh folder to world config goaaats 2019-01-24 22:24:45 +01:00
25713edbc9 Add navi mesh folder to world config goaaats 2019-01-24 22:24:45 +01:00
1b1fcfc09b Build fix mordred 2019-01-24 13:33:30 +01:00
86f74da325 Build fix mordred 2019-01-24 13:33:30 +01:00
27668368cc Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop mordred 2019-01-24 13:15:41 +01:00
7c46b4ba93 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop mordred 2019-01-24 13:15:41 +01:00
6eb1ebaa0a Slightly simplified path calculation mordred 2019-01-24 13:15:30 +01:00
039a9662e2 Slightly simplified path calculation mordred 2019-01-24 13:15:30 +01:00
009455884b cleanup some unnecessary static members NotAdam 2019-01-24 22:34:15 +11:00
1c45e69628 cleanup some unnecessary static members NotAdam 2019-01-24 22:34:15 +11:00
6e3470b666 cleanup some stupid type shit in naviprovider NotAdam 2019-01-24 22:28:53 +11:00
dfdc249716 cleanup some stupid type shit in naviprovider NotAdam 2019-01-24 22:28:53 +11:00
be846a76f0 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop mordred 2019-01-24 12:10:48 +01:00
64a2facb87 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop mordred 2019-01-24 12:10:48 +01:00
e54d546b56 Fixing code for consistency, const correctness, include tree and style. mordred 2019-01-24 12:10:31 +01:00
1acacdbb3c Fixing code for consistency, const correctness, include tree and style. mordred 2019-01-24 12:10:31 +01:00
dad88484de fix pcb_reader compiler warnings NotAdam 2019-01-24 19:04:37 +11:00
625bcaebc7 fix pcb_reader compiler warnings NotAdam 2019-01-24 19:04:37 +11:00
f1580813d3 Merge pull request #501 from goaaats/pathfinding Adam 2019-01-24 10:30:28 +11:00
e6bac9d25e

Merge pull request #501 from goaaats/pathfinding Adam 2019-01-24 10:30:28 +11:00
45399ae709 Fix logging, Linux goaaats 2019-01-23 23:50:31 +01:00
8da67dd2c5 Fix logging, Linux goaaats 2019-01-23 23:50:31 +01:00
39c1282d6f Spaces goaaats 2019-01-23 21:36:26 +01:00
25478e3a1c Spaces goaaats 2019-01-23 21:36:26 +01:00
54e60107e9 Style goaaats 2019-01-23 21:26:48 +01:00
6894996fba Merge branch 'develop' into pathfinding goaaats 2019-01-23 23:09:02 +01:00
caeebdae52 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2019-01-23 22:38:11 +01:00
b0649858fa Despawn and respawn dead bnpcs Mordred 2019-01-23 22:37:55 +01:00
258eb1d1ab Style goaaats 2019-01-23 21:26:48 +01:00
77d64697e9

Merge branch 'develop' into pathfinding goaaats 2019-01-23 23:09:02 +01:00
25cdda3827 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2019-01-23 22:38:11 +01:00
2973b27e26 Despawn and respawn dead bnpcs Mordred 2019-01-23 22:37:55 +01:00
ffb746cc07 Uncomment logs goaaats 2019-01-23 21:14:17 +01:00
116af3409e Uncomment logs goaaats 2019-01-23 21:14:17 +01:00
b0cf8c5158 Cleanup goaaats 2019-01-23 21:10:53 +01:00
1ac495192a Cleanup goaaats 2019-01-23 21:10:53 +01:00
f057208abf more pcb_reader things Tahir Akhlaq 2019-01-23 14:26:17 +00:00
e540dbca47 more pcb_reader things Tahir Akhlaq 2019-01-23 14:26:17 +00:00
0c6755565d Add NaviMgr goaaats 2019-01-23 19:23:49 +01:00
9423a8576e Add NaviMgr goaaats 2019-01-23 19:23:49 +01:00
48d0836c29 Handle steps better goaaats 2019-01-23 17:42:09 +01:00
7552c08ae3 Handle steps better goaaats 2019-01-23 17:42:09 +01:00
06ee4daf69 change movement in BNpc goaaats 2019-01-23 17:07:40 +01:00
09ce04b37e change movement in BNpc goaaats 2019-01-23 17:07:40 +01:00
abb2d87395 pcb_reader - added eobj parsing (doesnt seem to work?) - readded ghetto commandline recastdemo export (windows only) - fixed threadpool legit this time Tahir Akhlaq 2019-01-22 19:43:12 +00:00
2f02b5c850 pcb_reader - added eobj parsing (doesnt seem to work?) - readded ghetto commandline recastdemo export (windows only) - fixed threadpool legit this time Tahir Akhlaq 2019-01-22 19:43:12 +00:00
ba1f8bb6f3 it works goaaats 2019-01-22 00:41:18 +01:00
65e9d57880 it works goaaats 2019-01-22 00:41:18 +01:00
a1720bd179 More pathfinding goaaats 2019-01-21 18:25:22 +01:00
30f4040774 More pathfinding goaaats 2019-01-21 18:25:22 +01:00
8e97926cd1 Merge pull request #499 from takhlaq/develop Mordred 2019-01-21 16:55:40 +01:00
a953f18e0d

Merge pull request #499 from takhlaq/develop Mordred 2019-01-21 16:55:40 +01:00
5484ceb2a6 pcb_reader: - purge cache every 1000 files - fixed issues with threadpool - attempt at using recast api to generate navmesh (doesnt work) Tahir Akhlaq 2019-01-21 15:23:07 +00:00
4bad458849 pcb_reader: - purge cache every 1000 files - fixed issues with threadpool - attempt at using recast api to generate navmesh (doesnt work) Tahir Akhlaq 2019-01-21 15:23:07 +00:00
78a2dc08d0 More pathing goaaats 2019-01-21 15:15:28 +01:00
1927b2b1a4 More pathing goaaats 2019-01-21 15:15:28 +01:00
4116e0202c More pathing goaaats 2019-01-21 14:02:47 +01:00
8c6c8bc787 More pathing goaaats 2019-01-21 14:02:47 +01:00
ee662ba15d path things goaaats 2019-01-21 02:42:47 +01:00
78c0878610 path things goaaats 2019-01-21 02:42:47 +01:00
087cf6dd00 Merge branch 'develop' of github.com:SapphireServer/Sapphire into pathfinding goaaats 2019-01-21 02:11:00 +01:00
d5c53d738d Merge branch 'develop' of github.com:SapphireServer/Sapphire into pathfinding goaaats 2019-01-21 02:11:00 +01:00
ba40d49a68 Add path follow code from RecastDemo goaaats 2019-01-21 02:08:38 +01:00
916aa81441 Add path follow code from RecastDemo goaaats 2019-01-21 02:08:38 +01:00
813ad98c5f Fixed bnpc movement Mordred 2019-01-20 23:49:43 +01:00
239a98848e Fixed bnpc movement Mordred 2019-01-20 23:49:43 +01:00
a8101844d5 Merge pull request #487 from takhlaq/develop Mordred 2019-01-20 22:50:43 +01:00
2ad8672a2a

Merge pull request #487 from takhlaq/develop Mordred 2019-01-20 22:50:43 +01:00
00c7558b1b hopefully builds on linux this time Tahir Akhlaq 2019-01-20 21:24:36 +00:00
3bbf8fe2aa hopefully builds on linux this time Tahir Akhlaq 2019-01-20 21:24:36 +00:00
3348cc9c47 clean up some includes in pcb_reader - fix deadlock Tahir Akhlaq 2019-01-20 20:14:40 +00:00
b5ecf60f7a clean up some includes in pcb_reader - fix deadlock Tahir Akhlaq 2019-01-20 20:14:40 +00:00
fb99dfc915 refactored pcb_reader - now uses a shitty threadpool which never terminates apparently - todo: fix indices Tahir Akhlaq 2019-01-20 17:47:39 +00:00
59725025e7 refactored pcb_reader - now uses a shitty threadpool which never terminates apparently - todo: fix indices Tahir Akhlaq 2019-01-20 17:47:39 +00:00
b200204ee3 pathing things? goaaats 2019-01-20 16:10:48 +01:00
a29039b164 pathing things? goaaats 2019-01-20 16:10:48 +01:00
46205e9db4 BNpcs will now also initiate combat when being attacked, Death should reset them properly. Mordred 2019-01-20 13:36:34 +01:00
b17ce80ce6 BNpcs will now also initiate combat when being attacked, Death should reset them properly. Mordred 2019-01-20 13:36:34 +01:00
9aff14b92e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Tahir Akhlaq 2019-01-20 09:56:50 +00:00