Commit Graph

Select branches

Hide Pull Requests

develop

develop-satoko

firstBuildStaging

original

#1

#10

#100

#101

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#116

#12

#121

#122

#123

#124

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#138

#14

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#159

#16

#160

#161

#162

#163

#164

#167

#168

#169

#17

#170

#171

#172

#173

#175

#176

#177

#178

#179

#18

#180

#181

#184

#185

#189

#19

#190

#191

#192

#193

#195

#196

#197

#198

#199

#2

#20

#200

#201

#203

#204

#205

#206

#208

#209

#21

#210

#212

#217

#219

#22

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#233

#234

#235

#236

#238

#239

#24

#240

#241

#242

#244

#245

#246

#247

#248

#25

#251

#254

#255

#256

#257

#258

#26

#260

#262

#263

#264

#265

#266

#268

#269

#27

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#283

#284

#285

#286

#288

#289

#29

#290

#291

#292

#293

#294

#295

#296

#297

#298

#299

#3

#30

#300

#301

#303

#304

#305

#308

#309

#31

#310

#311

#312

#313

#314

#315

#317

#32

#320

#321

#322

#323

#324

#325

#326

#327

#329

#33

#331

#332

#333

#335

#336

#338

#34

#341

#342

#343

#344

#345

#347

#348

#349

#35

#350

#351

#352

#354

#358

#359

#36

#360

#361

#363

#365

#366

#367

#368

#369

#37

#370

#371

#372

#373

#375

#376

#377

#378

#379

#38

#380

#381

#382

#383

#385

#386

#387

#388

#389

#39

#390

#391

#392

#393

#394

#395

#396

#397

#398

#399

#4

#40

#400

#401

#402

#403

#404

#405

#41

#415

#421

#423

#424

#425

#426

#427

#429

#43

#430

#431

#438

#439

#44

#440

#441

#442

#443

#444

#445

#446

#447

#448

#449

#451

#452

#453

#454

#455

#456

#457

#458

#459

#460

#461

#462

#463

#464

#466

#467

#468

#470

#471

#472

#473

#474

#476

#477

#478

#479

#480

#482

#483

#484

#485

#486

#487

#488

#489

#49

#491

#493

#494

#498

#5

#50

#510

#510

#511

#52

#522

#529

#53

#535

#536

#537

#539

#54

#540

#543

#546

#547

#548

#549

#55

#550

#551

#553

#554

#56

#563

#564

#568

#57

#576

#578

#579

#58

#580

#581

#585

#586

#587

#588

#589

#590

#591

#592

#593

#595

#595

#596

#597

#6

#601

#603

#604

#605

#606

#607

#608

#611

#612

#614

#616

#617

#618

#619

#62

#620

#621

#621

#622

#624

#625

#626

#628

#631

#633

#640

#641

#642

#643

#65

#652

#653

#658

#659

#66

#662

#663

#664

#665

#666

#669

#67

#670

#671

#671

#674

#676

#677

#679

#68

#682

#683

#685

#686

#687

#688

#689

#69

#693

#694

#695

#695

#699

#7

#70

#700

#701

#704

#707

#708

#709

#71

#710

#711

#712

#713

#714

#716

#717

#718

#719

#72

#720

#721

#722

#723

#724

#725

#726

#728

#729

#73

#730

#731

#731

#732

#733

#736

#737

#738

#739

#74

#740

#743

#744

#746

#749

#75

#754

#755

#755

#756

#757

#758

#76

#760

#762

#764

#765

#766

#768

#769

#77

#772

#776

#777

#778

#778

#779

#78

#780

#782

#783

#784

#785

#786

#788

#790

#790

#791

#793

#794

#795

#796

#797

#798

#799

#8

#800

#801

#804

#806

#806

#808

#809

#81

#810

#811

#812

#813

#816

#817

#819

#820

#821

#822

#824

#825

#828

#830

#833

#837

#839

#84

#840

#841

#842

#843

#844

#846

#847

#849

#85

#850

#851

#852

#853

#855

#859

#86

#861

#861

#863

#865

#866

#869

#870

#870

#871

#872

#873

#874

#875

#876

#877

#878

#88

#880

#882

#882

#884

#886

#889

#89

#890

#890

#891

#892

#894

#895

#896

#897

#9

#900

#901

#903

#905

#906

#907

#908

#91

#910

#910

#911

#913

#914

#915

#916

#917

#918

#919

#92

#920

#921

#922

#922

#923

#924

#926

#927

#929

#93

#930

#931

#932

#933

#934

#936

#938

#94

#940

#941

#942

#943

#945

#946

#947

#948

#949

#95

#950

#951

#952

#953

#954

#955

#956

#957

#957

#958

#959

