sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-25 02:57: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

babb58fa21 Revert "Merge pull request #225 from GokuWeedLord/event_rewrite" Mordred 2018-01-28 11:16:34 +01:00
725ca11c60 Revert "Merge pull request #225 from GokuWeedLord/event_rewrite" Mordred 2018-01-28 11:16:34 +01:00
958aa0922e Updated submodule Mordred 2018-01-28 10:10:48 +01:00
9c862b2746 Updated submodule Mordred 2018-01-28 10:10:48 +01:00
6a128b1912 Merge pull request #225 from GokuWeedLord/event_rewrite Mordred 2018-01-28 10:07:58 +01:00
4e2319130f

Merge pull request #225 from GokuWeedLord/event_rewrite Mordred 2018-01-28 10:07:58 +01:00
70cf3919d6 probably fixes linux builds Adam 2018-01-28 19:36:03 +11:00
20996c17f5 probably fixes linux builds Adam 2018-01-28 19:36:03 +11:00
94845da821 remove debug output Adam 2018-01-28 19:02:50 +11:00
6d5317ea1a remove debug output Adam 2018-01-28 19:02:50 +11:00
dde0a30fa3 switch debugcommandhandler for scripted implementation Adam 2018-01-28 18:52:53 +11:00
fb06cd4930 switch debugcommandhandler for scripted implementation Adam 2018-01-28 18:52:53 +11:00
99300d746a make the output of territorymgr nicer on startup 👌 Adam 2018-01-28 18:49:29 +11:00
87a91a19ea make the output of territorymgr nicer on startup 👌 Adam 2018-01-28 18:49:29 +11:00
afd439c64f shouts now have correct behaviour Adam 2018-01-28 18:48:56 +11:00
2ea7f776ba shouts now have correct behaviour Adam 2018-01-28 18:48:56 +11:00
3c890148f2 scripts include ScriptObject.h sanely now Adam 2018-01-28 14:02:51 +11:00
8a462c5609 scripts include ScriptObject.h sanely now Adam 2018-01-28 14:02:51 +11:00
a104b5a928 Merge branch 'master' into event_rewrite Mordred 2018-01-28 00:30:16 +01:00
695fea7812 Merge branch 'master' into event_rewrite Mordred 2018-01-28 00:30:16 +01:00
0e34a6b107 Linux build fix Mordred 2018-01-28 00:09:53 +01:00
0c05252c10 Linux build fix Mordred 2018-01-28 00:09:53 +01:00
62cfa0a291 Type on comment Mordred 2018-01-28 00:03:42 +01:00
73df60440f Type on comment Mordred 2018-01-28 00:03:42 +01:00
140f66a1d0 updated submodule Mordred 2018-01-27 23:55:34 +01:00
26062409cc updated submodule Mordred 2018-01-27 23:55:34 +01:00
6404951549 Removed debug code Mordred 2018-01-27 23:54:26 +01:00
ebad3f3c2f Removed debug code Mordred 2018-01-27 23:54:26 +01:00
aabcdf6e74 Replacement of old ZoneMgr Mordred 2018-01-27 23:52:49 +01:00
35a2c6db09 Replacement of old ZoneMgr Mordred 2018-01-27 23:52:49 +01:00
417d0f42a1 Merge pull request #224 from perize/master Mordred 2018-01-27 09:35:15 +01:00
d78105f9c7

Merge pull request #224 from perize/master Mordred 2018-01-27 09:35:15 +01:00
2614f24a8e MSQ guide packet def Perize 2018-01-27 14:52:14 +09:00
5a3f548f86 MSQ guide packet def Perize 2018-01-27 14:52:14 +09:00
e450917cd0 Haha everything broke haha Maru 2018-01-25 15:32:33 -02:00
f92bdd676a Merge pull request #223 from takhlaq/pcb_reader Mordred 2018-01-25 18:25:26 +01:00
b4b02cf6ab

