Commit graph

Select branches

Hide pull requests

2022-upgrade-test

cherry-pick-release_1_patches-07ccfd7bfa1dd9d32efc34c11e5b200251b7adef

cherry-pick-release_1_patches-0e4d3f504e2a4f2caafb78796dc8fde3674226b3

cherry-pick-release_1_patches-a72a5f73bb419b65554c4080c94836dd409f00c1

mass-cherry-pick

master

release_1

release_1_patches

#1

#10

#100

#101

#102

#103

#104

#105

#106

#108

#109

#11

#111

#113

#114

#115

#116

#117

#118

#12

#120

#121

#122

#123

#124

#125

#126

#128

#129

#13

#131

#132

#133

#134

#135

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#155

#156

#157

#158

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#175

#177

#178

#18

#181

#183

#184

#185

#186

#188

#189

#19

#190

#191

#192

#194

#195

#197

#198

#199

#20

#200

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#244

#245

#246

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#267

#268

#269

#27

#270

#272

#273

#28

#280

#281

#282

#284

#285

#286

#287

#288

#289

#29

#290

#291

#292

#293

#294

#296

#297

#298

#299

#3

#30

#300

#301

#302

#303

#304

#307

#308

#309

#31

#310

#311

#313

#314

#316

#317

#318

#319

#32

#321

#322

#323

#324

#325

#326

#327

#328

#329

#33

#331

#332

#333

#334

#335

#336

#339

#34

#340

#342

#343

#344

#345

#346

#347

#348

#35

#350

#351

#352

#353

#355

#356

#358

#36

#360

#361

#362

#363

#364

#365

#366

#367

#368

#368

#369

#37

#370

#372

#373

#377

#38

#380

#381

#382

#384

#384

#385

#385

#387

#388

#39

#390

#391

#395

#396

#398

#399

#399

#4

#40

#400

#401

#404

#404

#406

#407

#41

#411

#412

#413

#414

#416

#418

#42

#421

#422

#423

#424

#425

#426

#427

#428

#429

#43

#430

#432

#433

#435

#436

#437

#439

#44

#440

#441

#442

#442

#443

#444

#445

#446

#448

#449

#45

#450

#451

#453

#454

#455

#456

#457

#458

#459

#46

#460

#460

#462

#463

#464

#465

#466

#467

#469

#47

#470

#471

#472

#473

#474

#476

#478

#479

#48

#480

#482

#483

#484

#485

#486

#487

#488

#489

#49

#491

#499

#5

#50

#500

#501

#502

#503

#504

#505

#506

#507

#508

#51

#510

#511

#512

#513

#514

#515

#516

#517

#518

#519

#52

#520

#521

#523

#524

#525

#527

#528

#529

#53

#530

#531

#532

#533

#534

#535

#536

#538

#54

#540

#541

#542

#544

#545

#547

#548

#55

#551

#553

#554

#555

#556

#558

#559

#56

#560

#561

#562

#563

#564

#565

#565

#569

#57

#570

#571

#574

#575

#577

#578

#579

#58

#580

#581

#582

#583

#584

#585

#586

#587

#588

#589

#59

#590

#591

#592

#593

#595

#598

#599

#6

#60

#600

#600

#601

#602

#606

#607

#608

#609

#610

#611

#612

#613

#614

#615

#616

#618

#619

#62

#620

#622

#623

#63

#636

#637

#638

#64

#647

#647

#648

#649

#65

#650

#655

#657

#66

#660

#661

#662

#663

#664

#665

#666

#667

#668

#669

#670

#671

#672

#673

#674

#675

#676

#679

#68

#680

#681

#682

#683

#686

#687

#688

#689

#69

#693

#695

#696

#699

#7

#70

#700

#701

#702

#703

#704

#705

#706

#707

#707

#708

#709

#71

#710

#711

#712

#713

#714

#715

#716

#717

#718

#719

#720

#721

#722

#723

#724

#725

#726

#727

#728

#729

#73

#730

#732

#733

#734

#735

#737

#738

#739

#74

#741

#742

#743

#744

#745

#746

#747

#748

#749

#75

#750

#751

#752

#755

#756

#757

#758

#759

#76

#760

#761

#762

#763

#764

#765

#767

#768

#769

#77

#770

#771

#772

#773

#774

#776

#777

#778

#779

#78

#780

#781

#782

#783

#784

#785

#786

#788

#789

#79

#790

#791

#794

#795

#796

#797

#798

