sapphire

mirrors/sapphire

Fork 0

mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-05-26 03:27:44 +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

e75c04aa75 Merge pull request #273 from NotAdam/actor_rewrite Mordred 2018-03-14 22:35:45 +01:00
deb46e9a96

Merge pull request #273 from NotAdam/actor_rewrite Mordred 2018-03-14 22:35:45 +01:00
b1d1d885a7 fix indent: episode 2 Adam 2018-03-15 03:31:46 +11:00
56fe72e58a fix indent: episode 2 Adam 2018-03-15 03:31:46 +11:00
f20d3adc61 make leave instance button work Adam 2018-03-15 03:22:59 +11:00
b542af8407 make leave instance button work Adam 2018-03-15 03:22:59 +11:00
f9323cc574 fix indent and leave button opcode def Adam 2018-03-15 03:13:20 +11:00
378dad0008 fix indent and leave button opcode def Adam 2018-03-15 03:13:20 +11:00
9789faaf17 packet doc Adam 2018-03-15 03:05:49 +11:00
00a83a17df packet doc Adam 2018-03-15 03:05:49 +11:00
8bd3e871d6 its magic Adam 2018-03-15 02:49:35 +11:00
2456902467 its magic Adam 2018-03-15 02:49:35 +11:00
a9087289fe magic numbers mason Adam 2018-03-15 02:36:16 +11:00
f6a4edc6de magic numbers mason Adam 2018-03-15 02:36:16 +11:00
71abe6b69e what are if statements, how do they work Adam 2018-03-13 21:59:52 +11:00
22faac5d06 what are if statements, how do they work Adam 2018-03-13 21:59:52 +11:00
f74c96a5d4 reorganise event defs, make instance cutscene playback generic Adam 2018-03-13 20:06:34 +11:00
3baa7efa30 reorganise event defs, make instance cutscene playback generic Adam 2018-03-13 20:06:34 +11:00
aa1c76602b fix some retarded clion refactoring Adam 2018-03-13 19:26:28 +11:00
4ca37d142e fix some retarded clion refactoring Adam 2018-03-13 19:26:28 +11:00
6c1b0f789e create zone cmd Adam 2018-03-13 19:25:50 +11:00
ddd52bcbab create zone cmd Adam 2018-03-13 19:25:50 +11:00
bdd438e589 proper event plays upon entering sastasha Adam 2018-03-13 17:57:52 +11:00
28ee0fd182 proper event plays upon entering sastasha Adam 2018-03-13 17:57:52 +11:00
c501a62916 Instance join cutscene will no longer mess up the player, removed wrong field from event start, cotire server_zone only when using linux Mordred 2018-03-12 23:51:17 +01:00
855ae3e961 Instance join cutscene will no longer mess up the player, removed wrong field from event start, cotire server_zone only when using linux Mordred 2018-03-12 23:51:17 +01:00
d437af7a1e Removed scriptloaders Mordred 2018-03-11 00:56:20 +01:00
113273e571 Removed scriptloaders Mordred 2018-03-11 00:56:20 +01:00
b36402119e

Merge pull request #272 from takhlaq/party_crap Mordred 2018-03-10 22:29:44 +01:00
46cafa2934 Merge pull request #270 from NotAdam/actor_rewrite Mordred 2018-03-09 21:47:40 +01:00
592a16e5c0

Merge pull request #270 from NotAdam/actor_rewrite Mordred 2018-03-09 21:47:40 +01:00
a186c0681c Merge pull request #271 from Minoost/develop-qte_cmd Mordred 2018-03-09 17:02:51 +01:00
c1e85cf9f1

Merge pull request #271 from Minoost/develop-qte_cmd Mordred 2018-03-09 17:02:51 +01:00
317c37ae09 Aaah uuh fix some stuff here and there Maru 2018-03-09 12:09:05 -03:00
0f86b5f045 Add a qte event command Adam 2018-03-10 00:06:44 +09:00
a33894f70a Add a qte event command Mino 2018-03-10 00:06:44 +09:00
3f33f460ed what is git, how does it work Adam 2018-03-09 23:54:18 +11:00
4f268fd4ba what is git, how does it work Adam 2018-03-09 23:54:18 +11:00
43de9533ec remove scriptloader from tree and update gitignore Adam 2018-03-09 23:54:11 +11:00
0842b4a864 remove scriptloader from tree and update gitignore Adam 2018-03-09 23:54:11 +11:00
5a41d3cfc2 Merge remote-tracking branch 'origin/party_crap' into party_crap Maru 2018-03-09 09:50:55 -03:00
fefaedf03f Apply new framework to social model Maru 2018-03-09 09:50:35 -03:00
30cc6644cd Merge actor_rewrite Maru 2018-03-09 09:07:42 -03:00
225a064e55 Additional assert in framwork Mordred Admin 2018-03-09 11:16:36 +01:00
e868f8c4f4 Additional assert in framwork Mordred Admin 2018-03-09 11:16:36 +01:00
9a93c25245 It builds! Mordred Admin 2018-03-09 10:36:07 +01:00
b441d4ec99 It builds! Mordred Admin 2018-03-09 10:36:07 +01:00
f825eb5bdb More framework changes, linker still unhappy Mordred Admin 2018-03-09 10:19:38 +01:00
250b1aef79 More framework changes, linker still unhappy Mordred Admin 2018-03-09 10:19:38 +01:00
24399e31e4 WiP - implementing new framework Mordred 2018-03-09 00:06:44 +01:00
83cb17610c WiP - implementing new framework Mordred 2018-03-09 00:06:44 +01:00
7771b7c8e6 desperate try to figure out the appveyor issue Mordred 2018-03-07 17:41:16 +01:00
c7914a80e4 desperate try to figure out the appveyor issue Mordred 2018-03-07 17:41:16 +01:00
6fdf452895 updated submodule Mordred Admin 2018-03-07 15:05:46 +01:00
02adcc3ef5 updated submodule Mordred Admin 2018-03-07 15:05:46 +01:00
01e5860e24