#96

#961

#962

#963

#965

#966

#967

#968

#968

#969

#970

#970

#971

#972

#973

#974

#974

#975

#976

#977

#978

#979

#98

#980

#981

#982

#983

#984

#985

#986

#987

#987

#989

#99

#991

#992

#993

#994

#994

#995

#996

#997

#997

1.0.0

1.0.1

1.0.2

1.1.0

1.1.1

1.1.2

Mono Color

• c2a32dc2ec
  Merge 5da01f81cefc068bfa0d8b7090af1c1bb44409fe into 09b778c5d729070c880e7db54a4a4254149375b6 #997 Archez 2025-02-16 17:45:35 -05:00
• 5da01f81ce Document and fix vanilla bug with smoke rendering #997 Archez 2025-02-16 17:40:53 -05:00
• 9595076d22
  Merge 829d57c787a76f83c74a48cfd8801a9076f85e4d into 09b778c5d729070c880e7db54a4a4254149375b6 #910 lightmanLP 2025-02-16 21:13:59 +01:00
• 77098ef422
  Merge 35d3c9311f78e183e198741c4a2570216462dbdc into 09b778c5d729070c880e7db54a4a4254149375b6 #922 lightmanLP 2025-02-16 18:39:02 +07:00
• 09b778c5d7
  pin linuxdeploy (#996) develop briaguya 2025-02-16 02:16:35 -08:00
• b263512a9a
  Merge 123119f5f4f2f257f4a26298d42c3564a842d9d9 into 3d46f8de5f93aa419da4debbb68f5fa2090c64eb #882 Garrett Cox 2025-02-16 19:32:23 +11:00
• 3ad6535d05 Merge remote-tracking branch 'refs/remotes/origin/customAudio2' into customAudio2 #778 louist103 2025-02-16 00:55:19 -05:00
• 771f9ebd1c
  WIP sf editor support louist103 2025-02-16 00:52:59 -05:00
• 1c480508ba
  pin linuxdeploy #996 briaguya 2025-02-15 22:37:15 -05:00
• 779ee90706
  Merge 7de69ce3e9be823585fea2bbbf209f414bed6a82 into 3d46f8de5f93aa419da4debbb68f5fa2090c64eb #974 Garrett Cox 2025-02-15 10:37:07 -05:00
• 35d3c9311f shielding handle update #922 lightmanLP 2025-02-15 20:16:17 +07:00
• 7c51e5befd separate custom shielding handle lightmanLP 2025-02-15 19:55:27 +07:00
• baa2823fcc reset shielding logic lightmanLP 2025-02-15 19:46:59 +07:00
• e834a24406 some messy math lightmanLP 2025-02-15 19:30:21 +07:00
• 79349c3c8c
  Merge 13bdcf47a98ebbcdbbe27f4352c860f7c3073fe1 into 3d46f8de5f93aa419da4debbb68f5fa2090c64eb #994 Lars-Christian Selland 2025-02-14 21:17:47 -05:00
• 3351a3ee2c switch to raw input lightmanLP 2025-02-15 03:38:10 +07:00
• a8d952f961 change cvar default value lightmanLP 2025-02-09 13:55:18 +07:00
• 7dc0e753dc bunch of renames for better understanding lightmanLP 2025-02-06 19:04:58 +07:00
• 749fc993c1 mouse shield control lightmanLP 2025-02-06 17:57:58 +07:00
• db464836f0 shield invert cvars lightmanLP 2025-02-06 17:47:56 +07:00
• 859f372886 remove shield flag check lightmanLP 2025-02-06 16:09:33 +07:00
• 3723f6b2e6 fix inverts lightmanLP 2025-02-06 06:03:28 +07:00
• 2951258771 typo lightmanLP 2025-02-05 03:51:42 +07:00
• d8489ed851 disabled -> hidden lightmanLP 2025-02-05 02:51:25 +07:00
• 53714ec44e column update lightmanLP 2025-02-05 02:08:57 +07:00
• 1624ae1360 fix lightmanLP 2025-02-05 01:43:41 +07:00
• 1d781c940f basic hacky mouse support lightmanLP 2025-01-03 14:22:44 +00:00
• 93a47dccd8
  Merge 4fd779eef4d1b37286254ee598a603903fb89d5b into 3d46f8de5f93aa419da4debbb68f5fa2090c64eb #987 Lars-Christian Selland 2025-02-14 14:02:59 -05:00
• 3d46f8de5f
  Initial implementation of PresetsManager (#989) Garrett Cox 2025-02-14 13:02:27 -06:00
• 9aaa31e131 Initial implementation of PresetsManager #989 Garrett Cox 2025-02-14 12:26:41 -06:00
• eec2be4122
  [Minigame] Bombers Required for Hide-and-Seek (#980) Patrick12115 2025-02-14 12:24:12 -05:00
• 63728ecf83
  Merge fd44259e89828699bd1cd8adb1bc407c5d3972a9 into 43045083723ee08d670936c6af3050b7b877b5ab #970 Joshua Sanchez 2025-02-14 11:20:52 -06:00
• ef8b19702c
  fix (#986) develop-satoko lightmanLP 2025-02-15 00:20:44 +07:00
• 4304508372
  Only handle sword beam collision for enemies (#993) Eblo 2025-02-14 12:20:00 -05:00
• 0c0527232c
  Add missing flag to keep monkeys from spawning again (#995) balloondude2 2025-02-14 10:18:55 -07:00
• 1e10e98564 clang format #995 Travis 2025-02-13 20:50:13 -07:00
• a2a29ac550 account for both types of monkey Travis 2025-02-13 20:49:27 -07:00
• f1d329b591 add missing flag to keep monkeys from spawning again Travis 2025-02-13 15:57:16 -07:00
• 13bdcf47a9 Is this the final commit (tm)? #994 Lars-Christian Selland 2025-02-13 19:28:19 +01:00
• 897ccaf25e fighting the IDE here. Epic battle. Very big. Lars-Christian Selland 2025-02-13 19:23:47 +01:00
• c1c00489c4 hopefully the formatting is good now? Lars-Christian Selland 2025-02-13 19:19:51 +01:00
• b791e4f3ce Changes for the Fullscreen fixes PR Lars-Christian Selland 2025-02-13 18:46:18 +01:00
• c7ae45a1d7 Merge remote-tracking branch 'upstream/develop' into develop Lars-Christian Selland 2025-02-13 17:43:17 +01:00
• 3774f877fb
  Only handle sword beam collision for enemies Ensure EnClearTag light ray effects are blue when Fierce Deity #993 Eblo 2025-02-12 14:32:18 -05:00
• f82740e36f
  Merge 9eabe9bffb992eb07109b3db7ab7101f96ac46b1 into e3da5dcfb09fceb9fb680972dd018bcc64597753 #755 mckinlee 2025-02-11 13:06:30 -05:00
• e3da5dcfb0
  Add interpolation fixes to console logo and file chose skybox (#992) Archez 2025-02-11 09:42:23 -05:00
• da7e21c221 Add interpolation fixes to console logo and file chose skybox #992 Archez 2025-02-11 00:36:22 -05:00
• 9eabe9bffb add that space back #755 mckinlee 2025-02-10 15:49:33 -05:00
• 7d5cf015c8 add back menu setting and run clang format mckinlee 2025-02-10 15:48:31 -05:00
• b95d5e9fd6
  Merge branch 'develop' into easymaskequip mckinlee 2025-02-10 13:51:48 -05:00
• bb6c3a78d2 failed to merge properly, fix conflicts... uhg mckinlee 2025-02-10 13:47:58 -05:00
• 047be98b8f Revert "Merge remote-tracking branch 'upstream/develop' into easymaskequip" mckinlee 2025-02-10 13:43:27 -05:00
• c4a7b5babf Merge remote-tracking branch 'upstream/develop' into easymaskequip mckinlee 2025-02-10 13:35:31 -05:00
• 6656b29c8d repurpose Easy Mask Equip for transformation masks only mckinlee 2025-02-10 12:21:15 -05:00
• 365259233d
  Fix Zora fin recall when carrying an item (#991) Archez 2025-02-09 14:08:09 -05:00
• f2038d42db
  [TimeSaver] Fast Dampe Flame Digging (#973) Patrick12115 2025-02-09 13:35:57 -05:00
• 359b7e0f3d simplify hook #991 Archez 2025-02-08 14:13:40 -05:00
• 3db13c8b69 Fix Zora fin recall when carrying an item Archez 2025-02-08 13:51:21 -05:00
• ad23caf6f5 tweak dampe skip hooks to only run when necessary #973 Archez 2025-02-06 23:53:08 -05:00
• b464f00b1a Merge remote-tracking branch 'origin/develop' into Fast-Dampe Archez 2025-02-06 23:40:22 -05:00
• 856aa2612b
  Add PreventDiveOverWater enhancement (#976) Garrett Cox 2025-02-06 13:53:26 -06:00
• fd44259e89 Settings: Switch Moon Crash cutscene skip to check for SkipStoryCutscenes #970 Josh Sanchez 2025-02-06 10:18:05 -06:00
• 09ec12f904 Merge branch 'develop' into timesaver/misc/moon_crash_skip Josh Sanchez 2025-02-06 10:13:31 -06:00
• ac1ad42db8
  macOS Game Mode Support for 2Ship2Harkinian (#811) Lars-Christian Selland 2025-02-05 19:53:29 +01:00
• 123119f5f4 Add HyperEnemies mode #882 Garrett Cox 2025-02-05 10:27:17 -06:00
• b9a2bbef46 Revert "Parity with upstream" Lars-Christian Selland 2025-02-05 03:51:13 +01:00
• 4fd779eef4 Revert "Parity with upstream" #987 Lars-Christian Selland 2025-02-05 03:48:53 +01:00
• ac1dee425e Changes needed for resolution changes on macOS Lars-Christian Selland 2025-02-05 03:47:01 +01:00
• f3e9e04935 Revert "Update libultraship" #811 Lars-Christian Selland 2025-02-05 03:26:13 +01:00
• e9e07473bc Update libultraship Lars-Christian Selland 2025-02-05 03:25:47 +01:00
• 09a2b769c8 Revert "Parity with upstream" Lars-Christian Selland 2025-02-05 03:11:40 +01:00
• 22d2346875 Revert "does this do the trick?" Lars-Christian Selland 2025-02-05 03:05:43 +01:00
• 267fbfb2bb does this do the trick? Lars-Christian Selland 2025-02-05 03:05:07 +01:00
• f8ba7d850c
  Update .gitignore Lars-Christian Selland 2025-02-05 02:56:44 +01:00
• 3e8fd8a9f4 Revert "desperation" Lars-Christian Selland 2025-02-05 02:52:48 +01:00
• 6aea78dc92 desperation Lars-Christian Selland 2025-02-05 02:50:27 +01:00
• 507b56f330
  Update CMakeLists.txt Lars-Christian Selland 2025-02-05 02:32:20 +01:00
• 018c18a2cb
  Update mm/macosx/Info.plist.in Lars-Christian Selland 2025-02-05 02:28:05 +01:00
• 65e3fc06b5 I should pay more attention to what I am doing Lars-Christian Selland 2025-02-05 01:31:15 +01:00
• 8cc02dfc8e Re-added the folder creation function Lars-Christian Selland 2025-02-05 01:19:36 +01:00
• 719855433d Merge branch 'develop' into FinalTest Lars-Christian Selland 2025-02-05 01:17:13 +01:00
• 0064df0c6e update git ignore again Lars-Christian Selland 2025-02-05 01:16:24 +01:00
• 52af15808b updated git ignore Lars-Christian Selland 2025-02-05 01:15:44 +01:00
• 6bfdee805e Parity with upstream Lars-Christian Selland 2025-02-05 01:15:01 +01:00
• 657b08d620 Updated to follow Archez's new conventions Lars-Christian Selland 2025-02-05 01:11:54 +01:00
• a36b4aa977
  Fix button id conflicts on input editor (#985) Archez 2025-02-04 16:23:21 -05:00
• 2935d2fa71 fix #986 lightmanLP 2025-02-05 02:21:04 +07:00
• 8f3d742cce remove id in favor of stick enum #985 Archez 2025-02-04 14:54:23 -05:00
• d74860a281 Fix button id conflicts on input editor Archez 2025-02-04 13:30:01 -05:00
• 829d57c787 [feat] offset mapping popup #910 lightmanLP 2024-12-24 23:15:43 +00:00
• d60627e694
  Fix persistent mask bugs with Postman and moon (#979) Eblo 2025-02-04 11:38:15 -05:00
• 85747d38c6
  Add safe crash handling for remote hookshot hookslide in great bay temple (#978) Archez 2025-02-04 11:24:12 -05:00
• 7896a0f648
  Bump LUS and OTRExporter pt.3 (#984) Archez 2025-02-04 10:28:18 -05:00
• 4c21fbe8e2 Remove outdated controller disclaimer #984 Archez 2025-02-04 09:35:28 -05:00
• 19a0263404 Bump LUS and OTRExporter pt.3 Archez 2025-02-03 01:23:26 -05:00
• eeed3ad367
  Bump LUS pt.2 (#983) Archez 2025-02-03 23:06:24 -05:00
• 9e71905799 Bump LUS and stuff pt.2 #983 Archez 2025-02-02 21:13:11 -05:00
• 63079f1cf6
  Bump LUS and OTRExporter pt.1 (#982) Archez 2025-02-03 22:34:17 -05:00
• 3dcd450321
  Merge 260b9c178865b819c54f829f5fcd1073f305a9f0 into cf8f57a2c9f2a0a4fcb352ec991f398ada1af51e #968 Malkierian 2025-02-03 22:24:56 -05:00
• cf8f57a2c9
  Fix incorrect color usage in Save Editor (#981) Archez 2025-02-03 22:23:20 -05:00