#799

#8

#80

#801

#802

#803

#804

#805

#806

#807

#808

#81

#810

#811

#812

#813

#814

#816

#817

#819

#820

#823

#824

#825

#826

#827

#828

#829

#83

#830

#831

#832

#833

#834

#835

#836

#837

#838

#839

#84

#840

#841

#842

#843

#844

#845

#846

#847

#849

#85

#850

#851

#852

#853

#854

#855

#856

#856

#857

#858

#86

#860

#861

#862

#864

#865

#867

#868

#869

#87

#870

#871

#872

#873

#874

#875

#876

#877

#878

#879

#88

#880

#881

#882

#884

#885

#886

#888

#889

#89

#890

#891

#892

#893

#894

#895

#896

#897

#898

#9

#90

#900

#901

#903

#904

#905

#906

#907

#908

#909

#91

#910

#911

#912

#913

#914

#915

#916

#917

#919

#92

#920

#921

#922

#923

#924

#925

#926

#927

#928

#929

#93

#930

#930

#932

#933

#934

#935

#936

#937

#938

#939

#940

#941

#942

#943

#944

#945

#946

#948

#95

#950

#951

#952

#953

#954

#956

#957

#96

#962

#963

#97

#98

#99

v1.0.0

v1.0.1

Mono Color

• 9f83768e95 Added bg colour change Rapandrasmus 2023-01-22 23:38:30 +0100
• 078aa8456a Finished Claps Bhaos 2023-01-22 16:34:30 -0600
• 4014b39010
  Merge branch 'megaminerjenny:master' into master kkuhn317 2023-01-22 17:32:21 -0500