Merge pull request #223 from takhlaq/pcb_reader Mordred 2018-01-25 18:25:26 +01:00
d575c63152 added planmap loading to pcb_reader Tahir Akhlaq 2018-01-24 15:34:01 +00:00
f0b888a4a3 added planmap loading to pcb_reader Tahir Akhlaq 2018-01-24 15:34:01 +00:00
e24791b59f Fix merge a little more Maru 2018-01-24 12:23:58 -02:00
548ed86fbe Merge - going to fix shortly.. Maru 2018-01-24 12:18:57 -02:00
1ce2d4af03 Merge pull request #222 from takhlaq/pcb_reader Mordred 2018-01-24 11:26:01 +01:00
4c3ed1fa7d

Merge pull request #222 from takhlaq/pcb_reader Mordred 2018-01-24 11:26:01 +01:00
b63b4eb612 updated pcb_reader with mordred's eobj/enpc entries Tahir Akhlaq 2018-01-24 00:15:46 +00:00
95f486ef19 updated pcb_reader with mordred's eobj/enpc entries Tahir Akhlaq 2018-01-24 00:15:46 +00:00
b7d0148539 Merge pull request #221 from takhlaq/pcb_reader Mordred 2018-01-23 20:30:30 +01:00
caec894394

Merge pull request #221 from takhlaq/pcb_reader Mordred 2018-01-23 20:30:30 +01:00
e01710c2c3 fix pcb_reader cmakelists i hope Tahir Akhlaq 2018-01-23 17:47:00 +00:00
7ac18f8f5a fix pcb_reader cmakelists i hope Tahir Akhlaq 2018-01-23 17:47:00 +00:00
6d591a004f reenabled pcb_reader build, removed dumb requirement of territorytype extraction on xivdat build for pcb_reader Tahir Akhlaq 2018-01-23 13:13:35 +00:00
0cac614b96 reenabled pcb_reader build, removed dumb requirement of territorytype extraction on xivdat build for pcb_reader Tahir Akhlaq 2018-01-23 13:13:35 +00:00
31f460d4c4 Merge pull request #220 from goaaats/eventnpc Mordred 2018-01-22 08:42:14 +01:00
37f10fb53b

Merge pull request #220 from goaaats/eventnpc Mordred 2018-01-22 08:42:14 +01:00
235f3cc8c8 zone: Add EventNpc + logic goaaats 2018-01-20 22:03:41 +01:00
ee96791eac zone: Add EventNpc + logic goaaats 2018-01-20 22:03:41 +01:00
b5a92485e7 Merge pull request #219 from AcedArmy/master Mordred 2018-01-19 22:08:36 +01:00
7a6ca3d652

Merge pull request #219 from AcedArmy/master Mordred 2018-01-19 22:08:36 +01:00
f80a2fd0a5 Added GM1 Back since its needed Biscuit Boy 2018-01-20 02:04:38 +11:00
1895accd5e Added GM1 Back since its needed Biscuit Boy 2018-01-20 02:04:38 +11:00
8f2f827427 Fixed GM Call Biscuit Boy 2018-01-20 01:56:00 +11:00
7c90e133f8 Fixed GM Call Biscuit Boy 2018-01-20 01:56:00 +11:00
9607bebb05 Merge pull request #218 from GokuWeedLord/feature/gm-debug-scripting Mordred 2018-01-19 11:12:06 +01:00
2a1593fc4c

Merge pull request #218 from GokuWeedLord/feature/gm-debug-scripting Mordred 2018-01-19 11:12:06 +01:00
ef007bb442 update libs submodule Adam 2018-01-19 20:29:29 +11:00
6476df8ce7 update libs submodule Adam 2018-01-19 20:29:29 +11:00
4b9da92b34 remove scriptname from scripts Adam 2018-01-19 20:17:49 +11:00
9324fe1e89 remove scriptname from scripts Adam 2018-01-19 20:17:49 +11:00
c568a998c3 More event simplification Mordred 2018-01-18 21:49:12 +01:00
8890296639 More event simplification Mordred 2018-01-18 21:49:12 +01:00
0a8ce53b09 Merge pull request #217 from GokuWeedLord/event_rewrite Mordred 2018-01-18 09:03:06 +01:00
052227b85e

