Commit Graph

Select branches

Hide Pull Requests

lcs

master

miami

#1

#10

#1000

#1001

#1002

#1003

#1004

#1008

#101

#1010

#1013

#1016

#1017

#1018

#1019

#1020

#1021

#1022

#1023

#1024

#1025

#1026

#1028

#1029

#1031

#1040

#1040

#1050

#1052

#106

#107

#1070

#108

#1083

#1083

#1088

#109

#1090

#11

#110

#1105

#1109

#111

#112

#1123

#1127

#1128

#113

#1133

#1134

#1135

#1136

#114

#1147

#1148

#1149

#115

#1150

#1151

#1153

#1155

#1156

#1160

#1161

#1168

#1170

#1181

#1185

#1185

#1187

#1188

#1189

#1195

#1198

#12

#120

#1202

#1203

#1204

#1205

#1205

#121

#1217

#1218

#1219

#122

#1220

#1226

#1226

#1229

#123

#1230

#1232

#1233

#1234

#1235

#1236

#1237

#1240

#1240

#1241

#1242

#1243

#1248

#1249

#1251

#1253

#1254

#1254

#1255

#1257

#1258

#1259

#126

#1260

#1262

#1262

#1263

#1263

#1265

#1266

#1267

#1268

#127

#1271

#1273

#1275

#1275

#1276

#1278

#128

#1281

#1282

#1284

#1284

#1285

#129

#1295

#1297

#1297

#13

#130

#1300

#1304

#1308

#131

#1318

#1321

#1321

#1322

#1325

#1327

#1328

#1328

#1330

#1330

#1331

#135

#136

#137

#139

#14

#140

#141

#145

#147

#148

#149

#15

#151

#152

#153

#154

#155

#156

#158

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#175

#176

#177

#178

#179

#180

#181

#182

#183

#184

#185

#186

#187

#188

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#237

#238

#239

#24

#243

#244

#245

#246

#247

#248

#249

#25

#250

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#272

#273

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#298

#299

#3

#30

#300

#31

#315

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#333

#334

#335

#336

#337

#338

#339

#340

#342

#343

#344

#345

#346

#347

#348

#349

#350

#351

#352

#353

#354

#355

#356

#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

#383

#384

#385

#386

#387

#388

#389

#390

#391

#392

#393

#394

#395

#396

#397

#399

#4

#400

#401

#402

#403

#404

#405

#406

#407

#408

#409

#410

#411

#412

#413

#414

#415

#416

#429

#43

#435

#440

#445

#446

#447

#448

#451

#453

#454

#455

#457

#458

#459

#460

#462

#463

#464

#465

#466

#467

#469

#47

#472

#473

#474

#475

#476

#477

#478

#479

#48

#480

#481

#482

#483

#485

#487

#488

#489

#49

#490

#492

#494

#495

#498

#499

#5

#50

#500

#501

#502

#504

#507

#508

#509

#51

#510

#512

#514

#515

#516

#517

#518

#521

#522

#524

#526

#527

#528

#529

#530

#531

#532

#533

#534

#535

#536

#537

#538

#547

#550

#551

#553

#554

#555

#556

#557

#558

#559

#56

#560

#561

#562

#563

#564

#567

#568

#569

#57

#572

#573

#574

#575

#576

#577

#578

#579

#580

#581

#582

#583

#586

#587

#588

#59

#599

#6

#60

#600

#601

#602

#603

#604

#605

#607

#608

#61

#611

#613

#614

#615

#616

#617

#618

#619

#62

#620

#622

#623

#624

#625

#626

#630

#631

#632

#633

#634

#636

#637

#638

#639

#640

#641

#647

#648

#649

#65

#650

#651

#652

#653

#654

#655

#656

#659

#661

#662

#663

#664

#665

#666

#667

#668

#669

#67

#670

#672

#673

#674

#675

#676

#677

#678

#679

#68

#680

#681

#682

#683

#684

#686

#687

#688

#689

#690

#691

#692

#693

#694

#695

#696

#697

#698

#699

#7

#70

#700

#701

#702

#703

#706

#707

#71

#711

#715

#716

#717

#718

#72

#721

#722

#723

#727

#731

#733

#734

#735

#736

#737

#738

