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

0bb1234151

Merge pull request #198 from reiichi001/master Mordred 2017-12-11 00:06:00 +01:00
14eafd13b8 Merge pull request #195 from perize/master Mordred 2017-12-11 00:05:24 +01:00
900b65c2ae

Merge pull request #195 from perize/master Mordred 2017-12-11 00:05:24 +01:00
8728a4aae8 Merge pull request #197 from GokuWeedLord/fix/itemlevelcalc Mordred 2017-12-11 00:05:14 +01:00
867227a624

Merge pull request #197 from GokuWeedLord/fix/itemlevelcalc Mordred 2017-12-11 00:05:14 +01:00
e003c035c7 Fixed import.bat to include password on import loop and update.sql import. Robert Baker 2017-12-10 12:59:20 -08:00
6ce2155476 Fixed import.bat to include password on import loop and update.sql import. Robert Baker 2017-12-10 12:59:20 -08:00
bd00132e43 updated pcb_reader to read territorytype from ffxivexplorer export Tahir Akhlaq 2017-12-09 23:37:24 +00:00
6b39deed6c updated pcb_reader to read territorytype from ffxivexplorer export Tahir Akhlaq 2017-12-09 23:37:24 +00:00
e44bf87264 fix itemlevel calc GokuWeedLord 2017-12-11 00:40:52 +11:00
552c8adfd4 fix itemlevel calc GokuWeedLord 2017-12-11 00:40:52 +11:00
1bf33c8027 base scripts init code, call init before zone init for onZoneInit callback GokuWeedLord 2017-12-10 23:51:06 +11:00
6b63d22391 base scripts init code, call init before zone init for onZoneInit callback GokuWeedLord 2017-12-10 23:51:06 +11:00
aa72e715b6 change script location GokuWeedLord 2017-12-10 23:50:35 +11:00
bb4665dc6a change script location GokuWeedLord 2017-12-10 23:50:35 +11:00
3aecf8dc5d scripts build to their own libs now GokuWeedLord 2017-12-10 22:04:46 +11:00
2474881788 scripts build to their own libs now GokuWeedLord 2017-12-10 22:04:46 +11:00
33936251c0 make sure the server doesn't crash and burn when accessing scripts that don't exist GokuWeedLord 2017-12-10 21:44:18 +11:00
68b655dcdd make sure the server doesn't crash and burn when accessing scripts that don't exist GokuWeedLord 2017-12-10 21:44:18 +11:00
e5f7c2c9d3 fix actionscript export macro GokuWeedLord 2017-12-10 21:43:54 +11:00
207e9589f7 fix actionscript export macro GokuWeedLord 2017-12-10 21:43:54 +11:00
7e6136e48a scripts now link properly with server_zone GokuWeedLord 2017-12-10 21:43:35 +11:00
a291d7e0dc scripts now link properly with server_zone GokuWeedLord 2017-12-10 21:43:35 +11:00
11f32f3bd6 ignore export library files GokuWeedLord 2017-12-10 21:43:10 +11:00
ea12877ebb ignore export library files GokuWeedLord 2017-12-10 21:43:10 +11:00
7555b370cd fix gcc builds on linux GokuWeedLord 2017-12-10 17:13:57 +11:00
7248e351ea fix gcc builds on linux GokuWeedLord 2017-12-10 17:13:57 +11:00
fa0dbe2866 fix templated getScriptObject not linking correctly GokuWeedLord 2017-12-10 16:49:01 +11:00
e2bc55cd44 fix templated getScriptObject not linking correctly GokuWeedLord 2017-12-10 16:49:01 +11:00
74a817701d haha im a fucking idiot GokuWeedLord 2017-12-10 16:03:55 +11:00
2cd85c212f haha im a fucking idiot GokuWeedLord 2017-12-10 16:03:55 +11:00
a4453a378e refactor script api, base script loading impl GokuWeedLord 2017-12-10 15:31:48 +11:00
58a4e9e0fe refactor script api, base script loading impl GokuWeedLord 2017-12-10 15:31:48 +11:00
076b2591d4 refactoring and export define fix GokuWeedLord 2017-12-10 03:01:21 +11:00
4aa058341c refactoring and export define fix GokuWeedLord 2017-12-10 03:01:21 +11:00
0f962abe09 building finally works 💦 💦 💦 GokuWeedLord 2017-12-10 02:49:22 +11:00
c4e8a82df1 building finally works 💦 💦 💦 GokuWeedLord 2017-12-10 02:49:22 +11:00
17daf26aa0 script api changes, fix indenting, some broken cmake shit GokuWeedLord 2017-12-10 02:13:54 +11:00
6ff0e7d414 script api changes, fix indenting, some broken cmake shit GokuWeedLord 2017-12-10 02:13:54 +11:00
bb7ea6740d oh my god it finally fucking builds without issue GokuWeedLord 2017-12-10 01:52:03 +11:00
230fc78c04 oh my god it finally fucking builds without issue GokuWeedLord 2017-12-10 01:52:03 +11:00
d0dc716b2d Revert "fix build failures" GokuWeedLord 2017-12-09 23:02:23 +11:00
6b861647c8 Revert "fix build failures" GokuWeedLord 2017-12-09 23:02:23 +11:00
e1d97b994f Merge d196f01484 into d84d3be978 Adam 2017-12-09 06:29:50 +00:00
79080df72a fix build failures GokuWeedLord 2017-12-09 17:28:51 +11:00
d196f01484 fix build failures GokuWeedLord 2017-12-09 17:28:51 +11:00
654e20384d Use zonepacketnew instead Perize 2017-12-09 13:55:55 +09:00
351dd9792a Use zonepacketnew instead Perize 2017-12-09 13:55:55 +09:00
ebfe0b4a60 Fix formatting Perize 2017-12-09 13:14:06 +09:00
0fa3f93ce9 Fix formatting Perize 2017-12-09 13:14:06 +09:00
7998448574 Fix a perform handler Perize 2017-12-09 13:09:56 +09:00
62119f6ac0 Fix a perform handler Perize 2017-12-09 13:09:56 +09:00
794fef41a3 Compile please thanks Maru 2017-12-08 21:04:58 -02:00
fa3bc04f8e Merge master Maru 2017-12-08 20:55:25 -02:00
5913be0a31 More include refactoring and space adjustments Mordred 2017-12-08 23:27:59 +01:00
d84d3be978 More include refactoring and space adjustments Mordred 2017-12-08 23:27:59 +01:00
381a793a19 Minor style fixes Mordred 2017-12-08 23:09:34 +01:00
04e7f1c9cb Minor style fixes Mordred 2017-12-08 23:09:34 +01:00
086cdccbfb Fixed an issue with one hit kills not registering on kill events. Mordred 2017-12-08 23:05:25 +01:00
5c13f51042 Fixed an issue with one hit kills not registering on kill events. Mordred 2017-12-08 23:05:25 +01:00
2f3433f24e Massive chunk of refactoring. Mainly includes and namespaces Mordred Admin 2017-12-08 15:38:25 +01:00
a77772bc9d Massive chunk of refactoring. Mainly includes and namespaces Mordred Admin 2017-12-08 15:38:25 +01:00
4981003789 Greatly reduced usage of smart pointers to remove overhead from needlesly increasing reference count all the time Mordred Admin 2017-12-08 11:46:47 +01:00
4d47ed478b Greatly reduced usage of smart pointers to remove overhead from needlesly increasing reference count all the time Mordred Admin 2017-12-08 11:46:47 +01:00
86fd30b4e1 Fixed an error with accessing aetheryteList and some minor refactoring Mordred 2017-12-07 23:59:03 +01:00
42a2e10132 Fixed an error with accessing aetheryteList and some minor refactoring Mordred 2017-12-07 23:59:03 +01:00
f5ae374c31 Partial friend request/list coupling with social manager Maru 2017-12-07 19:38:17 -02:00
28f2a91b21 Please compile Maru 2017-12-07 17:50:54 -02:00
b85bc25f58 Refactor some more, work on Manager global obj; Maru 2017-12-07 17:28:55 -02:00
5b58e5a6e2 Decouple packet handling; Maru 2017-12-07 13:17:15 -02:00
899f0fa272 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire into party_crap Maru 2017-12-07 11:22:09 -02:00
3d8acf651f Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred Admin 2017-12-07 12:09:13 +01:00
624a872a1a Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred Admin 2017-12-07 12:09:13 +01:00
55132185f1 renamed sessionMap and playerSessionMap to make more sense, also fixed player object not being destructed properly Mordred Admin 2017-12-07 12:09:08 +01:00
f979793b5b renamed sessionMap and playerSessionMap to make more sense, also fixed player object not being destructed properly Mordred Admin 2017-12-07 12:09:08 +01:00
04ac6fc004 Merge pull request #169 from itsMaru/SQL_REWRITE_OWN Mordred 2017-12-07 11:48:05 +01:00
2f987c4838

