sapphire

mirrors/sapphire

Fork 0

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

#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

df412bba66 Updated sendNotice and sendUrgent calls Mordred 2019-01-06 00:26:26 +01:00
39da2d2bc9 GM Call is now closer to retail behavior JeidoUran 2019-01-05 18:50:27 +01:00
808adc9f1c GM Call is now closer to retail behavior JeidoUran 2019-01-05 18:50:27 +01:00
24cbff7c7e Added fmt for sendNotice and sendUrgent, have not ported appearances yet Mordred 2019-01-05 14:53:42 +01:00
f7fa30101a Added fmt for sendNotice and sendUrgent, have not ported appearances yet Mordred 2019-01-05 14:53:42 +01:00
d41ac16eda Several GM Commands no longer crashes world.exe if used while a bnpc or an eobj is in range JeidoUran 2019-01-05 14:50:16 +01:00
d2a8e5dc16 Several GM Commands no longer crashes world.exe if used while a bnpc or an eobj is in range JeidoUran 2019-01-05 14:50:16 +01:00
f6e691f65d Merge pull request #6 from SapphireServer/develop JeidoUran 2019-01-05 13:39:12 +01:00
7ac1299507

Merge pull request #6 from SapphireServer/develop JeidoUran 2019-01-05 13:39:12 +01:00
b0ab052bd4 Changed sendDebug to use fmt aswell Mordred 2019-01-05 12:32:10 +01:00
7f00c34f90 Changed sendDebug to use fmt aswell Mordred 2019-01-05 12:32:10 +01:00
3bbe8f352e Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop mordred 2019-01-04 14:29:43 +01:00
fd1341a887 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop mordred 2019-01-04 14:29:43 +01:00
284ae1ee41 Fix for double mysql find mordred 2019-01-04 14:29:31 +01:00
00f8fe97b0 Fix for double mysql find mordred 2019-01-04 14:29:31 +01:00
c09333c96a Merge pull request #469 from JeidoUran/crashes_fix Adam 2019-01-05 00:03:52 +11:00
d9e73e1f51

Merge pull request #469 from JeidoUran/crashes_fix Adam 2019-01-05 00:03:52 +11:00
37417800ac Formatting... JeidoUran 2019-01-04 13:57:29 +01:00
c87955374e Formatting... JeidoUran 2019-01-04 13:57:29 +01:00
a027784247 Formatting² JeidoUran 2019-01-04 13:50:57 +01:00
a3b738d724 Formatting² JeidoUran 2019-01-04 13:50:57 +01:00
329ee05156 Formatting JeidoUran 2019-01-04 13:47:03 +01:00
4dabec79d4 Formatting JeidoUran 2019-01-04 13:47:03 +01:00
bc783993f3 Update DebugCommandMgr.cpp JeidoUran 2019-01-04 13:30:14 +01:00
b99ad78223

Update DebugCommandMgr.cpp JeidoUran 2019-01-04 13:30:14 +01:00
d22047793e Merge remote-tracking branch 'origin/develop' mordred 2019-01-04 13:11:02 +01:00
409c8a25b5 Merge remote-tracking branch 'origin/develop' mordred 2019-01-04 13:11:02 +01:00
646cf701cb fix blasphemous indentation NotAdam 2019-01-04 22:59:09 +11:00
d5e466267e fix blasphemous indentation NotAdam 2019-01-04 22:59:09 +11:00
4dc80de5f2 fix log calls not outputting hex as it used to NotAdam 2019-01-04 22:48:09 +11:00
ba803288a3 fix log calls not outputting hex as it used to NotAdam 2019-01-04 22:48:09 +11:00
2a205cc2db convert more log calls to format string NotAdam 2019-01-04 22:37:01 +11:00
c97ba162a4 convert more log calls to format string NotAdam 2019-01-04 22:37:01 +11:00
ca837de56f Converting logging calls mordred 2019-01-04 12:34:19 +01:00
d6ec45b048 Converting logging calls mordred 2019-01-04 12:34:19 +01:00
6ef140e87d add logger message formatting NotAdam 2019-01-04 21:46:37 +11:00
a140eeac4c add logger message formatting NotAdam 2019-01-04 21:46:37 +11:00
ec340e2c3c ignore clion cmake build directories NotAdam 2019-01-04 20:46:57 +11:00
dfc43dfae6 ignore clion cmake build directories NotAdam 2019-01-04 20:46:57 +11:00
c07d7e6f5d Potential fix for VS build dir mordred 2019-01-04 10:17:21 +01:00
0383e5591e Potential fix for VS build dir mordred 2019-01-04 10:17:21 +01:00
84d6175b20 Moved spawngroup query to prepared stmt mordred 2019-01-04 08:54:39 +01:00
f795aca9a6 Moved spawngroup query to prepared stmt mordred 2019-01-04 08:54:39 +01:00
4e35fd2d91 Fixed a spawngroup related linux crash mordred 2019-01-04 08:32:47 +01:00
31d5aaf457 Fixed a spawngroup related linux crash mordred 2019-01-04 08:32:47 +01:00
a4f54d2b31 "!add bnpc" no longer crashes world.exe if a non-existing bnpctemplate is inputted JeidoUran 2019-01-04 05:12:06 +01:00
3486c5d3ad "!add bnpc" no longer crashes world.exe if a non-existing bnpctemplate is inputted JeidoUran 2019-01-04 05:12:06 +01:00
71f2542c9f Merge pull request #3 from SapphireServer/develop JeidoUran 2019-01-04 02:38:08 +01:00
17361f9146