#740

#741

#743

#745

#746

#746

#748

#750

#751

#752

#752

#753

#754

#755

#756

#758

#759

#760

#761

#762

#763

#765

#766

#767

#769

#77

#771

#772

#773

#774

#775

#776

#777

#778

#779

#78

#780

#781

#789

#79

#791

#792

#793

#795

#796

#797

#8

#80

#801

#803

#804

#809

#81

#810

#811

#812

#815

#816

#817

#82

#820

#821

#822

#823

#824

#824

#825

#827

#828

#830

#830

#831

#833

#834

#838

#841

#842

#844

#846

#847

#849

#85

#850

#851

#853

#854

#855

#856

#857

#86

#860

#861

#862

#863

#865

#867

#867

#868

#869

#87

#870

#871

#872

#873

#874

#875

#876

#88

#880

#882

#883

#884

#885

#886

#887

#888

#889

#89

#890

#891

#893

#894

#895

#897

#9

#90

#902

#904

#907

#909

#91

#910

#913

#914

#915

#916

#917

#918

#918

#920

#921

#922

#923

#924

#925

#926

#926

#929

#930

#940

#941

#942

#943

#945

#946

#947

#948

#949

#951

#952

#953

#954

#955

#956

#957

#959

#960

#961

#962

#963

#964

#965

#966

#967

#967

#968

#971

#972

#973

#974

#975

#976

#977

#978

#979

#980

#981

#982

#982

#983

#984

#986

#987

#990

#992

#995

#996

#997

#998

Mono Color

• 495a447c8a merged correct switch Nikolay Korolev 2021-08-15 18:41:59 +0300
• 25075decb2 bruh Nikolay Korolev 2021-08-15 18:40:38 +0300
• 1b178a55d7 actual fix Nikolay Korolev 2021-08-15 18:35:47 +0300
• e30e1ccccd lil fix Nikolay Korolev 2021-08-15 18:27:30 +0300
• 6bdfb0d386 merged correct switch Nikolay Korolev 2021-08-15 18:41:59 +0300
• 26e5a7eed1 bruh Nikolay Korolev 2021-08-15 18:40:38 +0300
• 4b4aefe339 bruh Nikolay Korolev 2021-08-15 18:40:38 +0300
• 042284de8b actual fix Nikolay Korolev 2021-08-15 18:35:47 +0300
• c48f6e9bda actual fix Nikolay Korolev 2021-08-15 18:35:47 +0300
• 435b8fe52e Fix impossible bullets #1295 erorcun 2021-08-14 22:11:33 +0300
• 3441714a13 lil fix Nikolay Korolev 2021-08-15 18:27:30 +0300
• 5fe04940be lil fix Nikolay Korolev 2021-08-15 18:27:30 +0300
• e80b71fa5d
  Merge 3aad099f6d into 854ee12d9d #1226 erorcun 2021-08-15 12:38:38 +0100
• c9baa66f51
  Merge 5d44792757 into 854ee12d9d #1262 alex 2021-08-15 12:36:22 +0100
• 854ee12d9d Fix ifdef for audio reflection members Sergeanur 2021-08-15 14:11:20 +0300
• 5ddd0649e3 Fix cAudioManager::ProcessVehicleEngine return type, document PS2 changes, rename Sound Intensity Sergeanur 2021-08-15 13:14:16 +0300
• 886650a887 Fix CW build Sergeanur 2021-08-15 13:12:10 +0300
• ee9e8bf11e [lcs] reversed CScrollBar asm95 2021-08-14 20:40:12 -0300
• 747ae04279 Fix premature .ini saving leading to missing bindings erorcun 2021-08-15 03:29:49 +0300
• f4e723e690 Fix .ini fix for glfw erorcun 2021-08-15 03:59:12 +0300
• 0db14d718c All the sliders, unite erorcun 2021-08-15 03:39:35 +0300
• fd52285074 Fix premature .ini saving leading to missing bindings erorcun 2021-08-15 03:29:49 +0300
• eadf0496bf fixed heli buoyancy Nikolay Korolev 2021-08-14 23:31:32 +0300
• 4a5f7464c1 Switch PR & remove X11 part from CMakeLists erorcun 2021-08-14 18:09:07 +0300
• 39d2c427e5 merge miami Nikolay Korolev 2021-08-14 17:18:34 +0300
• 958e2f36bb ginput script Nikolay Korolev 2021-08-14 16:44:09 +0300
• ba859dc3b5 fix Nikolay Korolev 2021-08-14 16:31:34 +0300
• cc603fd085
  Merge 0cf98fa028 into 3a95c77c9e #1263 alex 2021-08-13 12:14:18 +0000