Merge d9c2ff3a56 into d7f51a2dcf Tahir Akhlaq 2018-03-07 13:14:51 +00:00
d9c2ff3a56 split m_exCats as per https://msdn.microsoft.com/en-us/library/074af4b6.aspx Tahir Akhlaq 2018-03-07 13:01:29 +00:00
5860508590 Merge pull request #268 from itsMaru/actor_rewrite Mordred 2018-03-07 13:40:29 +01:00
d7f51a2dcf

Merge pull request #268 from itsMaru/actor_rewrite Mordred 2018-03-07 13:40:29 +01:00
59a9a44db8 Const correct Maru 2018-03-07 07:49:20 -03:00
926404693f Const correct Maru 2018-03-07 07:49:20 -03:00
69ff6404d4 Oversight... Mordred Admin 2018-03-07 09:22:08 +01:00
3d3c05fdb3 Oversight... Mordred Admin 2018-03-07 09:22:08 +01:00
8e070adf75 Cleanup of script CMakeLists Mordred Admin 2018-03-07 09:19:40 +01:00
8fc9bcf564 Cleanup of script CMakeLists Mordred Admin 2018-03-07 09:19:40 +01:00
ee836e5548 Disableing cotire for zone Mordred Admin 2018-03-07 09:01:53 +01:00
5a6835c7f1 Disableing cotire for zone Mordred Admin 2018-03-07 09:01:53 +01:00
01cd6e17ec forgot to remove old files Mordred Admin 2018-03-07 08:48:16 +01:00
8accf4cacf forgot to remove old files Mordred Admin 2018-03-07 08:48:16 +01:00
2160e6b1a8

Merge 347f87590e into e15c46500c Shelby Hagman 2018-03-07 07:27:24 +00:00
638ba45dd9 Moved scripts out of server_zone scope Mordred Admin 2018-03-07 08:14:42 +01:00
e15c46500c Moved scripts out of server_zone scope Mordred Admin 2018-03-07 08:14:42 +01:00
347f87590e Fix some weirdness with cotire ShelbyZ 2018-03-06 21:49:01 -08:00
fd7489d5c0 Update submodules Mordred 2018-03-06 23:38:21 +01:00
88cf5de3b4 Update submodules Mordred 2018-03-06 23:38:21 +01:00
7ea3bc2523 Build fix... well ish... Mordred 2018-03-06 23:20:07 +01:00
42a556b487 Build fix... well ish... Mordred 2018-03-06 23:20:07 +01:00
a5008e744c Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite Mordred Admin 2018-03-06 22:46:07 +01:00
a489e9f576 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite Mordred Admin 2018-03-06 22:46:07 +01:00
2062bb14a5 Updated submodules Mordred Admin 2018-03-06 22:45:46 +01:00
6350f1d917 Updated submodules Mordred Admin 2018-03-06 22:45:46 +01:00
a2e27ddb9a Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite Mordred 2018-03-06 22:34:12 +01:00
ef39c72bc8 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite Mordred 2018-03-06 22:34:12 +01:00
552179c4e4 Merge remote-tracking branch 'origin/social_implementation' into actor_rewrite Mordred 2018-03-06 22:33:41 +01:00
a7d43d7855 Merge remote-tracking branch 'origin/social_implementation' into actor_rewrite Mordred 2018-03-06 22:33:41 +01:00
28811277a8 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite Mordred Admin 2018-03-06 22:24:25 +01:00
6ed1b274a3 Merge branch 'actor_rewrite' of https://github.com/SapphireMordred/Sapphire into actor_rewrite Mordred Admin 2018-03-06 22:24:25 +01:00
c2165e5f33 Cleanup of cmake files Mordred Admin 2018-03-06 22:22:19 +01:00
b91e711834 Cleanup of cmake files Mordred Admin 2018-03-06 22:22:19 +01:00
ad6f25cb30 Fix const error on group gen func Maru 2018-03-06 04:34:53 -03:00
2b3c41c1f2 Merge pull request #266 from NotAdam/actor_rewrite Mordred 2018-03-06 08:19:01 +01:00
b32393ab42

Merge pull request #266 from NotAdam/actor_rewrite Mordred 2018-03-06 08:19:01 +01:00
4bc06c95ba make mordred happy Adam 2018-03-06 18:00:57 +11:00
32e10ec6e8 make mordred happy Adam 2018-03-06 18:00:57 +11:00
5ae1a99769 if player already zoned into instance, don't teleport them back to start on zonein Adam 2018-03-06 14:26:21 +11:00
df4ee95cf5 if player already zoned into instance, don't teleport them back to start on zonein Adam 2018-03-06 14:26:21 +11:00
806f235de4 Moo woops Maru 2018-03-05 23:55:11 -03:00
348e9916d9 Fix merge stuff Maru 2018-03-05 23:42:09 -03:00
0adb47e4a5 remove double eventStart call Adam 2018-03-06 13:34:02 +11:00
dcd0d6b0cd remove double eventStart call Adam 2018-03-06 13:34:02 +11:00