Merge pull request #169 from itsMaru/SQL_REWRITE_OWN Mordred 2017-12-07 11:48:05 +01:00
da04d63ace Merge pull request #194 from GokuWeedLord/fix/characterdelete Mordred 2017-12-07 11:41:30 +01:00
91f6708275

Merge pull request #194 from GokuWeedLord/fix/characterdelete Mordred 2017-12-07 11:41:30 +01:00
8de42d5fad fix character quest data not being removed on delete GokuWeedLord 2017-12-07 21:14:47 +11:00
589a6c0728 fix character quest data not being removed on delete GokuWeedLord 2017-12-07 21:14:47 +11:00
ef06686237 Make it compile Maru 2017-12-07 04:32:13 -02:00
cd3b2e1567 Putting things together for FriendList Maru 2017-12-07 04:15:20 -02:00
eec2809b19 Merge branch 'party_crap' of https://github.com/takhlaq/Sapphire into party_crap Maru 2017-12-06 21:03:27 -02:00
f7f44950cb Decouple shared ptr (avoid potential dangling ptr), FriendList stuff Maru 2017-12-06 18:55:57 -02:00
a8be93b5fd Enum List Type Maru 2017-12-06 02:46:22 -02:00
dddfba37e3 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred Admin 2017-12-05 14:29:36 +01:00
dbf4bd957b Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred Admin 2017-12-05 14:29:36 +01:00
834f41fd4b Also should not be comitted Mordred Admin 2017-12-05 11:43:31 +01:00
090001a1b5 Also should not be comitted Mordred Admin 2017-12-05 11:43:31 +01:00
f56b8fd503 Changed settings, noone cares for local mysql accounts.;) Mordred Admin 2017-12-05 11:41:20 +01:00
e775e6a54d Changed settings, noone cares for local mysql accounts.;) Mordred Admin 2017-12-05 11:41:20 +01:00
c0c2c4b89d Removed statusEffectContainer, now directly part of Actor Mordred Admin 2017-12-05 11:21:56 +01:00
55c49b0bc4 Removed statusEffectContainer, now directly part of Actor Mordred Admin 2017-12-05 11:21:56 +01:00
1332d580df Insane copypaste work!11!one Maru 2017-12-05 04:13:13 -02:00
e64fe0d105 styles goaaats 2017-12-04 23:25:20 +01:00
c8c4baefb1 more style goaaats 2017-12-04 23:21:15 +01:00
1b09369505 style goaaats 2017-12-04 17:13:17 +01:00
a35b934939 * Use the right array this time goaaats 2017-12-04 16:57:47 +01:00
9b096c72ff * Add more commands/ability to unlock for mounts goaaats 2017-12-04 16:53:37 +01:00