• 3a95c77c9e Revert "map memory usage high default" erorcun 2021-08-13 00:51:05 +0300
• df89e5091e Revert "map memory usage high default" erorcun 2021-08-13 00:16:16 +0300
• 81c6c5e47a map memory usage high default withmorten 2021-08-12 23:08:33 +0200
• b7c7c883d7 map memory usage high default withmorten 2021-08-12 23:07:54 +0200
• 4141caa4d6 Merge branch 'miami' into lcs Sergeanur 2021-08-12 16:04:25 +0300
• 0a2df3ca4c Fix sampman_null Sergeanur 2021-08-12 15:03:38 +0300
• 8759c2edf0 Sync fixes from miami Sergeanur 2021-08-12 15:01:58 +0300
• 92c5cf1877 Sync audio changes from master Sergeanur 2021-08-12 14:57:16 +0300
• 43fbf297c8 Waypoint text fix Sergeanur 2021-08-12 14:15:49 +0300
• 033d89a9ab Refactor cAudioManager::ProcessActiveQueues, fix doppler effect Sergeanur 2021-08-12 13:01:07 +0300
• f1545daeae Rename unused audio member Sergeanur 2021-08-12 11:46:10 +0300
• ec22576e49 Merge remote-tracking branch 'aap/lcs' into lcs Sergeanur 2021-08-12 11:45:25 +0300
• 9a1b826021 Merge remote-tracking branch 'origin/miami' into lcs Sergeanur 2021-08-12 11:43:17 +0300
• 4f8993e19b Replace static_assert with #error Sergeanur 2021-08-12 11:35:07 +0300
• 2ef43e8d1a Fix sampman_null Sergeanur 2021-08-12 10:41:22 +0300
• ce78081a7f Put more things under ifdef Sergeanur 2021-08-11 15:33:50 +0300
• 6c2d179aad Add define to enable/disable external 3d audio simulation Sergeanur 2021-07-29 10:16:51 +0300
• 74f223bede Replace static_assert with #error #1258 Sergeanur 2021-08-12 11:35:07 +0300
• b99edf9a6b mission retry fix Nikolay Korolev 2021-08-12 11:23:10 +0300
• 09eb7808e3 Fix sampman_null Sergeanur 2021-08-12 10:41:22 +0300
• cb35f78511 lil fix Nikolay Korolev 2021-08-12 01:30:26 +0300
• 676ddc3bdb Put more things under ifdef Sergeanur 2021-08-11 15:33:50 +0300
• cd004029a6 Add define to enable/disable external 3d audio simulation Sergeanur 2021-07-29 10:16:51 +0300
• 2eb0390dc9 Fix unset emitting volume for sawmill Sergeanur 2021-08-11 13:35:50 +0300
• f131f70761 Fix unset emitting volume for moan sound Sergeanur 2021-08-11 12:10:48 +0300
• 68c37d2d88 Reverse miami vice ped comments Sergeanur 2021-08-11 10:55:00 +0300
• 80dc23621e uncomment GetSpecialCharacterTalkSfx Sergeanur 2021-08-11 10:47:02 +0300
• b289bb4edb Reverse special characters' ped comments Sergeanur 2021-08-11 10:09:20 +0300
• 2c79080e1b Merge branch 'miami' into lcs Sergeanur 2021-08-11 09:36:58 +0300
• 75f812cfcd Merge branch 'master' into miami Sergeanur 2021-08-11 09:32:59 +0300
• 463fdab6a4 Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls, part 2 Sergeanur 2021-08-11 08:42:26 +0300
• d7a28c4d2b Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls Sergeanur 2021-08-11 08:35:01 +0300
• 0544beb00d Add sprite to the waypoint marker Sergeanur 2021-08-11 08:15:30 +0300
• 1f98f01dcb Fix a bunch of CModelInfo::GetModelInfo->GetColModel calls Sergeanur 2021-08-09 18:14:19 +0300
• 8ea411e4c5 Add sprite to the waypoint marker Sergeanur 2021-08-02 14:45:37 +0300
• ab5965cc8d fix steam saves withmorten 2021-08-09 16:36:15 +0200
• 858f913fac small fix withmorten 2021-08-09 16:34:05 +0200
• 10f42aa2b9 revert physics changes. They ain't right. #1284 ZLau92 2021-08-08 21:57:41 -0500
• e042ba6f24 Merge remote-tracking branch 'upstream/lcs' into lcs Nikolay Korolev 2021-08-09 00:57:35 +0300
• 4b7dc08bf5 debug func fix Nikolay Korolev 2021-08-09 00:57:18 +0300
• c851d9a6ba Merge branch 'miami' into lcs Nikolay Korolev 2021-08-09 00:08:42 +0300
• 3869369703 Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2021-08-09 00:07:50 +0300
• 2ee32abf84 fix bug in CCurves Nikolay Korolev 2021-08-09 00:07:02 +0300
• c5af250959 debug func Nikolay Korolev 2021-08-08 23:48:07 +0300
• 42ad9c4378 Comment out text following #endif Barracuda6 2021-08-08 10:57:48 -0400
• 26a9ac91ee Merge branch 'miami' into lcs Sergeanur 2021-08-08 18:02:45 +0300
• 76a22c0d13 Fix Sergeanur 2021-08-08 18:02:23 +0300
• 2f5f7be4a4 Comment out text following #endif #1285 Barracuda6 2021-08-08 10:57:48 -0400
• f887d515fa Sync fix from miami Sergeanur 2021-08-08 17:53:01 +0300
• 729ef37040 merge Nikolay Korolev 2021-08-08 17:44:38 +0300
• e17504a36a Merge branch 'master' into miami Nikolay Korolev 2021-08-08 17:43:07 +0300
• 4673f509f6 Revert "small fix" Nikolay Korolev 2021-08-08 17:42:32 +0300
• 35dd465c19 Revert "small fix" Nikolay Korolev 2021-08-08 17:41:35 +0300
• 7b9d8c5a1f merge Nikolay Korolev 2021-08-08 17:36:08 +0300
• 8d9508bda4 Merge branch 'master' into miami Nikolay Korolev 2021-08-08 17:34:28 +0300
• bd96584433 small fix Nikolay Korolev 2021-08-08 17:34:03 +0300
• 68db861c45 merge Nikolay Korolev 2021-08-08 17:29:57 +0300
• 873840a6a5 merge Nikolay Korolev 2021-08-08 17:19:49 +0300
• 947f67dfb7 small fix Nikolay Korolev 2021-08-08 17:17:20 +0300
• 478bdcc1ca merge Nikolay Korolev 2021-08-08 17:14:21 +0300
• 63046894b0 small refactoring Nikolay Korolev 2021-08-08 16:57:37 +0300
• 74f00c3c63 merge Nikolay Korolev 2021-08-08 15:46:47 +0300
• 668311a444 Merge branch 'master' into miami Nikolay Korolev 2021-08-08 15:44:18 +0300
• 15f770531c fixed tab Nikolay Korolev 2021-08-08 15:42:44 +0300
• 88b4c7b50b merge Nikolay Korolev 2021-08-08 15:34:02 +0300
• 9cc1201892 merge Nikolay Korolev 2021-08-08 13:38:21 +0300
• e6b1a0691b lcs bridge Nikolay Korolev 2021-08-08 13:08:47 +0300
• 22e4d13163
  Prevent Catalina's heli from despawning #2 #1254 Nab 2021-08-08 11:55:37 +0200
• 0c4ab5b609 disable mission replay for lcs Nikolay Korolev 2021-08-08 10:51:04 +0300
• a30ff24bad
  Update car-follow free cam Zach Charo 2021-08-07 22:09:17 -0500
• 2672504e8a more cherry-pick fix Nikolay Korolev 2021-08-03 22:20:14 +0300
• a7e86e0510 cherrypick fixes Nikolay Korolev 2021-08-03 22:14:58 +0300