Merge pull request #217 from GokuWeedLord/event_rewrite Mordred 2018-01-18 09:03:06 +01:00
b3ba2a992c fix hotloading setting, minor cleanup Adam 2018-01-18 13:56:55 +11:00
59e5a3a7f1 fix hotloading setting, minor cleanup Adam 2018-01-18 13:56:55 +11:00
9f62ca9423 Merge branch 'event_rewrite' of https://github.com/SapphireMordred/Sapphire into event_rewrite Mordred 2018-01-17 23:22:23 +01:00
bad097f368 Merge branch 'event_rewrite' of https://github.com/SapphireMordred/Sapphire into event_rewrite Mordred 2018-01-17 23:22:23 +01:00
32d5a55ee9 Fixed weatherrate being pulled off the wrong field Mordred 2018-01-17 23:22:19 +01:00
3eb0997b2e Fixed weatherrate being pulled off the wrong field Mordred 2018-01-17 23:22:19 +01:00
934784aec7 Merge pull request #216 from GokuWeedLord/event_rewrite Mordred 2018-01-17 11:12:42 +01:00
8808e867a6

Merge pull request #216 from GokuWeedLord/event_rewrite Mordred 2018-01-17 11:12:42 +01:00
15d6ae7e0d use typeinfo for script types instead of an enum Adam 2018-01-17 20:09:16 +11:00
1cbfccb1b3 use typeinfo for script types instead of an enum Adam 2018-01-17 20:09:16 +11:00
5bf895ec3d Updated submodules Mordred 2018-01-16 19:01:10 +01:00
152495061f Updated submodules Mordred 2018-01-16 19:01:10 +01:00
8574e92559 Fixed mysql autoreconnect for prepared statements Mordred 2018-01-16 16:36:24 +01:00
4ce4a73570 Fixed mysql autoreconnect for prepared statements Mordred 2018-01-16 16:36:24 +01:00
bc9d33724a Small reformmating of scriptmanager Mordred 2018-01-16 16:35:50 +01:00
ea91f7e141 Small reformmating of scriptmanager Mordred 2018-01-16 16:35:50 +01:00
9d07048f0d Simplified EventReturnHandler Mordred 2018-01-16 14:01:58 +01:00
f7dc992103 Simplified EventReturnHandler Mordred 2018-01-16 14:01:58 +01:00
52f341c906 More cleanup of event / script handlers Mordred 2018-01-16 02:16:48 +01:00
e7f7cc947f More cleanup of event / script handlers Mordred 2018-01-16 02:16:48 +01:00
147ff80f86 Beginning of splitting eventhandlers, pulling logic out of scriptmanager Mordred 2018-01-14 23:54:26 +01:00
2d8ea346a3 Beginning of splitting eventhandlers, pulling logic out of scriptmanager Mordred 2018-01-14 23:54:26 +01:00
add84d6516 Simplified handling of state flags Mordred Admin 2018-01-11 14:59:39 +01:00
f3d5bf5fa6 Simplified handling of state flags Mordred Admin 2018-01-11 14:59:39 +01:00
6d6c71d6af Removed redundancy in EventHandler type declarations Mordred Admin 2018-01-10 10:47:47 +01:00
5e4b4fac3e Removed redundancy in EventHandler type declarations Mordred Admin 2018-01-10 10:47:47 +01:00
0f16ad4812 Another approach at event improvements Mordred 2018-01-09 23:50:54 +01:00
bafc511db2 Another approach at event improvements Mordred 2018-01-09 23:50:54 +01:00
824a308359 Merge pull request #215 from goaaats/ex-rework Mordred 2018-01-09 23:45:17 +01:00