Commit Graph

Select branches

Hide Pull Requests

2.3-updates

2.4-updates

master

#10

#100

#1000

#1002

#1003

#1003

#1004

#1005

#1007

#1008

#1009

#101

#1012

#1014

#1015

#1018

#1019

#1020

#1022

#1023

#1024

#1025

#1027

#1028

#1029

#103

#1031

#1032

#1033

#1034

#1035

#1036

#1037

#1039

#104

#1040

#1041

#1042

#1043

#1044

#1045

#1046

#1047

#1048

#1049

#1050

#1054

#1055

#1058

#1059

#106

#1061

#1062

#1063

#1065

#1066

#1067

#1068

#1069

#107

#1071

#1072

#1073

#1074

#1075

#1076

#1077

#1079

#108

#1080

#1082

#1083

#1084

#1085

#1086

#1087

#1088

#109

#1090

#1092

#1093

#1095

#1096

#1097

#1098

#1099

#11

#110

#1100

#1101

#1102

#1103

#1104

#1105

#1106

#1107

#1108

#1109

#111

#1110

#1112

#1114

#1115

#1118

#1119

#1120

#1121

#1122

#1124

#1125

#1127

#1128

#1129

#113

#1130

#1131

#1132

#1133

#1134

#1135

#1135

#1137

#1138

#1139

#114

#1140

#1141

#1141

#1142

#1143

#1144

#1146

#1147

#1148

#1149

#115

#1150

#1151

#1156

#1157

#116

#1160

#1160

#1161

#1162

#1164

#1164

#1166

#1168

#1169

#117

#1170

#1171

#1172

#1172

#1173

#1174

#1175

#1177

#1178

#1179

#118

#1180

#1181

#1182

#1183

#1184

#1186

#1187

#1188

#119

#1191

#1192

#1195

#1196

#1196

#1199

#12

#120

#1201

#1201

#1202

#1203

#1204

#1204

#1207

#1208

#121

#1210

#1211

#1213

#1217

#1217

#1218

#1219

#122

#1220

#1221

#1222

#1224

#1225

#1226

#1227

#1228

#1229

#123

#1230

#1231

#1232

#1233

#1234

#1236

#1237

#1238

#1239

#124

#1241

#1243

#1244

#1245

#1247

#1249

#125

#1250

#1253

#1254

#1255

#1257

#1257

#1258

#1259

#1259

#126

#1260

#1260

#1261

#1262

#1264

#1265

#1266

#1267

#1268

#1269

#127

#1270

#1273

#1273

#1275

#1275

#1276

#1276

#1277

#1278

#128

#1280

#1281

#1281

#129

#132

#133

#134

#135

#136

#137

#138

#139

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#151

#152

#153

#154

#155

#156

#157

#158

#159

#160

#161

#162

#163

#164

#165

#166

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#180

#181

#182

#183

#184

#185

#186

#188

#189

#19

#190

#191

#192

#193

#194

#195

#197

#198

#200

#201

#202

#203

#204

#205

#206

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#222

#223

#224

#225

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#250

#251

#252

#253

#254

#255

#256

#257

#259

#26

#260

#261

#262

#263

#264

#265

#266

#268

#269

#270

#272

#273

#274

#275

#277

#278

#279

#28

#280

#281

#282

#284

#285

#286

#287

#288

#289

#29

#291

#292

#293

#294

#295

#296

#298

#299

#30

#301

#302

#303

#304

#305

#306

#307

#308

#310

#311

#312

#313

#314

#315

#316

#317

#318

#319

#32

#320

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#330

#331

#332

#333

#334

#335

#336

#337

#338

#339

#34

#340

#341

#342

#343

#344

#346

#348

#349

#35

#350

#351

#352

#353

#354

#355

#356

#357

#358

#359

#36

#360

#361

#362

#363

#364

#365

#368

#37

#375

#385

#388

#392

#394

#395

#396

#397

#398

#399

#40

#403

#406

#407

#408

#409

#410

#412

#413

#414

#416

#417

#418

#419

#420

#421

#422

#423

#424

#425

#427

#428

#429

#430

#432

#433

