sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-31 13:37: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

ad330dc3e0 minor css fixes NotAdam 2018-07-25 00:36:12 +10:00
d170753b4b dark theme for doxygen NotAdam 2018-07-25 00:31:33 +10:00
1a73a6c448 dark theme for doxygen NotAdam 2018-07-25 00:31:33 +10:00
279eb0f59d doco cleanup NotAdam 2018-07-24 23:16:26 +10:00
0bae255d21 doco cleanup NotAdam 2018-07-24 23:16:26 +10:00
6e831676f1 new documentation home page - please look forward to it NotAdam 2018-07-24 23:04:22 +10:00
ebd41c0312 new documentation home page - please look forward to it NotAdam 2018-07-24 23:04:22 +10:00
63b73c2aa0 ignore temp files created by doxygen NotAdam 2018-07-24 22:49:19 +10:00
a1e3721c67 ignore temp files created by doxygen NotAdam 2018-07-24 22:49:19 +10:00
77dd991a59 some more documentation NotAdam 2018-07-24 22:48:42 +10:00
c47b953a27 some more documentation NotAdam 2018-07-24 22:48:42 +10:00
5fab7c1242 doxygen doco generation + some documentation for script system NotAdam 2018-07-24 22:22:19 +10:00
31915f9fee doxygen doco generation + some documentation for script system NotAdam 2018-07-24 22:22:19 +10:00
a3b934463d Merge pull request #357 from NotAdam/develop Mordred 2018-07-22 23:37:09 +02:00
b64c56faa1

Merge pull request #357 from NotAdam/develop Mordred 2018-07-22 23:37:09 +02:00
1b7821ca1f gilshops now work using the proper packet NotAdam 2018-07-23 00:05:44 +10:00
5ac4573bd3 gilshops now work using the proper packet NotAdam 2018-07-23 00:05:44 +10:00
78cd199ec8 minor refactoring NotAdam 2018-07-22 23:32:16 +10:00
b8871519fe minor refactoring NotAdam 2018-07-22 23:32:16 +10:00
8c870d2f5d somewhat working gilshops NotAdam 2018-07-22 23:20:12 +10:00
9ab7d5c68a somewhat working gilshops NotAdam 2018-07-22 23:20:12 +10:00
e3539fda75 extremely broken gilshop implementation NotAdam 2018-07-22 22:11:03 +10:00
18a1ab79d6 extremely broken gilshop implementation NotAdam 2018-07-22 22:11:03 +10:00
6d7df2fd1b consistent indentation NotAdam 2018-07-22 22:05:09 +10:00
bf726c2a48 consistent indentation NotAdam 2018-07-22 22:05:09 +10:00
1594171b16 remove const constraint NotAdam 2018-07-22 19:10:52 +10:00
d68fa6d192 remove const constraint NotAdam 2018-07-22 19:10:52 +10:00
607f9b1966 scripts cleanup, npc repair script and hunt board NotAdam 2018-07-22 17:02:09 +10:00
394988fbb0 scripts cleanup, npc repair script and hunt board NotAdam 2018-07-22 17:02:09 +10:00
b54ff95388 move common effect struct members into a shared struct for single target/aoe NotAdam 2018-07-22 16:54:23 +10:00
893ebd3454 move common effect struct members into a shared struct for single target/aoe NotAdam 2018-07-22 16:54:23 +10:00
1789a21b96 housing placard script, gridania mb script, opcodes NotAdam 2018-07-22 16:54:01 +10:00
68b08de1de housing placard script, gridania mb script, opcodes NotAdam 2018-07-22 16:54:01 +10:00
8ab826f212 aoeeffect8/16/24/32 packet defs/opcodes NotAdam 2018-07-21 23:48:14 +10:00
2665e55a17 aoeeffect8/16/24/32 packet defs/opcodes NotAdam 2018-07-21 23:48:14 +10:00
778de8f154 replace old inline generation of effects packet with a wrapper NotAdam 2018-07-21 23:32:10 +10:00
c84beee30a replace old inline generation of effects packet with a wrapper NotAdam 2018-07-21 23:32:10 +10:00
f24bfaf74c fix builds with new effect packet NotAdam 2018-07-21 15:54:37 +10:00
9d7896043c fix builds with new effect packet NotAdam 2018-07-21 15:54:37 +10:00
9ab3a63030 update effect struct, knockback effect type NotAdam 2018-07-21 15:39:58 +10:00
3131d36ea6 update effect struct, knockback effect type NotAdam 2018-07-21 15:39:58 +10:00
6579a5d841 First step of inventory cleanup, moving defs to common Mordred 2018-07-20 22:39:10 +02:00
dbf0ce5284 First step of inventory cleanup, moving defs to common Mordred 2018-07-20 22:39:10 +02:00
07e754c790 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-07-17 22:39:18 +02:00
64f603e48e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-07-17 22:39:18 +02:00
e7cf9f9dbe Changed director trigger/function names Mordred 2018-07-17 22:39:04 +02:00
d96c86853b Changed director trigger/function names Mordred 2018-07-17 22:39:04 +02:00
fd089faee8 Merge pull request #301 from DantestyleXD/Gridania_subquests Mordred 2018-07-17 22:22:06 +02:00
efad5ef383