• 299d898a15
  only destroy queued inputs while conductor is stopped (#224) minenice55 2023-01-22 16:50:48 -0500
• 913b9084fc only destroy queued inputs while conductor is stopped minenice55 2023-01-22 16:50:27 -0500
• bab0c61780 blehhh AstrlJelly 2023-01-22 16:40:46 -0500
• 26c535a337 Added BG to lockstep Rapandrasmus 2023-01-22 22:11:52 +0100
• 4282497d48 MrUpbeat fixed, finishing up lockstep Rapandrasmus 2023-01-22 21:51:08 +0100
• cff0842084
  Working Dough Fixes (#223) minenice55 2023-01-22 14:22:39 -0500
• 0f851d6911 clear queued inputs OnDestroy minenice55 2023-01-22 14:21:13 -0500
• efb0504657 clear tambourine queued inputs while playback is stopped minenice55 2023-01-22 14:12:44 -0500
• b4188d7050 make intervals be set at the correct time minenice55 2023-01-22 14:02:03 -0500
• bfd816cf0b Revert "Revert "Discord RPC Toggle"" ThatZeoMan 2023-01-22 11:54:48 -0600
• c2eca02e94 Revert "Discord RPC Toggle" ThatZeoMan 2023-01-22 11:54:06 -0600
• 249ee69ecb Discord RPC Toggle ThatZeoMan 2023-01-22 11:52:30 -0600
• 31be57517a
  Merge branch 'megaminerjenny:master' into master Bhaos 2023-01-22 11:01:16 -0600
• 801ee92a8f Merge branch 'master' of https://github.com/ThatZeoMan/HeavenStudio ThatZeoMan 2023-01-22 10:52:50 -0600
• 8cd7da180c Started work on mr upbeat Rapandrasmus 2023-01-22 17:37:54 +0100
• cd153c1582 Smol fix-ish Rapandrasmus 2023-01-22 15:02:41 +0100
• 7a0f4e38ed Begun fixing lockstep, just needs small fixes and features Rapandrasmus 2023-01-22 13:56:54 +0100
• 032e532416
  Merge branch 'megaminerjenny:master' into master Rapandrasmus 2023-01-22 10:33:20 +0100
• 8c69a7bec8 Merge branch 'master' of https://github.com/RaffyTaffy14/HS RaffyTaffy14 2023-01-21 23:25:03 -0500
• 1454520596
  Merge branch 'megaminerjenny:master' into master ev 2023-01-21 21:22:00 -0500
• 44391050a2
  Tweaked Tambourine Animations (#221) ev 2023-01-21 21:17:19 -0500
• 9ae3833dba
  I never wanna work on a Call and respone game ever again (#220) Rapandrasmus 2023-01-22 03:17:10 +0100
• 7e21c82467 Merge branch 'master' of https://github.com/megaminerjenny/HeavenStudio into master-old Amy54Desu 2023-01-21 20:43:28 -0500
• 29d4cff7f9 Final Touch-Ups ev 2023-01-21 19:32:47 -0500
• 17701fe313 Tambourine Fixed Animations ev 2023-01-21 19:22:04 -0500
• 564391bcd9 Karateka Fix, Sneaky Spirits Amy54Desu 2023-01-21 19:16:29 -0500
• 78afd06693 Adjustments to some code Amy54Desu 2023-01-21 17:45:07 -0500
• 3f84d456a1 FIXED FOR REAL Rapandrasmus 2023-01-21 23:44:54 +0100
• 9d36c156c8 Merge master patataofcourse 2023-01-21 23:08:06 +0100
• 431d2c7879
  Merge branch 'megaminerjenny:master' into master Rapandrasmus 2023-01-21 22:43:21 +0100
• d71de6e6b2 i need to work out conflicts AstrlJelly 2023-01-21 16:40:05 -0500
• e2700bec37
  Merge branch 'megaminerjenny:master' into master ev 2023-01-21 16:36:07 -0500
• 62fbf65f51
  Third times the charm (#218) Rapandrasmus 2023-01-21 22:29:28 +0100
• a99aa782ef FIXED??? Rapandrasmus 2023-01-21 21:45:10 +0100
• 1b6f92a299
  Merge branch 'megaminerjenny:master' into master AstrlJelly 2023-01-21 15:37:21 -0500
• 4921109d87
  Tambourine fix? (#217) Rapandrasmus 2023-01-21 21:37:09 +0100
• 5064de50ac
  Merge branch 'megaminerjenny:master' into master AstrlJelly 2023-01-21 15:34:03 -0500
• 12636fa4fc fix Rapandrasmus 2023-01-21 21:31:04 +0100
• f03245050c
  Merge branch 'megaminerjenny:master' into master Rapandrasmus 2023-01-21 21:21:18 +0100
• 8a6e90374e
  Merge branch 'megaminerjenny:master' into master ev 2023-01-21 14:57:20 -0500
• 652b76f396
  Added Tambourine, only missing HD frog sprites. Also fixed Tambourine + Working Dough Icons (#216) Rapandrasmus 2023-01-21 20:41:57 +0100
• da6f6fad0b Face Idle (Partially Done) and Mice Bhaos 2023-01-21 13:34:56 -0600
• 58c48ee591 DONE Rapandrasmus 2023-01-21 20:31:40 +0100
• 72d5c2c040 Animation changes Rapandrasmus 2023-01-21 19:56:09 +0100
• 69877cb9a2 Face Claps Bhaos 2023-01-21 12:26:08 -0600
• e7c36ca006 Miss Anims Rapandrasmus 2023-01-21 18:42:03 +0100
• 28540b5384
  Merge branch 'megaminerjenny:master' into master Rapandrasmus 2023-01-21 18:41:48 +0100
• 1da8357a26
  Create Build Instructions (#215) Saraistupid 2023-01-21 19:32:17 +0200
• 8e199a984c
  Merge branch 'megaminerjenny:master' into master Bhaos 2023-01-21 09:48:17 -0600
• c529f4b4a0
  Merge branch 'megaminerjenny:master' into master Rapandrasmus 2023-01-21 15:31:07 +0100
• 7a2d08b5f2 Inputs added, near completion Rapandrasmus 2023-01-21 14:54:53 +0100
• e6c0812472
  Update README.md Saraistupid 2023-01-21 10:44:33 +0200
• ec136717de
  Rename BUILD.MD to BUILD.md Saraistupid 2023-01-21 10:44:06 +0200
• cff8f8cc84
  Create BUILD.MD Saraistupid 2023-01-21 10:42:18 +0200
• 4a1d725c86
  Platform-Specific notes in the appropriate place Saraistupid 2023-01-21 10:41:54 +0200
• 9e0429e32d not much progress rn, getting into the harder stuff AstrlJelly 2023-01-21 00:38:38 -0500
• b13ea37175
  Merge branch 'megaminerjenny:master' into master ev 2023-01-20 22:40:19 -0500
• ef6f3d6849
  Merge branch 'megaminerjenny:master' into master AstrlJelly 2023-01-20 21:59:50 -0500
• 002fa19971
  Fix audio on MacOS (#214) Saraistupid 2023-01-21 04:35:00 +0200
• 9699504dc1
  Merge branch 'master' into macos-fixes Saraistupid 2023-01-21 04:30:49 +0200
• 84b4f308e3 Extra notes Saraistupid 2023-01-21 04:29:37 +0200
• 0941bc114a Fix Audio on MacOS (and fix JSL again) Saraistupid 2023-01-21 04:23:51 +0200
• 8a9223f4fe both ! Saraistupid 2023-01-21 03:55:29 +0200
• e7b49295b3 how did i do this Saraistupid 2023-01-21 03:51:36 +0200
• d41463ed82
  JoyShockLibrary (#213) Saraistupid 2023-01-21 03:39:58 +0200
• 03ca5de156 JoyShockLibrary Saraistupid 2023-01-21 03:38:23 +0200
• 26ff58a407
  make icon masks use linear colour space (#212) minenice55 2023-01-20 18:15:32 -0500
• ca07b6a468 Added Events Rapandrasmus 2023-01-20 23:58:03 +0100
• 4207029d3c make icon masks use linear colour space minenice55 2023-01-20 17:19:32 -0500
• 323bc4a44a
  Merge branch 'megaminerjenny:master' into master AstrlJelly 2023-01-20 15:22:27 -0500
• b985e608f1 Added many animations for tambourine Rapandrasmus 2023-01-20 20:05:50 +0100
• 57af61fb05
  Merge branch 'megaminerjenny:master' into master Rapandrasmus 2023-01-20 16:57:06 +0100
• 55a5b91514
  Working Dough Polish and QoL + Tambourine Initilization (#211) Rapandrasmus 2023-01-20 16:48:30 +0100
• da09f96065 Working Dough Polish Rapandrasmus 2023-01-20 16:38:18 +0100
• 9b85dd003d More Claps Bhaos 2023-01-20 04:22:34 -0600
• 0dfc0782b0 keeping trying AstrlJelly 2023-01-20 03:32:47 -0500
• de78127717
  Merge branch 'megaminerjenny:master' into master Bhaos 2023-01-20 02:13:56 -0600
• 07ff8bf0a4 getting there AstrlJelly 2023-01-20 01:30:37 -0500
• e4cd0b1247 temp icon w/ mask + bezier curves!! AstrlJelly 2023-01-19 17:22:22 -0500
• c450c6516d Begun development on tambourine Rapandrasmus 2023-01-19 22:52:21 +0100
• 7acf32765a
  Merge branch 'megaminerjenny:master' into master ev 2023-01-19 16:26:19 -0500
• 56e642563f
  Merge branch 'megaminerjenny:master' into master AstrlJelly 2023-01-19 12:40:56 -0500
• 1ca3b6dd9f
  Merge branch 'megaminerjenny:master' into master Rapandrasmus 2023-01-19 18:37:14 +0100
• ecabbd8966
  Add Working Dough (Finished), Missing HD Assets and Updated Icon only. (#210) Rapandrasmus 2023-01-19 18:18:55 +0100
• 91734ae61f DONE Rapandrasmus 2023-01-19 18:08:34 +0100
• 133d30efa8 Finished GANDW, fixed some bugs and still fixing bugs, almost done! Rapandrasmus 2023-01-19 15:31:09 +0100
• 73fe86b774 initialization and sprite trimming done AstrlJelly 2023-01-19 08:57:18 -0500
• 5deef729a6
  Merge branch 'megaminerjenny:master' into master Rapandrasmus 2023-01-19 12:07:35 +0100
• f4510b7c56 starting on dog ninja AstrlJelly 2023-01-19 00:31:37 -0500
• 16ac457a0d Kitties Clap Animations and Inverse Spawn Bhaos 2023-01-18 21:01:11 -0600
• c4c51c3a3e
  Merge branch 'megaminerjenny:master' into master AstrlJelly 2023-01-18 21:44:01 -0500
• 526d5ce6ec
  Catchy Tune: fixed bop issue (#208) kkuhn317 2023-01-18 21:31:20 -0500
• c037901d34
  Configurable Event Priority & Bugfixes (#209) minenice55 2023-01-18 21:31:08 -0500
• 88ed365629 remove more files minenice55 2023-01-18 21:30:21 -0500
• 1afc0a3551 Merge remote-tracking branch 'upstream/master' Jellirby 2023-01-18 21:19:11 -0500
• 5ad54b348c remove debug print minenice55 2023-01-18 21:17:58 -0500
• a3e0d87f20 file cleanup minenice55 2023-01-18 21:10:23 -0500