Commit Graph - re3 - phryk evil mad sciences, LLC

mirror/re3

Fork 0

mirror of https://github.com/GTAmodding/re3.git synced 2024-12-30 09:41:55 +00:00

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

#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

875c77e8b1 oal update Fire-Head 2020-05-07 10:13:59 +0300
35da74e0b4 rem mpg123_pre header Fire-Head 2020-05-07 09:35:34 +0300
12a3499ca3 oal wav/mp3 stream update Fire-Head 2020-05-07 09:26:16 +0300
a8d8c0690d changed default ID ranges. old default.ide incompatible now aap 2020-05-06 23:39:38 +0200
a7c17a329a

fixed lane offset Nikolay Korolev 2020-05-07 00:27:10 +0300
3931dc795f waterlevel with offset (from Fire_Head) aap 2020-05-06 23:13:12 +0200
a1c229784f

Merge pull request #518 from Nick007J/miami aap 2020-05-06 21:55:10 +0200
965ea93a61 checked some of streaming for VC changes aap 2020-05-06 21:54:43 +0200
31ebbf348f Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2020-05-06 21:16:38 +0300
599b7301c8 script stubs + REQUEST_COLLISION Nikolay Korolev 2020-05-06 21:15:58 +0300
03cecb6f1c

Merge pull request #516 from Nick007J/miami Nikolay Korolev 2020-05-06 19:43:45 +0300
f34431a506 Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2020-05-06 19:34:36 +0300
6ad66fb2d7 Merge remote-tracking branch 'origin/master' into miami Sergeanur 2020-05-06 19:32:57 +0300
53107d3b71 added flag Nikolay Korolev 2020-05-06 19:24:33 +0300
0930d70134 IsStatic Nikolay Korolev 2020-05-06 19:20:45 +0300
3895853fe7

Merge pull request #517 from Nick007J/master Nikolay Korolev 2020-05-06 19:18:44 +0300
a24b65cbde IsStatic Nikolay Korolev 2020-05-06 19:17:47 +0300
d5e76471ae Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2020-05-06 19:04:52 +0300
f1c1f56b12 CSphere and CBox for CColModel aap 2020-05-06 17:56:38 +0200
fc8c28722f Merge remote-tracking branch 'origin/master' into miami Sergeanur 2020-05-06 18:24:31 +0300
a76b88da08 fixed object collision stuff at least somewhat aap 2020-05-06 17:17:07 +0200
c11912a8ec sorted out object collision enums aap 2020-05-06 17:13:46 +0200
aa12251c6b Merge branch 'master' of github.com:GTAmodding/re3 aap 2020-05-06 17:13:53 +0200
a2b89c6a18 sorted out object collision enums aap 2020-05-06 17:13:46 +0200
d015e09c92 Merge branch 'master' into miami Sergeanur 2020-05-06 18:03:36 +0300
b633288d1b Merge remote-tracking branch 'origin/master' Sergeanur 2020-05-06 18:02:16 +0300
daa3b20477 Fix cAudioManager::ProcessActiveQueues loop Sergeanur 2020-05-06 18:01:52 +0300
224727c14d got rid of superfluous enum aap 2020-05-06 16:56:59 +0200
b4bbd91921 got rid of superfluous enum aap 2020-05-06 16:56:59 +0200
bd4d5d7c47 Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2020-05-06 16:55:45 +0300
15520fe77d

fix memory corruption Nikolay Korolev 2020-05-06 16:55:04 +0300
3b08efa2ad Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2020-05-06 16:46:33 +0300
bb55430f75 Merge remote-tracking branch 'origin/master' into miami Sergeanur 2020-05-06 16:44:30 +0300
13522259b8 fix for radar aap 2020-05-06 15:41:40 +0200
88076a0050 Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2020-05-06 15:45:13 +0300
25a4091fa8 setting some areas so objects dont disappear aap 2020-05-06 14:43:23 +0200
4d06271a29 Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2020-05-06 15:30:56 +0300
600cbee7d4 Merge branch 'miami' of github.com:GTAmodding/re3 into miami aap 2020-05-06 14:28:05 +0200
13c24a310d little cworld bugfix aap 2020-05-06 14:27:57 +0200
7c356b08e6 little cworld bugfix aap 2020-05-06 14:27:41 +0200
8c036ec671 sync with master Nikolay Korolev 2020-05-06 14:42:41 +0300
bb8b6348ec Fix appveyor Sergeanur 2020-05-06 14:11:21 +0300
c0488d9ecf Merge remote-tracking branch 'origin/master' into miami Sergeanur 2020-05-06 14:10:52 +0300
e0568a19d5 new zone stuff aap 2020-05-06 12:23:57 +0200
cbfc45b3f7 some work on zones aap 2020-05-06 12:23:26 +0200
98177f27ba Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2020-05-06 11:38:02 +0300
aa8968ecf2 updating librw because of fuckup aap 2020-05-06 09:59:36 +0200
edd9301d7f reverting fuckup aap 2020-05-06 09:59:04 +0200
8e84728f41 Merge branch 'master' of github.com:GTAmodding/re3 aap 2020-05-06 09:24:18 +0200
bb0541404d updated librw aap 2020-05-06 09:24:12 +0200
ed021431e9 updated librw aap 2020-05-06 09:23:31 +0200
31f9bb566b implemented most of timecycle and mblur aap 2020-05-06 00:53:26 +0200
a7036475c3 not needed Nikolay Korolev 2020-05-06 01:16:54 +0300
e5da4c2b4d Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2020-05-06 01:11:18 +0300
0b104a59fe script colstore stuff Nikolay Korolev 2020-05-06 01:11:06 +0300
68d3ea9c42 getting the vice city map to work aap 2020-05-05 23:27:43 +0200
35bf340401 colstore support in script Nikolay Korolev 2020-05-06 00:21:26 +0300
f0896ceba7 Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2020-05-05 21:46:00 +0300
1291dd534b script stuff Nikolay Korolev 2020-05-05 21:45:43 +0300
0b61ae11ec Fix appveyour Sergeanur 2020-05-05 21:05:51 +0300
a02b4c9592 Merge branch 'master' into miami Sergeanur 2020-05-05 20:54:54 +0300
42a64a2379 appveyor update Sergeanur 2020-05-05 20:54:44 +0300
3adf740bd5 Remove audio from premake Sergeanur 2020-05-05 20:51:23 +0300
4bd4d24802 Merge branch 'master' into miami Sergeanur 2020-05-05 20:42:11 +0300
52907088f9 Fix build status and don't add random files into the project Sergeanur 2020-05-05 20:40:27 +0300
f45ea0a1cf Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2020-05-05 20:22:17 +0300
918d6dbf56 some more miami Nikolay Korolev 2020-05-05 20:22:13 +0300
7428590457 some miami limits aap 2020-05-05 18:31:53 +0200
559ad5c5e2 Merge branch 'miami' of https://github.com/GTAmodding/re3 into miami aap 2020-05-05 18:07:45 +0200
3e18b92ccc

