sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-23 18:17:46 +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

a6d7532038 Merge pull request #110 from Minoost/master Mordred 2017-09-23 00:27:58 +02:00
a550feb0f2 Merge pull request #110 from Minoost/master Mordred 2017-09-23 00:27:58 +02:00
c84650a18e Merge pull request #111 from AcedArmy/master Mordred 2017-09-22 22:16:53 +02:00
54c8a4cac1 Merge pull request #111 from AcedArmy/master Mordred 2017-09-22 22:16:53 +02:00
de8e2d71b4 Added Rhalgr's Reach Aethernet Biscuit Boy 2017-09-23 02:21:56 +10:00
29aa55769e Added Rhalgr's Reach Aethernet Biscuit Boy 2017-09-23 02:21:56 +10:00
10411b91c8 Change command prefix to ! Adam 2017-09-23 00:45:30 +09:00
a74c5e1dc6 Change command prefix to ! Minho Kang 2017-09-23 00:45:30 +09:00
871cfbb4fa Merge pull request #109 from AcedArmy/master Mordred 2017-09-22 16:28:19 +02:00
f3fa601897 Merge pull request #109 from AcedArmy/master Mordred 2017-09-22 16:28:19 +02:00
3380179297 Made the @set eorzeatime A GM Command Biscuit Boy 2017-09-23 00:09:59 +10:00
f694a5ad98 Made the @set eorzeatime A GM Command Biscuit Boy 2017-09-23 00:09:59 +10:00
d4a99fd45a Merge pull request #108 from Minoost/master Mordred 2017-09-22 15:40:52 +02:00
3641f52c6f Merge pull request #108 from Minoost/master Mordred 2017-09-22 15:40:52 +02:00
5ee34117ce Update DebugCommandHandler.cpp Mordred 2017-09-22 15:38:32 +02:00
fc7c9c8d31 Update DebugCommandHandler.cpp Mordred 2017-09-22 15:38:32 +02:00
2324dc813c Implement offseting eorzean time Adam 2017-09-22 22:03:57 +09:00
01521d2c98 Implement offseting eorzean time Minho Kang 2017-09-22 22:03:57 +09:00
2f5497f662 Merge remote-tracking branch 'upstream/master' Adam 2017-09-22 22:02:39 +09:00
37ff7c70ed Merge remote-tracking branch 'upstream/master' Minho Kang 2017-09-22 22:02:39 +09:00
eb4f53be03 Merge pull request #107 from AcedArmy/master Mordred 2017-09-22 12:15:52 +02:00
5417cdc4f4 Merge pull request #107 from AcedArmy/master Mordred 2017-09-22 12:15:52 +02:00
1566178a1a formatting again Mordred 2017-09-22 12:06:35 +02:00
02b8df5763 formatting again Mordred 2017-09-22 12:06:35 +02:00
71eecf729f Fixed Teri Placement Biscuit Boy 2017-09-22 17:15:10 +10:00
c306182414 Fixed Teri Placement Biscuit Boy 2017-09-22 17:15:10 +10:00
01a82562cb Removed Debug Commands that can be used as GM Commands Biscuit Boy 2017-09-22 17:08:12 +10:00
e1dc329904 Removed Debug Commands that can be used as GM Commands Biscuit Boy 2017-09-22 17:08:12 +10:00
4e928c3c18 Added GM Teri Command Biscuit Boy 2017-09-22 17:03:25 +10:00
032e92ac39 Added GM Teri Command Biscuit Boy 2017-09-22 17:03:25 +10:00
7604264394 Merge pull request #106 from AcedArmy/master Mordred 2017-09-22 00:15:44 +02:00
5c20ad02a4 Merge pull request #106 from AcedArmy/master Mordred 2017-09-22 00:15:44 +02:00
e1d2f4fbb1 Updated formatting to be inline with everything else. Mordred 2017-09-21 23:59:05 +02:00
d6e35f1c20 Updated formatting to be inline with everything else. Mordred 2017-09-21 23:59:05 +02:00
6e87892d2c Added EXP GM Command Biscuit Boy 2017-09-22 01:12:37 +10:00
c789163cf2 Added EXP GM Command Biscuit Boy 2017-09-22 01:12:37 +10:00
2a9076860f Merge pull request #105 from AcedArmy/master Mordred 2017-09-21 08:23:41 +02:00
9ccac004b4 Merge pull request #105 from AcedArmy/master Mordred 2017-09-21 08:23:41 +02:00
ceb960df09 Added Foundation Aethernet Biscuit Boy 2017-09-21 15:54:06 +10:00
61b90078e4 Added Foundation Aethernet Biscuit Boy 2017-09-21 15:54:06 +10:00
284ab211a4 Linux needs memcopy from string.h Mordred 2017-09-20 18:34:38 +02:00
98899756fb Linux needs memcopy from string.h Mordred 2017-09-20 18:34:38 +02:00
676de51fb3 Removed unneeded string Mordred 2017-09-20 18:27:00 +02:00
58517dc731 Removed unneeded string Mordred 2017-09-20 18:27:00 +02:00
fc60c7cec9 Blob fields can now be returned as vector. Mordred 2017-09-20 18:25:51 +02:00
271c857d40 Blob fields can now be returned as vector. Mordred 2017-09-20 18:25:51 +02:00
43702776be Merge branch 'SQL_REWRITE_OWN' of https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN Mordred 2017-09-19 23:13:02 +02:00
6f62b2f13b Merge branch 'SQL_REWRITE_OWN' of https://github.com/SapphireMordred/Sapphire into SQL_REWRITE_OWN Mordred 2017-09-19 23:13:02 +02:00
ee73eedc85 Added transactions Mordred 2017-09-19 23:12:46 +02:00
9430358b48 Added transactions Mordred 2017-09-19 23:12:46 +02:00
cf1365a5d0 Fix indent Adam 2017-09-19 23:33:49 +09:00
720ef9d702 Fix indent Minho Kang 2017-09-19 23:33:49 +09:00
dad2e255f5 Wrapping helpers in util namespace Mordred Admin 2017-09-19 10:59:42 +02:00
ab8f9a55d6 Wrapping helpers in util namespace Mordred Admin 2017-09-19 10:59:42 +02:00
81025faf7e Merge pull request #102 from amibu01/master Mordred 2017-09-19 08:05:21 +02:00
22fb4c681e Merge pull request #102 from amibu01/master Mordred 2017-09-19 08:05:21 +02:00
3eddc33256 Merge pull request #104 from takhlaq/readme Mordred 2017-09-19 08:04:40 +02:00
e66f357e01 Merge pull request #104 from takhlaq/readme Mordred 2017-09-19 08:04:40 +02:00
7a4aa5590c Merge pull request #103 from itsmaru/master Mordred 2017-09-19 08:03:52 +02:00
17a889c813 Merge pull request #103 from itsmaru/master Mordred 2017-09-19 08:03:52 +02:00
76aa95bcfa cleaned up README and added appveyor badge Tahir Akhlaq 2017-09-19 06:12:04 +01:00
ef303ae8a4 cleaned up README and added appveyor badge Tahir Akhlaq 2017-09-19 06:12:04 +01:00
0251ead69b Forgot a script for Medica II; Maru 2017-09-19 00:12:35 -03:00
4494a826fe Forgot a script for Medica II; Maru 2017-09-19 00:12:35 -03:00
069ab78e7e Adjustments to new definitions of action effect packet; Maru 2017-09-19 00:09:37 -03:00
f2b486dbde Adjustments to new definitions of action effect packet; Maru 2017-09-19 00:09:37 -03:00
07c73b62fa Definitions for Action Effects; Further (possibly temporary) changes to AoE heal packets; Maru 2017-09-18 23:14:43 -03:00
c5669558ae Definitions for Action Effects; Further (possibly temporary) changes to AoE heal packets; Maru 2017-09-18 23:14:43 -03:00
1031d66522 Fix linux build, needs some love for the warnings Mordred 2017-09-19 00:20:45 +02:00
3f524dc08c Fix linux build, needs some love for the warnings Mordred 2017-09-19 00:20:45 +02:00
f5f8acb774 Map actions as pointers; Prototype AoE healing; Maru 2017-09-18 19:07:41 -03:00
62734c7616 Map actions as pointers; Prototype AoE healing; Maru 2017-09-18 19:07:41 -03:00
1faa3c3898 First iteration of new mysql wrapper Mordred 2017-09-19 00:02:14 +02:00
40bc05cf71 First iteration of new mysql wrapper Mordred 2017-09-19 00:02:14 +02:00
00d5e93e74 Remove UserLevel, handle DebugCommand permissions via internal GM rank amibu 2017-09-18 18:44:38 +02:00
8c597608d4 Remove UserLevel, handle DebugCommand permissions via internal GM rank amibu 2017-09-18 18:44:38 +02:00
d12db28951 Build fix Mordred 2017-09-15 14:05:45 +02:00
1659324118 Build fix Mordred 2017-09-15 14:05:45 +02:00
c3b5d30322 getGmRank now actually returns the gm rank. Also const correctness Mordred 2017-09-15 12:29:47 +02:00
90c553e0a8 getGmRank now actually returns the gm rank. Also const correctness Mordred 2017-09-15 12:29:47 +02:00
0956d1eeee Merge pull request #101 from AcedArmy/master Mordred 2017-09-15 12:18:54 +02:00
f20970586b Merge pull request #101 from AcedArmy/master Mordred 2017-09-15 12:18:54 +02:00
cd345bfce4 Added all Zonelines for Idyllshire Biscuit Boy 2017-09-15 20:15:18 +10:00
6e20fc4b7c Added all Zonelines for Idyllshire Biscuit Boy 2017-09-15 20:15:18 +10:00
e8a6249226 Merge pull request #100 from AcedArmy/master Mordred 2017-09-15 11:17:02 +02:00
82d8ded088 Merge pull request #100 from AcedArmy/master Mordred 2017-09-15 11:17:02 +02:00
185c7e37ed Also adjusted item loading Mordred 2017-09-15 11:07:12 +02:00
947bb20e3c Also adjusted item loading Mordred 2017-09-15 11:07:12 +02:00
1b6b91490a Fixed indendation Mordred 2017-09-15 11:04:42 +02:00
9f8473fc10 Fixed indendation Mordred 2017-09-15 11:04:42 +02:00
4989f37eca Fixed ContentID Biscuit Boy 2017-09-15 18:43:08 +10:00
608119ede3 Fixed ContentID Biscuit Boy 2017-09-15 18:43:08 +10:00
8a63ea44bd Merge pull request #99 from itsmaru/master Mordred 2017-09-15 07:43:35 +02:00
ddc39143ce Merge pull request #99 from itsmaru/master Mordred 2017-09-15 07:43:35 +02:00
597a7e8900 Status effect source reference; ActionCast battle log work; Cleaning compiler warnings; Maru 2017-09-15 00:56:29 -03:00
d620f0763d Status effect source reference; ActionCast battle log work; Cleaning compiler warnings; Maru 2017-09-15 00:56:29 -03:00
b97162ba5d const correctness Mordred 2017-09-14 18:49:03 +02:00
522dc15c39 const correctness Mordred 2017-09-14 18:49:03 +02:00
1495b263d9 Begin of implementation of own simplified mysql c++ wrapper Mordred 2017-09-14 18:39:12 +02:00
87bb613782 Begin of implementation of own simplified mysql c++ wrapper Mordred 2017-09-14 18:39:12 +02:00