Merge pull request #301 from DantestyleXD/Gridania_subquests Mordred 2018-07-17 22:22:06 +02:00
c8ad76699d redo + a little style (coff coff :D) Dantestyle 2018-07-17 21:22:19 +02:00
2c242997e6 Merge pull request #346 from DantestyleXD/eventhelper Mordred 2018-07-17 16:15:31 +02:00
ccd03aed65

Merge pull request #346 from DantestyleXD/eventhelper Mordred 2018-07-17 16:15:31 +02:00
35f56177c6 Update EventHelper.cpp Mordred 2018-07-17 16:11:09 +02:00
8ac7191502

Update EventHelper.cpp Mordred 2018-07-17 16:11:09 +02:00
c77d5f65dc Merge pull request #353 from takhlaq/develop Mordred 2018-07-17 16:08:29 +02:00
7a74618de9

Merge pull request #353 from takhlaq/develop Mordred 2018-07-17 16:08:29 +02:00
a2651b6909 added some pvp initui fields Tahir Akhlaq 2018-07-17 13:10:42 +01:00
1cf1b8c161 added some pvp initui fields Tahir Akhlaq 2018-07-17 13:10:42 +01:00
877db0ee60 Merge pull request #352 from NotAdam/develop Mordred 2018-07-17 13:56:55 +02:00
f687300cac

Merge pull request #352 from NotAdam/develop Mordred 2018-07-17 13:56:55 +02:00
d66127c287 inutui 💦 NotAdam 2018-07-17 21:47:26 +10:00
dd0a29d898 inutui 💦 NotAdam 2018-07-17 21:47:26 +10:00
513ae3e1e7 Merge pull request #351 from NotAdam/develop Mordred 2018-07-17 13:25:14 +02:00
6be39877dc

Merge pull request #351 from NotAdam/develop Mordred 2018-07-17 13:25:14 +02:00
d0838957b5 anima completion & camera mode clienttrigger NotAdam 2018-07-17 20:55:05 +10:00
ab8ca8feac anima completion & camera mode clienttrigger NotAdam 2018-07-17 20:55:05 +10:00
b34e2f92ea Update ServerZoneDef.h Mordred 2018-07-17 12:11:59 +02:00
86fbbd1ae0

Update ServerZoneDef.h Mordred 2018-07-17 12:11:59 +02:00
ab1d4e6694 Added aetherCurrent mapping and classified some pvp fields Mordred 2018-07-17 01:04:59 +02:00
df44cb9ca1 Added aetherCurrent mapping and classified some pvp fields Mordred 2018-07-17 01:04:59 +02:00
b3b65dacd9 Another chunk of initui data mapped Mordred 2018-07-17 00:36:10 +02:00
629369b5d5 Another chunk of initui data mapped Mordred 2018-07-17 00:36:10 +02:00
1eb9f91446 Erm, that did not happen Mordred 2018-07-16 18:50:04 +02:00
441332fbc9 Erm, that did not happen Mordred 2018-07-16 18:50:04 +02:00
831bd33140 More InitUI fixing Mordred 2018-07-16 18:48:25 +02:00
34aa349d11 More InitUI fixing Mordred 2018-07-16 18:48:25 +02:00
0a3f48d6ab Merge pull request #350 from AriAvery/develop Mordred 2018-07-16 18:06:21 +02:00
db839ebd24

Merge pull request #350 from AriAvery/develop Mordred 2018-07-16 18:06:21 +02:00
7cef56e111 less hosuing AriAvery 2018-07-16 17:58:42 +02:00
3158df44a7 less hosuing AriAvery 2018-07-16 17:58:42 +02:00
774fa1dd7b removed hosuing - created housing AriAvery 2018-07-16 17:51:17 +02:00
28d6c8fe61 removed hosuing - created housing AriAvery 2018-07-16 17:51:17 +02:00
f00efb367a Revert "fixed style #4" AriAvery 2018-07-16 16:21:01 +02:00
2054a87cf7 Revert "fixed style #4" AriAvery 2018-07-16 16:21:01 +02:00
4aa45fd71b fixed style #4 AriAvery 2018-07-16 16:13:39 +02:00
500b194762 fixed style #4 AriAvery 2018-07-16 16:13:39 +02:00
9051ce6f11 added wardMaxNum AriAvery 2018-07-16 13:54:03 +02:00
e4aeaaae8b added wardMaxNum AriAvery 2018-07-16 13:54:03 +02:00
7f3583f305 fixed style #3 AriAvery 2018-07-16 12:37:04 +02:00
d5b7520e22 fixed style #3 AriAvery 2018-07-16 12:37:04 +02:00
7ef913ad19 fixed style #2 AriAvery 2018-07-16 12:05:51 +02:00
627a816f6e fixed style #2 AriAvery 2018-07-16 12:05:51 +02:00
57e1ed8503 fixed style AriAvery 2018-07-16 11:58:25 +02:00
d31a33732c fixed style AriAvery 2018-07-16 11:58:25 +02:00
3593b374ff init housing setup AriAvery 2018-07-15 23:59:15 +02:00
9aeba7a0b3 init housing setup AriAvery 2018-07-15 23:59:15 +02:00
95ad4cbb87 Yet again more InitUI Mordred 2018-07-15 23:58:18 +02:00
87f9610d20 Yet again more InitUI Mordred 2018-07-15 23:58:18 +02:00
979093bdf0 Merge pull request #348 from itsMaru/develop Mordred 2018-07-15 21:08:58 +02:00
80264f1598

Merge pull request #348 from itsMaru/develop Mordred 2018-07-15 21:08:58 +02:00