Merge pull request #3 from SapphireServer/develop JeidoUran 2019-01-04 02:38:08 +01:00
bfb09268a4 Merge pull request #467 from NotAdam/develop Mordred 2019-01-03 23:06:17 +01:00
8eee79b240

Merge pull request #467 from NotAdam/develop Mordred 2019-01-03 23:06:17 +01:00
19de2bf909 Automatically create log folder in cmake stage Mordred 2019-01-03 22:40:26 +01:00
ba779a276c Automatically create log folder in cmake stage Mordred 2019-01-03 22:40:26 +01:00
c9468d8ad2 Automatically copy libmysql.dll to bin folder Mordred 2019-01-03 21:32:44 +01:00
a022a37aab Automatically copy libmysql.dll to bin folder Mordred 2019-01-03 21:32:44 +01:00
b9b10c4024 Added cmake comment mordred 2019-01-03 10:01:00 +01:00
47fb47112a Added cmake comment mordred 2019-01-03 10:01:00 +01:00
a4b6608ce7 More cmake cleanup mordred 2019-01-03 09:53:37 +01:00
df16f1e292 More cmake cleanup mordred 2019-01-03 09:53:37 +01:00
c7993af00a Also copy cand call sql_import for CI mordred 2019-01-03 09:22:03 +01:00
346bb3e30e Also copy cand call sql_import for CI mordred 2019-01-03 09:22:03 +01:00
e32a2ca8f7 Generate libs oos mordred 2019-01-03 09:13:56 +01:00
abd98f82b5 Generate libs oos mordred 2019-01-03 09:13:56 +01:00
303fc8c236 Moved tools to oos build aswell Mordred 2019-01-02 23:40:34 +01:00
51ee602e43 Moved tools to oos build aswell Mordred 2019-01-02 23:40:34 +01:00
8a7ab5aeb6 Merge pull request #1 from SapphireServer/develop JeidoUran 2019-01-02 17:06:25 +01:00
025883803e

Merge pull request #1 from SapphireServer/develop JeidoUran 2019-01-02 17:06:25 +01:00
266aefaa62 Take windows build path out of compiler.cmake mordred 2019-01-02 15:28:24 +01:00
f1c4db5f43 Take windows build path out of compiler.cmake mordred 2019-01-02 15:28:24 +01:00
4c7ddf1beb Updated gitignore for moved config mordred 2019-01-02 15:22:06 +01:00
8e405856de Updated gitignore for moved config mordred 2019-01-02 15:22:06 +01:00
2ed9d84bd0 True out of source build now possible. mordred 2019-01-02 15:09:59 +01:00
3e6bf7614b True out of source build now possible. mordred 2019-01-02 15:09:59 +01:00
3ffcf4e1fa Further cmake cleanup mordred 2019-01-02 11:23:39 +01:00
e7507515b6 Further cmake cleanup mordred 2019-01-02 11:23:39 +01:00
551efcfe9a Slight cmake cleanup mordred 2019-01-02 10:28:41 +01:00
38d6f73951 Slight cmake cleanup mordred 2019-01-02 10:28:41 +01:00
a25cfcd9d1 Merge remote-tracking branch 'origin/housing' into develop Mordred 2019-01-01 15:06:42 +01:00
789127691a Merge remote-tracking branch 'origin/housing' into develop Mordred 2019-01-01 15:06:42 +01:00
8bf71e90d5 Merge pull request #468 from NotAdam/housing Mordred 2019-01-01 14:47:44 +01:00
43e02b33e2

Merge pull request #468 from NotAdam/housing Mordred 2019-01-01 14:47:44 +01:00
4673a8122e fix structs, disable market cache gen NotAdam 2019-01-01 23:37:32 +11:00
f0202a2094 fix structs, disable market cache gen NotAdam 2019-01-01 23:37:32 +11:00
cd19435876 somewhat working marketboard implementation NotAdam 2019-01-01 17:29:06 +11:00
4fcfc6ecf1 somewhat working marketboard implementation NotAdam 2019-01-01 17:29:06 +11:00
717acba9cb fix oob error on market board result lists and correctly sort the items NotAdam 2019-01-01 14:19:44 +11:00
a37525d002 fix oob error on market board result lists and correctly sort the items NotAdam 2019-01-01 14:19:44 +11:00
50d1d9d492 correctly send marketboard item list NotAdam 2019-01-01 11:51:48 +11:00
0aa1fab9a4 correctly send marketboard item list NotAdam 2019-01-01 11:51:48 +11:00
959c2d4319 Simplified some cmake logic Mordred 2018-12-31 17:30:45 +01:00
2761a9029a Simplified some cmake logic Mordred 2018-12-31 17:30:45 +01:00
941cbde510 Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-12-31 13:54:48 +01:00
02dca45cfe Merge branch 'develop' of https://github.com/SapphireMordred/Sapphire into develop Mordred 2018-12-31 13:54:48 +01:00
589205d41e Moved cmake logic to root cmakelists Mordred 2018-12-31 13:54:31 +01:00
ade2dece10 Moved cmake logic to root cmakelists Mordred 2018-12-31 13:54:31 +01:00
af7a769433 start of marketboard implementation NotAdam 2018-12-31 23:20:36 +11:00
6ce9d9557e start of marketboard implementation NotAdam 2018-12-31 23:20:36 +11:00
d421888a07 fix storing items in the housing storerooms for real this time NotAdam 2018-12-31 22:45:39 +11:00
72261e465b fix storing items in the housing storerooms for real this time NotAdam 2018-12-31 22:45:39 +11:00
1c890a43bf handle fc doors properly NotAdam 2018-12-31 22:02:34 +11:00