#434

#435

#436

#438

#439

#440

#441

#442

#443

#444

#445

#446

#447

#45

#451

#453

#454

#455

#457

#459

#46

#460

#461

#462

#463

#465

#466

#467

#468

#469

#47

#470

#471

#472

#473

#474

#475

#476

#477

#478

#479

#48

#480

#481

#482

#483

#485

#486

#487

#488

#489

#49

#490

#491

#492

#493

#494

#495

#496

#497

#498

#499

#50

#500

#501

#502

#503

#504

#506

#507

#509

#51

#510

#511

#512

#513

#514

#515

#516

#517

#518

#519

#52

#520

#521

#522

#523

#524

#525

#526

#527

#528

#529

#53

#530

#531

#532

#533

#534

#535

#536

#537

#538

#539

#540

#541

#544

#545

#546

#547

#548

#549

#55

#550

#551

#552

#553

#554

#555

#557

#558

#559

#560

#561

#562

#563

#564

#565

#566

#567

#568

#569

#57

#570

#571

#572

#573

#574

#575

#576

#578

#579

#58

#580

#581

#582

#583

#584

#585

#586

#587

#588

#589

#59

#591

#592

#593

#594

#595

#596

#597

#598

#599

#600

#601

#602

#603

#604

#605

#607

#609

#61

#610

#611

#612

#613

#614

#615

#616

#617

#619

#620

#621

#622

#623

#624

#625

#626

#627

#628

#629

#63

#630

#631

#632

#633

#634

#635

#636

#637

#638

#639

#64

#640

#641

#642

#643

#644

#645

#646

#647

#648

#649

#650

#651

#652

#653

#654

#655

#656

#657

#658

#659

#660

#661

#662

#663

#664

#665

#666

#667

#668

#669

#670

#671

#672

#673

#674

#675

#676

#677

#678

#679

#680

#681

#682

#683

#684

#685

#686

#687

#688

#689

#69

#690

#691

#692

#693

#694

#695

#697

#698

#70

#700

#703

#704

#705

#708

#709

#71

#716

#717

#718

#719

#72

#720

#721

#722

#723

#724

#725

#726

#727

#728

#729

#730

#731

#732

#733

#734

#737

#738

#739

#74

#740

#741

#742

#743

#744

#745

#746

#747

#748

#749

#75

#750

#751

#753

#754

#755

#756

#758

#760

#762

#763

#765

#766

#767

#768

#769

#77

#771

#772

#773

#774

#775

#776

#777

#778

#779

#78

#780

#781

#782

#783

#785

#786

#787

#788

#789

#790

#791

#792

#793

#794

#795

#796

#797

#798

#799

#800

#801

#802

#803

#804

#805

#806

#807

#808

#809

#810

#811

#813

#814

#815

#816

#817

#818

#819

#821

#823

#824

#825

#827

#83

#835

#838

#84

#840

#845

#847

#85

#850

#851

#852

#854

#858

#86

#864

#865

#869

#87

#871

#872

#874

#876

#877

#878

#88

#882

#883

#89

#891

#894

#895

#895

#896

#897

#897

#898

#899

#90

#902

#905

#906

#907

#908

#909

#910

#911

#912

#914

#915

#916

#917

#918

#918

#919

#92

#922

#923

#924

#926

#929

#93

#930

#931

#932

#933

#934

#935

#937

#938

#939

#940

#941

#942

#943

#944

#946

#947

#948

#949

#950

#952

#954

#954

#955

#956

#957

#958

#959

#96

#960

#961

#963

#964

#966

#968

#969

#97

#971

#972

#973

#974

#978

#979

#98

#980

#981

#982

#983

#985

#986

#987

#989

#990

#991

#993

#995

#996

#997

#997

#998

#999

2.2

2.3

2.3.1

2.3.2

2.3.3

2.3.4

2.3.5

2.3.6

2.4

2.4.1

2.4.2

2.4.3

2.4.4

Mono Color

