[PR #147] [MERGED] Develop #142

New Issue

2026-05-20T22:32:58+02:00

Pecus commented

2026-05-20 22:32:58 +02:00

📋 Pull Request Information

Original PR: https://github.com/pkali/scorch_src/pull/147
Author: @pkali
Created: 11/14/2022
Status: ✅ Merged
Merged: 11/14/2022
Merged by: @pkali

Base: master ← Head: develop

📝 Commits (10+)

b3b8633 New weapon! - "Lazy Boy"
a7493e1 Another new weapon! - Lazy Darwin :)
3f74494 New weapon - Auto Defense! And AI bugfixes
c419eac Improvements in "AutoDefense" - now works great!
f67656c Update MANUAL_EN.md
ac1c501 angle 0 elliminated
50cc7f1 New weapon (I promise - last one :) ) - Spy Hard!
d0e682f New SFX and manuals update.
c19befe Barrel drawing bug (lone pixels on left edge of screen) fixed!
3dd5873 Rounding proposal.

📊 Changes

18 files changed (+357 additions, -126 deletions)

View changed files

📝 MANUAL_EN.md (+5 -3)
📝 MANUAL_PL.md (+19 -14)
📝 README.md (+24 -3)
📝 ai.asm (+27 -20)
➖ artwork/sfx/scorch_str6.rmt (+0 -0)
📝 artwork/sfx/scorch_str8-NTSC.rmt (+0 -0)
➕ artwork/sfx/scorch_str8.rmt (+0 -0)
➕ artwork/sfx/scorch_str9-NTSC.rmt (+0 -0)
📝 artwork/weapons_AW6_mod.fnt (+0 -0)
📝 constants.asm (+27 -1)
📝 definitions.asm (+12 -1)
📝 grafproc.asm (+30 -20)
📝 scorch.asm (+48 -27)
📝 scorch.bin (+0 -0)
📝 scorch.xex (+0 -0)
📝 textproc.asm (+77 -24)
📝 variables.asm (+5 -1)
📝 weapons.asm (+83 -12)

📄 Description

No description provided

_{🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.}

## 📋 Pull Request Information **Original PR:** https://github.com/pkali/scorch_src/pull/147 **Author:** [@pkali](https://github.com/pkali) **Created:** 11/14/2022 **Status:** ✅ Merged **Merged:** 11/14/2022 **Merged by:** [@pkali](https://github.com/pkali) **Base:** `master` ← **Head:** `develop` --- ### 📝 Commits (10+) - [`b3b8633`](https://github.com/pkali/scorch_src/commit/b3b86335748590c645e68bfe50f3ffbcb0fec63c) New weapon! - "Lazy Boy" - [`a7493e1`](https://github.com/pkali/scorch_src/commit/a7493e1dcbf6f176af7424380db0e45ef3d879c2) Another new weapon! - Lazy Darwin :) - [`3f74494`](https://github.com/pkali/scorch_src/commit/3f74494bed9466f43605a1675554e687c2244097) New weapon - Auto Defense! And AI bugfixes - [`c419eac`](https://github.com/pkali/scorch_src/commit/c419eac3de0548c3ec495018aa1401911e763d52) Improvements in "AutoDefense" - now works great! - [`f67656c`](https://github.com/pkali/scorch_src/commit/f67656c5aa4e95be8624caebd917e04affd3b2ec) Update MANUAL_EN.md - [`ac1c501`](https://github.com/pkali/scorch_src/commit/ac1c501fa4b6b9973ab8e321406eaf232b6fdd56) angle 0 elliminated - [`50cc7f1`](https://github.com/pkali/scorch_src/commit/50cc7f16dfad3397e8a937a85e29140a24531481) New weapon (I promise - last one :) ) - Spy Hard! - [`d0e682f`](https://github.com/pkali/scorch_src/commit/d0e682f0a3281888bef9bfb702f1fbeee7bbadd8) New SFX and manuals update. - [`c19befe`](https://github.com/pkali/scorch_src/commit/c19befe31ae1fa8ac156c7b7724077ea7692d0fb) Barrel drawing bug (lone pixels on left edge of screen) fixed! - [`3dd5873`](https://github.com/pkali/scorch_src/commit/3dd58736d78fd2cbfa6a6142422c5e6921554cba) Rounding proposal. ### 📊 Changes **18 files changed** (+357 additions, -126 deletions) <details> <summary>View changed files</summary> 📝 `MANUAL_EN.md` (+5 -3) 📝 `MANUAL_PL.md` (+19 -14) 📝 `README.md` (+24 -3) 📝 `ai.asm` (+27 -20) ➖ `artwork/sfx/scorch_str6.rmt` (+0 -0) 📝 `artwork/sfx/scorch_str8-NTSC.rmt` (+0 -0) ➕ `artwork/sfx/scorch_str8.rmt` (+0 -0) ➕ `artwork/sfx/scorch_str9-NTSC.rmt` (+0 -0) 📝 `artwork/weapons_AW6_mod.fnt` (+0 -0) 📝 `constants.asm` (+27 -1) 📝 `definitions.asm` (+12 -1) 📝 `grafproc.asm` (+30 -20) 📝 `scorch.asm` (+48 -27) 📝 `scorch.bin` (+0 -0) 📝 `scorch.xex` (+0 -0) 📝 `textproc.asm` (+77 -24) 📝 `variables.asm` (+5 -1) 📝 `weapons.asm` (+83 -12) </details> ### 📄 Description _No description provided_ --- <sub>🔄 This issue represents a GitHub Pull Request. It cannot be merged through Gitea due to API limitations.</sub>

Pecus added the pull-request label 2026-05-20 22:32:58 +02:00

Pecus referenced this issue

2026-05-20 22:35:13 +02:00

[GH-ISSUE #142] Add support for more than 1 joystick. #287

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: starred/scorch_src#142