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

#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

#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

#1258

#1259

#1259

#126

#1260

#1260

#1261

#1262

#1264

#1265

#1266

#1267

#1267

#1268

#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

#895

#896

#897

#897

#898

#899

#90

#902

#905

#906

#906

#907

#908

#909

#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

#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

Mono Color

• 58b9941d73 Add vector of MenuStackFrame menustack to Game Misa 2020-04-16 18:52:40 -07:00
• 13d2d6b623 Add struct MenuStackFrame Misa 2020-04-16 16:22:40 -07:00
• 503b3f1692 Move temp int off of Game Misa 2020-04-16 16:08:56 -07:00
• 56a168eed6 Remove ABCDEFG comment Misa 2020-04-16 16:03:25 -07:00
• 7b233a0e69 Rename Menu::setslowdown2 to Menu::setslowdown Misa 2020-04-16 16:02:01 -07:00
• 1c2cee48a7 Remove unused menu setslowdown1 Misa 2020-04-16 15:41:31 -07:00
• 9e99246e02 Turn game.currentmenuname "else-if"s into case-switches Misa 2020-04-16 15:19:17 -07:00
• ceb8d3f3d8 Remove unused variable Game::menuselection Misa 2020-04-15 23:33:25 -07:00
• e8a07f9c3d Convert menu names to be an enum instead of being stringly-typed Misa 2020-04-15 21:53:36 -07:00
• 83ca75a831 Change "else if"-chain in editormenuactionpress to case-switch Misa 2020-04-15 21:01:00 -07:00
• 78169cdc1c Move editor menu option rendering to separate function Misa 2020-04-15 20:55:34 -07:00
• 0b5d7b1fef Move editor menu ACTION press handling to separate function Misa 2020-04-15 20:52:21 -07:00
• d6d9b505a2 Capitalize "No Death Mode" in "not available" message Misa 2020-04-15 20:45:43 -07:00
• 256ead4799 Bump version number in bottom-right to 2.3 Misa 2020-04-15 20:41:26 -07:00
• cbd7ef94ba Gray out play modes if disabled due to enabled accessibility options Misa 2020-04-15 20:33:04 -07:00
• 38d749f536 Prevent selecting Secret Lab if game isn't at full speed Misa 2020-04-15 20:17:36 -07:00
• d9d0748ce3 Use case-switch for menu options where possible Misa 2020-04-15 20:10:11 -07:00
• 46d0b3a4e9 Fix indentation of "graphicoptions" in Render.cpp Misa 2020-04-15 19:52:49 -07:00
• 678ade88b9 De-duplicate "secret lab" menu option in "play" menu Misa 2020-04-15 19:38:42 -07:00
• 4f6835c485 De-duplicate copy-pasted input/render code in menus Misa 2020-04-15 17:59:03 -07:00
• bf62233b60 Fix compile failure if both MAKEANDPLAY and NO_CUSTOM_LEVELS are defined Misa 2020-04-15 17:52:25 -07:00
• 4ace8d15be Fix NO_CUSTOM_LEVELS builds breaking after command-line playtesting Misa 2020-04-15 16:51:58 -07:00
• b835ce3927 Move menu rendering to separate function Misa 2020-04-15 16:29:54 -07:00
• 1e3879b8fe De-duplicate "You have unlocked" menu input and options Misa 2020-04-15 12:16:53 -07:00
• 119d2ad25f Condense indentation levels of else-if chain in "play" menu Misa 2020-04-15 12:11:33 -07:00
• be64d4f704 Move menu ACTION press handling to separate function Misa 2020-04-15 10:14:42 -07:00
• fe178f817b Remove outdated commented-out graphics options code Misa 2020-04-14 23:29:58 -07:00
• 511de0c5c1 Refactor menu creation code Misa 2020-04-14 21:50:17 -07:00
• a0d2be6362 Add Game::option() Misa 2020-04-14 21:12:24 -07:00
• c5db440318 Add struct MenuOption Misa 2020-04-14 21:11:10 -07:00
• 5fdbaa0076 Remove unused function entityclass::cblocks() Misa 2020-04-14 19:42:07 -07:00
• 76e3b3ede4 Remove map.numshinytrinkets Misa 2020-04-14 19:39:08 -07:00
• 4f7290440b Remove now-unused parameter 't' from mapclass::settrinket() Misa 2020-04-14 19:37:00 -07:00
• d43daa5fae Dynamically add shinytrinkets instead of using indices Misa 2020-04-14 19:34:10 -07:00
• d63ba761d5 Remove map.numteleporters Misa 2020-04-14 19:32:30 -07:00
• 5b9c6a9680 Remove now-unused parameter 't' from mapclass::setteleporter() Misa 2020-04-14 19:29:19 -07:00
• fd7d6076e0 Dynamically add teleporters instead of using indices Misa 2020-04-14 19:25:12 -07:00
• d4034661e2 Don't use std::count() in Game::crewmates() Misa 2020-04-09 16:17:52 -07:00
• 3774ec390c Don't use std::count() in Game::trinkets() Misa 2020-04-09 16:17:11 -07:00
• 45e7a9db3e Use for-loop in Game::crewrescued() Misa 2020-04-09 16:01:53 -07:00
• a37715abb6 Put trinkets() and crewmates() declaration on their own lines Misa 2020-04-09 15:58:24 -07:00
• 17a64aee7a Make obj.customcollect a vector of bools Misa 2020-04-08 23:58:03 -07:00
• 8507bdc65d Change obj.collect into a vector of bools Misa 2020-04-08 23:56:36 -07:00
• 7493129044 Remove unused function entityclass::confirmflags() Misa 2020-04-08 23:51:00 -07:00
• ee5f8dce78 Remove unused function entityclass::resetflags() Misa 2020-04-08 23:49:57 -07:00
• 0648d6bb0f Remove unused function entityclass::changecustomcollect() Misa 2020-04-08 23:49:21 -07:00
• a6340f356e Remove unused function entityclass::changecollect() Misa 2020-04-08 23:48:51 -07:00
• c24e2abfad Remove now-unused function entityclass::changeflag() Misa 2020-04-08 23:48:08 -07:00
• 2ba9a0e67b Don't use obj.changeflag() to set flags Misa 2020-04-08 23:46:41 -07:00
• abfae6b4d7 Declare obj.flags a vector of bools instead of ints Misa 2020-04-08 23:34:26 -07:00
• 2f1c400c9a Remove temporary UtilityClass from Game::savestats() Misa 2020-04-08 22:32:27 -07:00
• 699af342e8 Refactor Game::crewrescued() to use std::count() instead Misa 2020-04-08 22:31:15 -07:00
• 588a49dbc8 Remove useless variable game.timerStartTime Misa 2020-04-08 22:29:18 -07:00
• 6428a14244 Declare game.teleport as a bool instead of an int Misa 2020-04-08 22:27:13 -07:00
• c5803863bf Remove unused variables temp_unlock and temp_unlocknotify Misa 2020-04-08 22:24:33 -07:00
• 1110d46c8b Remove unused stat_* variables Misa 2020-04-08 22:22:49 -07:00
• 317eece28d Remove useless variable game.coins Misa 2020-04-08 22:20:26 -07:00
• 756c409d1d Remove unused variable game.trinkencollect Misa 2020-04-08 22:18:27 -07:00
• fb9791a4c7 Remove now-useless function editorclass::countstuff() Misa 2020-04-08 22:15:18 -07:00
• 89b6b67a77 Don't use separate variable for number of crewmates in level Misa 2020-04-08 22:13:43 -07:00
• 0047dc8d81 Don't use separate variable for number of trinkets in level Misa 2020-04-08 22:09:11 -07:00
• 5661f46a52 Remove unnecessary int casts relating to custom crewmate numbers Misa 2020-04-08 22:03:41 -07:00
• 6b317c5ab9 Remove map.customcrewmates Misa 2020-04-08 22:01:32 -07:00
• 85bd7d9a2d Remove map.customtrinkets Misa 2020-04-08 21:56:47 -07:00
• c077e51fb4 Don't use separate variable for number of collected crewmates Misa 2020-04-06 23:53:32 -07:00
• 9510c3c871 Don't use separate variable for number of collected trinkets Misa 2020-04-06 23:46:27 -07:00
• 94b2ebd55c Implement command-line playtesting (#163) leo60228 2020-04-09 12:03:24 -07:00
• 4511ea172e Don't boot user back to main menu after toggling using MMMMMM Misa 2020-04-06 12:34:49 -07:00
• 5a9cd861ef Don't update game.stat_trinkets in custom levels Misa 2020-04-05 14:55:45 -07:00
• 7f0db19abd Fix memory leak from warping moving platforms Misa 2020-04-04 12:54:55 -07:00
• 79a54f23e6 De-dupe screen transition / warping logic Misa 2020-04-04 12:39:17 -07:00
• 7899cb8088 Condense some nested else-if statements Misa 2020-04-04 12:19:18 -07:00
• e6c6c7cf60 Condense some nested if-statements in gamelogic() Misa 2020-04-04 12:16:16 -07:00
• 3818340011 Clean up some indentation in gamelogic() Misa 2020-04-04 12:13:24 -07:00
• 37a3670dde Rename titlerender.cpp to Render.cpp Misa 2020-04-03 22:53:31 -07:00
• 97e340b5a7 Fix typo "Your have unlocked" to "You have unlocked" Misa 2020-04-03 21:15:30 -07:00
• 168fa53f7c Refactor scriptclass txt to not use a separate length-tracker Misa 2020-04-03 18:04:55 -07:00
• 31321ee19c Remove textboxclass's firstcreate and clear, simplify initializations Misa 2020-04-03 17:44:25 -07:00
• 09c9a6b862 Refactor text box contents to not use a separate length-tracker Misa 2020-04-03 17:41:01 -07:00
• 2ec1080b3d Remove remnant of 'active' if-conditional Misa 2020-04-03 17:26:29 -07:00
• bc0d22eec6 Refactor text boxes to not use the 'active' system Misa 2020-04-03 17:25:17 -07:00
• 0127a84698 Move text box fadeout removal to Graphics::drawgui() Misa 2020-04-03 17:10:10 -07:00
• 313c2661af Fix nested if-statements relating to blocks in Entity.cpp Misa 2020-04-03 17:06:07 -07:00
• 9de5b57989 Remove blockclass::clear(), simplify blockclass initializations Misa 2020-04-03 16:49:46 -07:00
• b027a3ddc6 Fix mixed indentation in Enter-handling code when playtesting Misa 2020-04-03 16:34:20 -07:00
• 2a80c80f6c Fix undefined behavior when removing activity zones Misa 2020-04-03 16:28:50 -07:00
• f10ac88c1a Refactor blocks to not use the 'active' system Misa 2020-04-03 16:11:02 -07:00
• 7689241d3a Add macro removeblock_iter() Misa 2020-04-03 15:55:04 -07:00
• 7edbebac92 Move entityclass::setblockcolour() to blockclass::setblockcolour() Misa 2020-04-03 15:26:19 -07:00
• 2cb90afbda Remove entclass::clear(), simplify entclass initializations Misa 2020-04-03 14:57:07 -07:00
• ecf556dc55 Remove 'if (entities[i].state == 0) { }' Misa 2020-04-03 14:52:29 -07:00
• 1b78db9079 Remove two '//Active' comments Misa 2020-04-03 14:50:08 -07:00
• 2f3eeccdf0 Fix nested if-statement chains relating to entities in Entity.cpp Misa 2020-04-03 14:48:27 -07:00
• e40a4c3948 Remove some more outdated comments from Entity.cpp Misa 2020-04-03 14:42:25 -07:00
• 0fb37352ce Make entityclass::updateentities() no longer a bool Misa 2020-04-03 14:36:04 -07:00
• 46c17052c6 Remove unused function entityclass::gettype() Misa 2020-04-03 14:34:15 -07:00
• 744c685614 Remove entityclass::cleanup() Misa 2020-04-03 14:31:32 -07:00
• fd417d6a8c Remove remnants of entity 'active' conditionals Misa 2020-04-03 13:57:02 -07:00
• b1b1474b7b Refactor entities and linecrosskludge to not use the 'active' system Misa 2020-04-03 13:50:16 -07:00
• a67ab8e3a7 Add macro removeentity_iter() Misa 2020-04-03 13:07:04 -07:00