Merge pull request #515 from Nick007J/miami Nikolay Korolev 2020-05-05 19:07:28 +0300
e81652c2fc cleaned up MIAMI ifdefs aap 2020-05-05 18:06:38 +0200
6b4b708fa7 skipped one def Nikolay Korolev 2020-05-05 19:06:24 +0300
22e8b0e419 Revert "Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL" Sergeanur 2020-05-05 18:34:46 +0300
12fbf8cede Merge branch 'master' into miami Sergeanur 2020-05-05 18:33:32 +0300
1eb817de77 Remove GTA_TRAIN, GTA_BRIDGE, GTA_ZONECULL Sergeanur 2020-05-05 18:32:46 +0300
2c0b82ec1a

Merge pull request #514 from Nick007J/miami aap 2020-05-05 17:23:23 +0200
2a29c6c214 Merge remote-tracking branch 'upstream/miami' into miami Nikolay Korolev 2020-05-05 18:20:37 +0300
edeb8736f1 remove ifdefs Nikolay Korolev 2020-05-05 18:20:10 +0300
7afa4f8316 Revert "Remove ColStore" Sergeanur 2020-05-05 18:14:31 +0300
0aab36c5a7 Merge branch 'master' into miami Sergeanur 2020-05-05 18:14:19 +0300
0163a7bc46 Remove ColStore Sergeanur 2020-05-05 18:13:46 +0300
cb8ffbac73 Revert "Remove #endif" Sergeanur 2020-05-05 18:07:43 +0300
74b522af71 Merge branch 'master' into miami Sergeanur 2020-05-05 18:07:33 +0300
7200a783ee Remove #endif Sergeanur 2020-05-05 18:07:08 +0300
c2b9ddc5b8 Revert "Remove Miami stuff" Sergeanur 2020-05-05 18:04:43 +0300
9960c41193 Remove Miami stuff Sergeanur 2020-05-05 18:04:18 +0300
dfe0642195

Merge pull request #512 from Nick007J/master Sergeanur 2020-05-05 17:14:13 +0300
fcd386f55d

Merge pull request #510 from aap/master Sergeanur 2020-05-05 17:14:01 +0300
fc81a8cbe2

fixed traffic lights Nikolay Korolev 2020-05-05 16:10:22 +0300
3a536f18b1 Add GXT util Sergeanur 2020-05-05 15:47:18 +0300
38935b4ebc Merge branch 'master' of github.com:gtamodding/re3 aap 2020-05-05 14:21:19 +0200
b3b9be5e8c merged master aap 2020-05-05 14:21:13 +0200
5580eb21a4 ModeInfoType -> ModelInfoType Sergeanur 2020-05-05 15:13:09 +0300
4cc1bb92e7 Make CBaseModelInfo fields protected Sergeanur 2020-05-05 15:06:55 +0300
fd462c9b55 implemented most of streamed collisions and big buildings aap 2020-05-05 13:04:29 +0200
e9b334d7bf More use of GetModelIndex Sergeanur 2020-05-05 14:48:35 +0300
ee261c996b Merge remote-tracking branch 'upstream/master' Nikolay Korolev 2020-05-05 14:40:56 +0300
ae0c83fa01 CAutoPilot + CCarAI + fixes Nikolay Korolev 2020-05-05 14:40:35 +0300
b44df26d3e implemented most of streamed collisions and big buildings aap 2020-05-05 13:02:42 +0200
84c9484e55 SetPosition, final part Sergeanur 2020-05-05 04:45:18 +0300