• cd0c9ccb31 De-duplicate setting mainmenu and fademode Misa 2021-03-25 20:10:36 -07:00
• 6a6c09f69d Fix 1-frame flicker entering room with warp lines and entity on edge Misa 2021-03-25 19:00:31 -07:00
• 8fd7210d37 De-duplicate warp line creation in createentity() Misa 2021-03-25 18:57:53 -07:00
• c8f4c37c88 Add bounds check for color of createentity number 55 Misa 2021-03-25 18:38:36 -07:00
• 6490af8783 Merge pull request #680 from InfoTeddy/pr-template-update Terry Cavanagh 2021-03-25 11:57:34 +10:30
• ab59ec35fb Remove 2.3 example from pull request template Misa 2021-03-24 14:36:33 -07:00
• 423c79b572 Add bounds checks to room explored getter and setter Misa 2021-03-24 12:14:28 -07:00
• c5e999c1d5 Refactor explored rooms to use setters and getters Misa 2021-03-24 12:12:39 -07:00
• b340a6ccc4 Add bounds checks to room propety getters and setters Misa 2021-03-24 12:04:06 -07:00
• 945d5f244a Refactor room properties to use setter and getter funcs Misa 2021-03-24 11:59:36 -07:00
• cfd5be1bc5 Add bounds checks to tile setter and getters Misa 2021-03-24 11:51:39 -07:00
• 344c93e754 Refactor tiles to use setter and getter functions Misa 2021-03-24 11:26:19 -07:00
• ccdb0c9148 Fix bounds checks in drawentity() Misa 2021-03-24 12:32:43 -07:00
• 4e52dccdae Initialize temporary edentity when loading levels Misa 2021-03-24 12:21:28 -07:00
• 69b0f0b650 Add missing pText NULL checks Misa 2021-03-24 12:19:44 -07:00
• 0da9b5069a Capitalize "OFF" when invincibility is off Misa 2021-03-21 17:41:07 -07:00
• 9ab61af1da Add period to text outline description Misa 2021-03-21 17:36:23 -07:00
• d45e6f6254 Remove game.gametimer in favor of game.frames Misa 2021-03-21 16:58:08 -07:00
• 17169320b4 Fix text box deltaframe flashing on deltaframes after fully opaque Misa 2021-03-21 12:49:14 -07:00
• 415d4790e2 Fix a crash on first unfocus Ethan Lee 2021-03-21 17:19:08 -04:00
• 7abd4bb8d8 Visual Studio buildfix Ethan Lee 2021-03-21 17:15:36 -04:00
• 4a79f02842 Add braces around sub-object in unfocused_func_list Misa 2021-03-21 13:53:29 -07:00
• 02560ca6e5 Remove now-unneeded kludge for finalmode entity colors Misa 2021-03-18 21:38:30 -07:00
• 287061c768 Fix filter/screenshake/flash update order Misa 2021-03-17 17:53:17 -07:00
• 094209bd12 Move logical onground/onroof updates to start of gamelogic Misa 2021-03-18 13:20:56 -07:00
• 63a60b11cc Split onground/onroof into visual and logical variables Misa 2021-03-18 13:18:33 -07:00
• d5d9d9ba96 Re-remove 1-frame input delay Misa 2021-03-15 02:46:29 -07:00
• f1f434accc Move key.Poll() calls to just before input funcs Misa 2021-03-15 02:56:46 -07:00
• ab26985fde Re-fix crewmate directions (without copy-pasting) Misa 2021-01-18 12:44:22 -08:00
• cb5d181ce8 Remove entityclass::createentity() deltaframe kludge Misa 2021-01-16 22:29:44 -08:00
• 2d9d0cffa5 Fix 1-frame glitch when going to in-game options from edsettings Misa 2021-03-18 21:14:40 -07:00
• 951679b1f8 Fix 1-frame background glitch when returning from in-game options Misa 2021-03-18 21:12:55 -07:00
• 5088ff40e9 Fix 1-frame text glitch when returning to editor settings from options Misa 2021-03-18 21:11:52 -07:00
• 8a3e292041 Fix 1-frame text glitch returning to pause menu from in-game options Misa 2021-01-12 20:11:50 -08:00
• 3da0e31215 Remove game.shouldreturntoeditor in favor of using defer callback Misa 2021-01-10 14:48:25 -08:00
• 32be2fcd81 Update player lerpoldxp/yp in moveplayer() Misa 2021-01-09 23:34:26 -08:00
• c8537beac1 Add deferred callbacks to game loop Misa 2020-12-23 23:24:31 -08:00
• c8958de537 Update player lerpoldxp/yp in gotoposition() Misa 2020-11-23 02:02:41 -08:00
• af70076088 Remove now-unneeded deltaframe fix when going to in-game settings Misa 2020-11-10 00:27:42 -08:00
• c26b701f5b Remove gravity line kludge from Graphics::drawgravityline() Misa 2020-11-07 17:29:06 -08:00
• 5e2fc6f0fe Move updating lerpoldxp/yp to start of gamelogic() Misa 2020-11-07 17:00:42 -08:00
• 585ae47d78 Remove script.dontrunnextframe kludge Misa 2020-11-07 16:49:32 -08:00
• c82c2afbbd Unindent unfocused_run() and focused_begin() from previous commit Misa 2021-01-16 11:40:26 -08:00
• 1e9fb6aac0 Generalize game loop order and fix it to what it was in 2.2 Misa 2020-11-06 16:08:22 -08:00
• 5e440ac48d Remove special text box checks for y-position 180 Misa 2021-03-20 23:17:12 -07:00
• 596696dcf3 Make foundtrinket() Flip Mode-aware Misa 2021-03-19 20:12:42 -07:00
• db9ee0d8e3 Switch flipme script command to use flipme textbox attribute Misa 2021-03-19 20:08:41 -07:00
• 6939563e6d Switch all flippable text boxes to use createtextboxflipme Misa 2021-03-19 20:07:14 -07:00
• c7cc2f4adc Add createtextboxreal() and createtextboxflipme() Misa 2021-03-19 20:03:08 -07:00
• 1a9f2d9342 Add flipme attribute to textboxclass Misa 2021-03-19 19:51:36 -07:00
• 2ac13815e4 Remove textrect attribute from textboxclass Misa 2021-03-19 19:47:37 -07:00
• 334302c800 Remove unused x/y textboxclass attributes Misa 2021-03-19 19:45:28 -07:00
• 30719b87db De-duplicate "Game Saved" telesave textbox Misa 2021-03-19 19:40:16 -07:00
• 5de884f584 De-duplicate Level Complete sequence textboxes Misa 2021-03-19 19:37:54 -07:00
• b7ca408076 Remove default arguments from createtextbox() Misa 2021-03-19 16:41:41 -07:00
• d5ed49d8dc Remove commented-out code from Game.cpp and Script.cpp Misa 2021-03-19 16:24:16 -07:00
• 5f2b9409b2 De-duplicate Gravitron initial message Misa 2021-03-19 13:57:05 -07:00
• c7e807541c De-duplicate Flip Mode textbox crewmate rendering Misa 2021-03-19 13:34:13 -07:00
• 52a7d42672 De-duplicate Flip Mode text printing Misa 2021-03-19 13:31:53 -07:00
• f6ecf83190 Ensure oldfadeamount is updated when fadeamount is Misa 2021-03-19 23:09:11 -07:00
• f22756dd99 Ensure oldcutscenebars is updated when cutscenebarspos is Misa 2021-03-19 23:08:35 -07:00
• 9e2716b253 Fix a few missing implicit void arg declarations Misa 2021-03-18 21:20:05 -07:00
• 2c8d338e47 Add graphic options and game options to editor settings Misa 2021-03-18 19:52:30 -07:00
• fc8c7d034d Add being able to press Esc to return to previous menu Misa 2021-02-22 00:28:43 -08:00
• 61e5b819e4 Fix VVVVVV-Man not being interpolated Misa 2021-03-18 14:10:55 -07:00
• e70586b154 Inline cutscene bars timer for gamemodes that used it in 2.2 Misa 2021-03-17 00:28:47 -07:00
• 4e12c162d4 Add SDL2 version number to desktop_version/ README Misa 2021-03-17 00:24:18 -07:00
• 2608db9151 Directly toggle fullscreen if keybind pressed in key.Poll() Misa 2021-03-16 23:26:34 -07:00
• babd86916c Move resumesong assignment to songend() Misa 2021-03-09 21:49:07 -08:00
• d4f52fd6fe Reset room name hide timer if in an unnamed room Misa 2021-03-09 21:05:36 -08:00
• f20a703bf3 Reset drawer timer if not in Direct Mode room Misa 2021-03-09 21:04:04 -08:00
• 988a7720b9 Interpolate Direct Mode drawer closing Misa 2021-03-09 15:42:55 -08:00
• b202e02578 Move room name hiding update to editorrenderfixed Misa 2021-03-09 15:42:06 -08:00
• 136c940586 Move Direct Mode drawer close to editorrenderfixed Misa 2021-03-09 15:41:19 -08:00
• 4c01d64c33 Move gravity line correction to editorrenderfixed Misa 2021-03-09 15:36:05 -08:00
• 22d71affba De-duplicate number of menu text bytes Misa 2021-03-06 18:14:44 -08:00
• 40c6a01917 Make saveFilePath not an std::string Misa 2021-03-06 15:30:22 -08:00
• 36e91a9bb1 Fix MMMMMM and Flip Mode options ignoring save failure Misa 2021-03-06 13:59:13 -08:00
• be379733b6 De-duplicate toggling flip mode in Input.cpp Misa 2021-03-06 14:46:41 -08:00
• 8169a26f46 Fix glitchy behavior switching soundtracks on silence Misa 2021-03-06 13:46:50 -08:00
• 0f36cdce0d Use SDL_floor() instead of libc floor() Misa 2021-03-05 20:46:19 -08:00
• acfe4c294d Fix transitive includes in GraphicsUtil.cpp Misa 2021-03-05 20:40:13 -08:00
• c1572de9e2 Make one-way recolors check for specific files Misa 2021-03-06 10:52:11 -08:00
• 34865a8ef1 Add FILESYSTEM_isAssetMounted() Misa 2021-03-06 10:48:02 -08:00
• ca4afcc140 De-duplicate one-way recolor conditional Misa 2021-03-05 23:55:35 -08:00
• b4dd516d7d Move assetdir off of Graphics Misa 2021-03-05 23:45:40 -08:00
• 22ced8b59b Don't use std::strings when comparing key names Misa 2021-03-06 10:31:17 -08:00
• 1163a8cca4 Merge pull request #647 from InfoTeddy/general-bug-fixes-4 Terry Cavanagh 2021-03-06 16:56:28 +10:30
• 4f27c9366b Merge pull request #646 from InfoTeddy/general-bug-fixes-3 Terry Cavanagh 2021-03-06 16:55:55 +10:30
• bf3b141cfc Merge pull request #645 from InfoTeddy/general-bug-fixes-2 Terry Cavanagh 2021-03-06 16:54:37 +10:30
• 255a6108c8 Fix up/down being reversed in in-game menu in Flip Mode Misa 2021-03-05 19:34:15 -08:00
• d19a6cc437 Copy blend mode to recreated surface Misa 2021-03-05 20:17:56 -08:00
• aca33e5587 De-duplicate surface recreation in GraphicsUtil Misa 2021-03-05 20:12:01 -08:00
• d0e497a95a Reverse menu animation direction in Flip Mode Misa 2021-03-05 19:24:54 -08:00
• 7ce87d7b13 Fix prompt fade out when activating overlapping zones Misa 2021-03-05 10:43:11 -08:00
• 9f69506acf Move activity prompt render updating to gamerenderfixed() Misa 2021-03-05 10:41:35 -08:00
• 84928f8210 Fix regression being able to activate activity zones during cutscenes Misa 2021-03-05 10:18:46 -08:00
• 4896f475ca Fix returning from game pad options not updating tower color Misa 2021-03-05 00:54:25 -08:00
• 98bfd43887 Remove music.niceplay() when returning from credits6 Misa 2021-03-05 00:52:05 -08:00
• 37947814aa Remove unnecessary currentmenuoption reassignments Misa 2021-03-05 00:50:26 -08:00