sapphire

mirrors/sapphire

Fork 0

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

60d67952e4 Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred 2017-08-19 00:18:51 +02:00
90ea65385d more restructuring Mordred 2017-08-19 00:18:40 +02:00
3ecc1e6f14 more restructuring Mordred 2017-08-19 00:18:40 +02:00
b702653d9e Merge pull request #63 from Minoost/master SapphireMordred 2017-08-18 19:04:59 +02:00
1602d6b2b0 Merge pull request #63 from Minoost/master SapphireMordred 2017-08-18 19:04:59 +02:00
86524cc53c Add JetBrains cache to gitignore Adam 2017-08-19 01:46:23 +09:00
50bff73e0a Add JetBrains cache to gitignore Minho Kang 2017-08-19 01:46:23 +09:00
5cf2c97bf9 Merge remote-tracking branch 'upstream/master' Adam 2017-08-19 00:49:54 +09:00
8979bcdd8f Merge remote-tracking branch 'upstream/master' Minho Kang 2017-08-19 00:49:54 +09:00
f442ed833b Merge pull request #62 from Minoost/clean SapphireMordred 2017-08-18 17:42:46 +02:00
f49d288182 Merge pull request #62 from Minoost/clean SapphireMordred 2017-08-18 17:42:46 +02:00
9ab055aa6e Forgot script folder Mordred 2017-08-18 17:29:36 +02:00
432d979c73 Forgot script folder Mordred 2017-08-18 17:29:36 +02:00
8f08ddb45b Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred 2017-08-18 17:16:19 +02:00
ff2d46751d Merge branch 'master' of https://github.com/SapphireMordred/Sapphire Mordred 2017-08-18 17:16:19 +02:00
5439e42062 Massivly modified project structure in server_zone Mordred 2017-08-18 17:16:15 +02:00
d3f6fc9a67 Massivly modified project structure in server_zone Mordred 2017-08-18 17:16:15 +02:00
cfe046d59f Merge remote-tracking branch 'upstream/master' Adam 2017-08-18 23:51:33 +09:00
cae5b09744 Merge remote-tracking branch 'upstream/master' Minho Kang 2017-08-18 23:51:33 +09:00
5844fbafcb Merge remote-tracking branch 'origin/clean' Adam 2017-08-18 23:50:58 +09:00
32682a7f03 Merge remote-tracking branch 'origin/clean' Minho Kang 2017-08-18 23:50:58 +09:00
dc5bd5b1f3 Force git to ignore submodule Adam 2017-08-18 23:50:22 +09:00
13bf239b6b Force git to ignore submodule Minho Kang 2017-08-18 23:50:22 +09:00
21795cb310 Cleanup .gitignore and .gitsubmodule Adam 2017-08-18 23:48:35 +09:00
826b46a663 Cleanup .gitignore and .gitsubmodule Minho Kang 2017-08-18 23:48:35 +09:00
7487acb98d Merge pull request #60 from Minoost/cmake SapphireMordred 2017-08-18 14:33:13 +02:00
7f9a3f99c5 Merge pull request #60 from Minoost/cmake SapphireMordred 2017-08-18 14:33:13 +02:00
c460f8d1b4 Fix segfault on 64bit Adam 2017-08-18 21:14:09 +09:00
78b5a13f8a Fix segfault on 64bit Minho Kang 2017-08-18 21:14:09 +09:00
9e4519440f Add /bigobj switch for MSVC Adam 2017-08-18 11:52:59 +09:00
d7c5c4f23e Add /bigobj switch for MSVC Minho Kang 2017-08-18 11:52:59 +09:00
5c8055a587 Removal of outdated Globals.h Mordred 2017-08-17 18:12:29 +02:00
e4d2c3464c Removal of outdated Globals.h Mordred 2017-08-17 18:12:29 +02:00
990a984312 Removal of redundant namespace qualifiers Mordred 2017-08-17 17:45:45 +02:00
94637b6795 Removal of redundant namespace qualifiers Mordred 2017-08-17 17:45:45 +02:00
f0d83cadce Fixed compiler warning in eventhandlers Mordred 2017-08-17 17:39:08 +02:00
61be1ec2c3 Fixed compiler warning in eventhandlers Mordred 2017-08-17 17:39:08 +02:00
79173bcbcd Fixed headers in Eventhandlers.cpp Mordred 2017-08-17 17:36:40 +02:00
ee28a61ae1 Fixed headers in Eventhandlers.cpp Mordred 2017-08-17 17:36:40 +02:00
99b48050ff Merge pull request #59 from Minoost/cmake SapphireMordred 2017-08-17 17:30:33 +02:00
de6a3adb94 Merge pull request #59 from Minoost/cmake SapphireMordred 2017-08-17 17:30:33 +02:00
99b1b1dcf0 Changed handlers to take a const& instead of a shared_ptr of inPacket Mordred 2017-08-17 17:30:00 +02:00
e9a5763533 Changed handlers to take a const& instead of a shared_ptr of inPacket Mordred 2017-08-17 17:30:00 +02:00
25472b1401 Remove VS2015 boost compiler from CMake Adam 2017-08-17 23:48:47 +09:00
98e7873afe Remove VS2015 boost compiler from CMake Minho Kang 2017-08-17 23:48:47 +09:00
d694cbfcf5 Merge remote-tracking branch 'upstream/master' Adam 2017-08-17 23:44:04 +09:00
ce2dcb5530 Merge remote-tracking branch 'upstream/master' Minho Kang 2017-08-17 23:44:04 +09:00
a7afabbf13 Split off ActionHandlers from PacketHandlers Mordred 2017-08-17 16:19:20 +02:00
10814d98ce Split off ActionHandlers from PacketHandlers Mordred 2017-08-17 16:19:20 +02:00
91f5d748e3 Split off InventoryHandler from PacketHandlers Mordred 2017-08-17 16:17:25 +02:00
49c65c8573 Split off InventoryHandler from PacketHandlers Mordred 2017-08-17 16:17:25 +02:00
9ef129a3e9 Removed @set quest command Mordred 2017-08-17 16:14:24 +02:00
ef7d941921 Removed @set quest command Mordred 2017-08-17 16:14:24 +02:00
213a85be08 Removed a unused class Mordred 2017-08-17 00:09:28 +02:00
476707b6c4 Removed a unused class Mordred 2017-08-17 00:09:28 +02:00
a3f87125ef Split of content finder handlers Mordred 2017-08-17 00:07:42 +02:00
99b86c63a2 Split of content finder handlers Mordred 2017-08-17 00:07:42 +02:00
71eab1e434 Refactoring packethandlers, further split them up Mordred 2017-08-17 00:00:41 +02:00
140b457a2a Refactoring packethandlers, further split them up Mordred 2017-08-17 00:00:41 +02:00
e7712bb346 #58 - Fixed roleplaying tag not showing up Mordred 2017-08-16 22:59:53 +02:00
32231fe61f #58 - Fixed roleplaying tag not showing up Mordred 2017-08-16 22:59:53 +02:00
7c9594ee7f Merge pull request #56 from amibu01/master SapphireMordred 2017-08-15 17:25:07 +02:00
62a4ad83c4 Merge pull request #56 from amibu01/master SapphireMordred 2017-08-15 17:25:07 +02:00
afe914d124 Forgot something amibu 2017-08-15 16:19:55 +02:00
f429320ae0 Forgot something amibu 2017-08-15 16:19:55 +02:00
887918775e More skill scripting, fixing insta cast skills for real amibu 2017-08-15 16:15:29 +02:00
04814a3f15 More skill scripting, fixing insta cast skills for real amibu 2017-08-15 16:15:29 +02:00
7419823828 Fixed status effects being added multiple times amibu 2017-08-15 15:48:52 +02:00
5ae9099f2b Fixed status effects being added multiple times amibu 2017-08-15 15:48:52 +02:00
e8261e5fe9 Merge branch 'master' into matchmaking SapphireMordred 2017-08-15 14:31:07 +02:00
7e206fb3cd Merge pull request #54 from Minoost/master SapphireMordred 2017-08-15 14:26:56 +02:00
4fe030d90d Merge pull request #54 from Minoost/master SapphireMordred 2017-08-15 14:26:56 +02:00
f3efd6d086 Implement CFPenaltyTime Minho Kang 2017-08-15 21:22:56 +09:00
a730ef37aa Merge branch 'master' into matchmaking Minho Kang 2017-08-15 19:48:35 +09:00
8f2c030d1b Add Core::Util::getTimeSeconds() Adam 2017-08-15 19:47:58 +09:00
74a63b3b09 Add Core::Util::getTimeSeconds() Minho Kang 2017-08-15 19:47:58 +09:00
bed32e9cc9 Merge pull request #53 from amibu01/master SapphireMordred 2017-08-15 11:48:15 +02:00
c92d907295 DoTs/HoTs, fixed status effects for players amibu 2017-08-15 11:51:59 +02:00
b1c3742e53 Merge pull request #53 from amibu01/master SapphireMordred 2017-08-15 11:48:15 +02:00
90614995cb DoTs/HoTs, fixed status effects for players amibu 2017-08-15 11:51:59 +02:00
784ce3dfa7 Merge pull request #52 from Minoost/master SapphireMordred 2017-08-15 09:57:31 +02:00
ec73f2a6b2 Merge pull request #52 from Minoost/master SapphireMordred 2017-08-15 09:57:31 +02:00
45caae8041 Change buildroot to fix CMake error after VS2017.3 update Adam 2017-08-15 16:54:01 +09:00
0cfc4677da Change buildroot to fix CMake error after VS2017.3 update Minho Kang 2017-08-15 16:54:01 +09:00
792879e17e Merge pull request #51 from AcedArmy/master SapphireMordred 2017-08-14 20:00:04 +02:00
e179e35531 Merge pull request #51 from AcedArmy/master SapphireMordred 2017-08-14 20:00:04 +02:00
deed3296b5 Fixed a Typo From HP Command saying TP Instead Biscuit Boy 2017-08-15 01:49:02 +10:00
3d159eb65c Fixed a Typo From HP Command saying TP Instead Biscuit Boy 2017-08-15 01:49:02 +10:00
adaf0bceba More skill scripting amibu 2017-08-14 17:10:19 +02:00
b550cb511c Merge b267533908 into df98c09179 amibu01 2017-08-14 15:02:17 +00:00
b267533908 More skill scripting amibu 2017-08-14 17:10:19 +02:00
d4564a02dc World ID parameter for lobby amibu 2017-08-14 13:36:22 +02:00
166e61d6f3 World ID parameter for lobby amibu 2017-08-14 13:36:22 +02:00
092896a047 Minor refactoring Mordred 2017-08-13 23:39:04 +02:00
df98c09179 Minor refactoring Mordred 2017-08-13 23:39:04 +02:00
97ae40e93c Some style/readablity fixes Mordred 2017-08-13 23:33:36 +02:00
83855ff027 Some style/readablity fixes Mordred 2017-08-13 23:33:36 +02:00
2117505991 Fixed onlinestatus opcodes Mordred 2017-08-13 23:21:57 +02:00
2ded908891 Fixed onlinestatus opcodes Mordred 2017-08-13 23:21:57 +02:00
2fe10bda85 fixed playerstates being set incorrectly Mordred 2017-08-13 18:28:05 +02:00