VVVVVV

mpo/VVVVVV

Fork 0

mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2025-02-04 23:25:22 +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

#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

5b204f620b Fix checkpoint starts in editor tzann 2020-07-29 19:54:22 +02:00
8aac6a758d

Wrap entities (#408) Tynan Richards 2020-07-29 18:17:28 +02:00
b261b1d12e Clean it up yet again tzann 2020-07-29 17:43:31 +02:00
8c000a760f Clean it up some more tzann 2020-07-29 17:36:25 +02:00
bc65832fc4 Make it actually work and clean up the code tzann 2020-07-29 17:28:57 +02:00
178951e5e1 Added myself to contributors list tzann 2020-07-29 12:06:02 +02:00
11ef68bea2 Change back the order of entity creation tzann 2020-07-29 03:05:25 +02:00
b4bac64361 Also change oldyp so there's no deltaframe issues tzann 2020-07-29 02:58:08 +02:00
e48fef4fe5 Fix the 'Game Complete' trophy stand so it no longer hovers above the ground. Also update comments in Otherlevel.cpp to reflect what entities are actually being created. tzann 2020-07-29 02:44:55 +02:00
12914054de Make entities able to wrap both vertically and horizontally, also add a case for when entities are wrapping both directions at the same time Tynan Richards 2020-07-29 13:59:47 +02:00
2e8e7fb8b4 Added myself to contributors list tzann 2020-07-29 12:06:02 +02:00
e2321f84b9 Add check for singular trinkets and crewmates in NDM game over screen tzann 2020-07-29 02:03:48 +02:00
b6cca724dc Change back the order of entity creation tzann 2020-07-29 03:05:25 +02:00
15126efb3a Also change oldyp so there's no deltaframe issues tzann 2020-07-29 02:58:08 +02:00
c06db028a3 Fix the 'Game Complete' trophy stand so it no longer hovers above the ground. Also update comments in Otherlevel.cpp to reflect what entities are actually being created. tzann 2020-07-29 02:44:55 +02:00
178dbfd8f8 Add check for singular trinkets and crewmates in NDM game over screen tzann 2020-07-29 02:03:48 +02:00
6c04f56099 Don't savestats() every frame of New Record animation Misa 2020-07-27 15:50:51 -07:00
41014ff8a4 Don't savestats() every frame of New Record animation Misa 2020-07-27 15:50:51 -07:00
053193333c Merge branch 'master' into refactor-scripts Matt Penny 2020-07-25 15:52:06 -04:00
7ac4251322 Fix spacing and erroneous commas in scripts. Also update with fix for #357 Matt Penny 2020-07-25 15:50:42 -04:00
18b7d1ca14 Set oldxp/oldyp when player teleports through warp token Misa 2020-07-21 14:55:14 -07:00
ff8d616438 Use INBOUNDS() check for mapclass::warpto() Misa 2020-07-21 14:49:36 -07:00
fdb01adc68 Set oldxp/oldyp when being teleported around during teleport Misa 2020-07-21 15:01:08 -07:00
8b45d7504d Set oldxp/oldyp when being teleported around during teleport Misa 2020-07-21 15:01:08 -07:00
9274821e71 Set oldxp/oldyp when player teleports through warp token Misa 2020-07-21 14:55:14 -07:00
602faaa568 Use INBOUNDS() check for mapclass::warpto() Misa 2020-07-21 14:49:36 -07:00
52f7a587fe Separate includes into sections and alphabetize them Misa 2020-07-19 12:43:29 -07:00
b108e28c5a Remove unnecessary EditorData constructor stub Misa 2020-07-19 12:17:36 -07:00
58308f9826 Remove unused time stuff from editor.cpp Misa 2020-07-19 12:14:12 -07:00
b5ff65c84e Remove unnecessary includes from header files Misa 2020-07-19 12:05:41 -07:00
d455e38715 Use angle brackets for including tinyxml2.h Misa 2020-07-19 12:03:16 -07:00
2af396fb30 Consistently use angle brackets for SDL.h includes Misa 2020-07-18 21:21:27 -07:00
808e2433d2 Separate includes into sections and alphabetize them Misa 2020-07-19 12:43:29 -07:00
066c5ca1eb Remove unnecessary EditorData constructor stub Misa 2020-07-19 12:17:36 -07:00
7a4fabe815 Remove unused time stuff from editor.cpp Misa 2020-07-19 12:14:12 -07:00
8b7ebba9e7 Remove unnecessary includes from header files Misa 2020-07-19 12:05:41 -07:00
18b70e6730 Use angle brackets for including tinyxml2.h Misa 2020-07-19 12:03:16 -07:00
add93ba227 Consistently use angle brackets for SDL.h includes Misa 2020-07-18 21:21:27 -07:00
6c85fae339 Change all tilemaps to be short[1200] instead of int[1200] Misa 2020-07-18 21:06:35 -07:00
895f825fa4 Change all tilemaps to be short[1200] instead of int[1200] Misa 2020-07-18 21:06:35 -07:00
df96b2a594 Fix softlock using tele while in its hitbox post-rescue/intermission Misa 2020-07-17 13:29:22 -07:00
af89c52813 Wrap around enemy type when switching enemy types Misa 2020-07-17 13:25:23 -07:00
1fef14b68e Fix softlock using tele while in its hitbox post-rescue/intermission Misa 2020-07-17 13:29:22 -07:00
75e3a19dee Wrap around enemy type when switching enemy types Misa 2020-07-17 13:25:23 -07:00
fb8cb705da Fix softlock if exiting Super Grav and bringing up map in glitchrunner Misa 2020-07-16 15:11:54 -07:00
5a660419e2 Fix softlock if exiting Super Grav and bringing up map in glitchrunner Misa 2020-07-16 15:11:54 -07:00
ecf43d05dc Fix undeffing ARG_IS instead of ARG Misa 2020-07-15 18:27:54 -07:00
48a427ca1e Fix undeffing ARG_IS instead of ARG Misa 2020-07-15 18:27:54 -07:00
78faea87ba Fix brace style and spacing in custom loadlevel() Misa 2020-07-09 03:29:53 -07:00
ccb3d6e974 Use case-switch for warpdir checking Misa 2020-07-09 03:21:18 -07:00
2938db057b Unindent case labels in room tileset case-switch Misa 2020-07-09 03:18:21 -07:00
01f6a97ed0 Fix and update comments for edentities Misa 2020-07-09 03:16:52 -07:00
f8e23119bf Use case-switch for warp line creation Misa 2020-07-09 03:14:17 -07:00
c7ea684c08 Use enum names instead of raw values in createblock() calls Misa 2020-07-09 03:10:08 -07:00
a2f20e7e49 De-duplicate enemy/platform bounding box logic Misa 2020-07-09 03:06:20 -07:00
0ec38ad0f8 Get rid of unnecessary roomname logic Misa 2020-07-09 03:00:48 -07:00
2558cccd40 Fix 'break' statements in other cases not being inside braces Misa 2020-07-09 02:59:42 -07:00
2646642664 Add braces to case 12 custom level loading Misa 2020-07-09 02:58:16 -07:00
71a989707e De-duplicate and add safety check to ed.level reference Misa 2020-07-09 02:54:23 -07:00
729f24d732 De-duplicate reference to edentity Misa 2020-07-09 02:40:18 -07:00
4b6406d08e Unindent case labels in entity creation Misa 2020-07-09 02:32:52 -07:00
fd2ee96c49 Clean up tsx/tsy initialization Misa 2020-07-09 02:32:00 -07:00
d591c77088 De-duplicate expressions of actual coordinates for edentities Misa 2020-07-09 02:28:53 -07:00
34b0e2c812 Unindent ending for-loop brace Misa 2020-07-09 02:12:31 -07:00
8b8f9b3389 Negate edentity room check and use a continue Misa 2020-07-09 02:11:56 -07:00
264279d17a Warning fix for uninitialized prefix Ethan Lee 2020-07-15 12:11:23 -04:00
b302e4dbbb Valgrind warning fix Ethan Lee 2020-07-15 12:09:24 -04:00
5ff5ae7294 mmmmmm is initialized earlier in init() Ethan Lee 2020-07-15 11:58:00 -04:00
f8190439a9 Reset ed.roomnamehide to 0 when exiting playtesting Misa 2020-07-11 00:39:09 -07:00
def540d184 Reset ed.notedelay when exiting playtesting Misa 2020-07-11 00:27:00 -07:00
22d556f4be Disable "Game Saved" text box in custommode Misa 2020-07-11 00:23:31 -07:00
13e260bf50 Fix pressing Esc in teleporter menu going to quit screen Misa 2020-07-11 00:21:23 -07:00
5f131b426b Allow pressing Enter on teleporters during playtesting Misa 2020-07-11 00:15:06 -07:00
846c6f61d4 Use .clear() when removing text boxes in reset functions Misa 2020-07-11 00:10:06 -07:00
7fada0548b Set ed.settingskey to true when returning to editor Misa 2020-07-11 00:09:02 -07:00
6c52b79ddf Set ed.keydelay to 6 when returning to editor Misa 2020-07-11 00:04:54 -07:00
1caabe374b Fix return to editor via crewmate rescue not using shouldreturntoeditor Misa 2020-07-11 00:00:42 -07:00
2506127a17 Directly execute scripts if script boxes have a non-empty script field Misa 2020-07-09 23:20:03 -07:00
ca9e4c8f6e Only set game.customscript if index is inbounds Misa 2020-07-09 23:03:16 -07:00
8c42f82317 Set script attribute of custom level script boxes Misa 2020-07-09 23:01:13 -07:00
459e1ac78a Directly execute scripts if script boxes have a non-empty script field Misa 2020-07-09 23:20:03 -07:00
e8de47df9e Only set game.customscript if index is inbounds Misa 2020-07-09 23:03:16 -07:00
9f2beec1ff Set script attribute of custom level script boxes Misa 2020-07-09 23:01:13 -07:00
9fab9f8926 Fix brace style and spacing in custom loadlevel() Misa 2020-07-09 03:29:53 -07:00
512750f7b1 De-duplicate setting rcol if room is warping Misa 2020-07-09 03:24:32 -07:00
ae05250548 Use case-switch for warpdir checking Misa 2020-07-09 03:21:18 -07:00
67a84e5a1e Unindent case labels in room tileset case-switch Misa 2020-07-09 03:18:21 -07:00
ea7693162b Fix and update comments for edentities Misa 2020-07-09 03:16:52 -07:00
31fb2a41f3 Use case-switch for warp line creation Misa 2020-07-09 03:14:17 -07:00
4cb2ae0343 Use enum names instead of raw values in createblock() calls Misa 2020-07-09 03:10:08 -07:00
b1c0eedfa4 De-duplicate enemy/platform bounding box logic Misa 2020-07-09 03:06:20 -07:00
30963fca75 Get rid of unnecessary roomname logic Misa 2020-07-09 03:00:48 -07:00
e214458219 Fix 'break' statements in other cases not being inside braces Misa 2020-07-09 02:59:42 -07:00
ede6309333 Add braces to case 12 custom level loading Misa 2020-07-09 02:58:16 -07:00
6895d1c92d De-duplicate and add safety check to ed.level reference Misa 2020-07-09 02:54:23 -07:00
a8df3028f3 De-duplicate reference to edentity Misa 2020-07-09 02:40:18 -07:00
66ff93862c Unindent case labels in entity creation Misa 2020-07-09 02:32:52 -07:00
134d3f6363 Clean up tsx/tsy initialization Misa 2020-07-09 02:32:00 -07:00
fddaef1959 De-duplicate expressions of actual coordinates for edentities Misa 2020-07-09 02:28:53 -07:00
54dad23d94 Unindent ending for-loop brace Misa 2020-07-09 02:12:31 -07:00