VVVVVV

mpo/VVVVVV

Fork 0

mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-03-13 09:15:13 +01:00

Commit graph

Select branches

Hide pull requests

2.3-updates

2.4-updates

master

#10

#100

#1000

#1002

#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

#1137

#1138

#1139

#114

#1140

#1141

#1142

#1143

#1144

#1146

#1147

#1148

#1149

#115

#1150

#1151

#1156

#1157

#116

#1160

#1161

#1162

#1164

#1166

#1168

#1169

#117

#1170

#1171

#1172

#1173

#1174

#1175

#1177

#1178

#1179

#118

#1180

#1181

#1182

#1183

#1184

#1186

#1187

#1188

#119

#1191

#1192

#1195

#1196

#1199

#12

#120

#1201

#1202

#1203

#1204

#1207

#1208

#121

#1210

#1211

#1213

#1217

#1218

#1219

#122

#1220

#1221

#1222

#123

#124

#125

#126

#127

#128

#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

#896

#897

#898

#899

#90

#902

#905

#906

#907

#908

#909

#910

#911

#912

#914

#915

#916

#917

#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

#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

#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

f3defb1640 Add names for previously disallowed songs Misa 2020-06-30 18:41:20 -07:00
410482b08a Allow using any editor song Misa 2020-06-30 18:40:44 -07:00
f007b9457c De-duplicate editor music name printing Misa 2020-06-30 18:40:18 -07:00
97bf731fa3 If invalid valid value, set valid to false Misa 2020-06-30 17:58:34 -07:00
170e93054a Remove extraneous semicolon from MusicTrack::MusicTrack() Misa 2020-06-30 17:57:22 -07:00
5fe3b9d0de Add bounds check to musicclass::play() Misa 2020-06-30 17:17:29 -07:00
7c2b418761 Account for extra tracks in musicclass::play() Misa 2020-06-30 17:08:37 -07:00
08fe655a5f Parse extra headers from binary blob Misa 2020-06-30 15:35:50 -07:00
4c2f5ed032 Add binaryBlob::getExtra() Misa 2020-06-30 15:27:57 -07:00
09dbe8113b De-duplicate track names Misa 2020-06-30 15:17:02 -07:00
7e0e26b3c7 If invalid valid value, set valid to false Misa 2020-06-30 17:58:34 -07:00
919181e371 Remove extraneous semicolon from MusicTrack::MusicTrack() Misa 2020-06-30 17:57:22 -07:00
71c998800e Add bounds check to musicclass::play() Misa 2020-06-30 17:17:29 -07:00
2f85f843db Account for extra tracks in musicclass::play() Misa 2020-06-30 17:08:37 -07:00
43faf3911c Parse extra headers from binary blob Misa 2020-06-30 15:35:50 -07:00
7ea30e3a88 Add binaryBlob::getExtra() Misa 2020-06-30 15:27:57 -07:00
141d46195b De-duplicate track names Misa 2020-06-30 15:17:02 -07:00
ad540d57f4 Allow D-Pad to act as arrow keys in the editor Misa 2020-06-30 17:39:32 -07:00
8698cdfa7d Allow D-Pad to act as arrow keys in the editor Misa 2020-06-30 17:39:32 -07:00
07028d47d5 Add one-time OoB logs to tile-drawing functions Misa 2020-06-30 15:01:30 -07:00
5201f67909 Add being able to override the one-way recolor Misa 2020-06-30 14:08:14 -07:00
2d21bab4ea Only re-color one-ways if assets are not mounted Misa 2020-06-30 11:55:21 -07:00
d610e2dae3 Add bounds checks to drawforetile/drawforetile2/drawforetile3 Misa 2020-06-30 11:51:01 -07:00
e84194db55 Re-color one-way tiles to match their tileset Misa 2020-06-30 11:47:22 -07:00
fe61dc966c Add one-time OoB logs to tile-drawing functions Misa 2020-06-30 15:01:30 -07:00
b5783007b3 Adhere to "locked" gravity/warp lines Misa 2020-06-30 14:42:34 -07:00
99d9d9f5ea Adhere to "locked" gravity/warp lines Misa 2020-06-30 14:42:34 -07:00
55d1430b05 Add being able to override the one-way recolor Misa 2020-06-30 14:08:14 -07:00
763c055ea9 Only re-color one-ways if assets are not mounted Misa 2020-06-30 11:55:21 -07:00
87df6572ec Add bounds checks to drawforetile/drawforetile2/drawforetile3 Misa 2020-06-30 11:51:01 -07:00
7363724413 Re-color one-way tiles to match their tileset Misa 2020-06-30 11:47:22 -07:00
7adf71a21b Change "toggle letterbox" to "scaling mode" Dav999-v 2020-06-30 22:36:57 +02:00
e20c01deed Move "resize to nearest" grouped with other resolution-related options Dav999-v 2020-06-30 22:30:59 +02:00
a2d8e57af0 Move some options to a new menu, "advanced options" Dav999-v 2020-06-30 22:06:19 +02:00
de2d6a1e86 Expose all 9 arguments of createentity() Misa 2020-06-30 13:35:02 -07:00
76f4b12645 Expose all 9 arguments of createentity() Misa 2020-06-30 13:35:02 -07:00
d376301313 Change "toggle letterbox" to "scaling mode" Dav999-v 2020-06-30 22:36:57 +02:00
4a19c01373 Move "resize to nearest" grouped with other resolution-related options Dav999-v 2020-06-30 22:30:59 +02:00
db06b336b6 Don't set showtrinkets when loading custom quicksave Misa 2020-06-30 13:22:39 -07:00
15e10af08e Display trinkets on the minimap in custommode Misa 2020-06-30 13:19:56 -07:00
9e9b1b3c6d Scan for trinkets and put them into shinytrinkets in customs Misa 2020-06-30 12:30:19 -07:00
ed5abbed38 Don't set showtrinkets when loading custom quicksave Misa 2020-06-30 13:22:39 -07:00
d929e48182 Display trinkets on the minimap in custommode Misa 2020-06-30 13:19:56 -07:00
d409485625 Move some options to a new menu, "advanced options" Dav999-v 2020-06-30 22:06:19 +02:00
dfb9d97a15 Scan for trinkets and put them into shinytrinkets in customs Misa 2020-06-30 12:30:19 -07:00
3f7ed4b94a Don't selectively undraw tiles in towers if backgrounds are off Misa 2020-06-30 11:10:00 -07:00
4aaeb02944 Don't selectively undraw tiles in towers if backgrounds are off Misa 2020-06-30 11:10:00 -07:00
2c18d28880 Add Flip Mode to game options if in M&P or in-game menu and unlocked Misa 2020-06-29 20:45:57 -07:00
7ce4f1173d Add "resize to nearest" graphics option Misa 2020-06-29 22:02:21 -07:00
da882b2171 Add "resize to nearest" graphics option Misa 2020-06-29 22:02:21 -07:00
e331abcd7e Fix Alt+Enter Glitch if not in glitchrunner mode Misa 2020-06-29 21:06:19 -07:00
6b5b8e5ff3 Fix Alt+Enter Glitch if not in glitchrunner mode Misa 2020-06-29 21:06:19 -07:00
12d98c1b5d Add Flip Mode to game options if in M&P or in-game menu and unlocked Misa 2020-06-29 20:45:57 -07:00
35c540449e Add being able to disable unfocus pause Misa 2020-06-29 19:49:14 -07:00
3f077ee56a Don't gray out invincibility/slowdown in intermission Misa 2020-06-29 19:25:46 -07:00
e1cb1d8abb Add being able to disable unfocus pause Misa 2020-06-29 19:49:14 -07:00
5360694ef7 Don't gray out invincibility/slowdown in intermission Misa 2020-06-29 19:25:46 -07:00
e85d5a8714

Merge pull request #326 from InfoTeddy/general-refactors Ethan Lee 2020-06-29 22:31:03 -04:00
b9bf2cc1c5 Unindent loadcustomlevelstats from previous commit Misa 2020-06-29 18:47:45 -07:00
be9c405ddd Use returns and don't have rest of loadcustomlevelstats in an 'else' Misa 2020-06-29 18:44:54 -07:00
9a008dc77c Refactor how custom level stats are stored, read, and written Misa 2020-06-29 18:39:22 -07:00
38a42b484d

Merge pull request #322 from Dav999-v/auto-center-menu Ethan Lee 2020-06-29 19:10:39 -04:00
f64e9237c4 Display centiseconds on time trial result and Game Complete Misa 2020-06-29 15:53:19 -07:00
ad27a5c154 Reset width of player in mapclass::resetplayer() Misa 2020-06-29 15:34:13 -07:00
66d19d4cf4 Disable two-frame delay fix in glitchrunner mode Misa 2020-06-29 15:32:07 -07:00
d4592cd6b3 Add special case to color gray Warp Zone entities gray Misa 2020-06-29 15:27:23 -07:00
584f73f0a4 Add BlitSurfaceTinted() Misa 2020-06-29 15:05:57 -07:00
0e87c90df2 Display centiseconds on time trial result and Game Complete Misa 2020-06-29 15:53:19 -07:00
c45f62abd9 Reset width of player in mapclass::resetplayer() Misa 2020-06-29 15:34:13 -07:00
88db188835 Disable two-frame delay fix in glitchrunner mode Misa 2020-06-29 15:32:07 -07:00
851cb05151 Add special case to color gray Warp Zone entities gray Misa 2020-06-29 15:27:23 -07:00
849776feca Add BlitSurfaceTinted() Misa 2020-06-29 15:05:57 -07:00
cc538a0965 Merge remote-tracking branch 'upstream/master' into auto-center-menu Dav999-v 2020-06-29 23:40:10 +02:00
803d0f45de Document menu width limit better Dav999-v 2020-06-29 23:18:33 +02:00
ebd381c228 Fix the two-frame-delay when entering a room with an "init" script Misa 2020-06-27 17:08:57 -07:00
baf879d9fd Remove unused tmap vars from mapclass Misa 2020-06-27 15:56:18 -07:00
59a2040605 Fix the two-frame-delay when entering a room with an "init" script Misa 2020-06-27 17:08:57 -07:00
fdaa4ef401 Remove unused tmap vars from mapclass Misa 2020-06-27 15:56:18 -07:00
e1a114d1a5 Un-fix hitbox persistence in map.resetplayer() Misa 2020-06-25 14:56:09 -07:00
387ee4dc79 Un-hardreset certain variables for glitchrunner mode Misa 2020-06-25 14:49:54 -07:00
cb8540d7bd Restore janky gamestate-based quit-to-title system in glitchrunnermode Misa 2020-06-25 14:41:44 -07:00
9bab6bd0cb Don't hardreset() game.advancetext in glitchrunner mode Misa 2020-06-25 14:39:51 -07:00
5848330e66 Re-enable unbounded gamestate increment in glitchrunner mode Misa 2020-06-25 14:34:22 -07:00
779083b417 Add glitchrunner mode, in game options Misa 2020-06-25 14:31:37 -07:00
46d5fc6576 Correct minimum horizontal spacing check Dav999-v 2020-06-29 02:58:38 +02:00
0023c821db Make menus automatically centered and narrowed Dav999-v 2020-06-29 02:09:52 +02:00
18b34d0066 Add logs if a Graphics func was stopped from indexing OoB Misa 2020-06-28 12:43:12 -07:00
c95c1ab250 Add bounds check to textbox functions that use m Misa 2020-06-28 10:40:58 -07:00
fdc613bf77 Add logs if a Graphics func was stopped from indexing OoB Misa 2020-06-28 12:43:12 -07:00
c74839e306 Add bounds check to textbox functions that use m Misa 2020-06-28 10:40:58 -07:00
a0f10d80e5 Refactor, de-duplicate, and clean up tilesheet processing Misa 2020-06-27 23:59:47 -07:00
7627a37216 Change a '||' to a '==' Misa 2020-06-28 02:07:22 -07:00
9363cf4c40 Fix Game::anything_unlocked() always evaluating to true Misa 2020-06-28 02:12:56 -07:00
54a6491303 Fix Game::anything_unlocked() always evaluating to true Misa 2020-06-28 02:12:56 -07:00
3fb4a5e435 Change a '||' to a '==' Misa 2020-06-28 02:07:22 -07:00
c440e4b756 Refactor, de-duplicate, and clean up tilesheet processing Misa 2020-06-27 23:59:47 -07:00
8fe72c0f92 Un-fix hitbox persistence in map.resetplayer() Misa 2020-06-25 14:56:09 -07:00
f36922b13e Un-hardreset certain variables for glitchrunner mode Misa 2020-06-25 14:49:54 -07:00
1a8887cf80 Restore janky gamestate-based quit-to-title system in glitchrunnermode Misa 2020-06-25 14:41:44 -07:00
1a2826ac00 Don't hardreset() game.advancetext in glitchrunner mode Misa 2020-06-25 14:39:51 -07:00