Skip to content

Catching up with dangermccann#12

Open
zarutian wants to merge 9 commits intodangermccann:masterfrom
zarutian:master
Open

Catching up with dangermccann#12
zarutian wants to merge 9 commits intodangermccann:masterfrom
zarutian:master

Conversation

@zarutian
Copy link
Copy Markdown

This is not I wanted! I wanted the exact opposite. I wanted to merge commits from dangermccann:master into zarutian:master.

Why has github changed their Pull Request UI? It was so clear which branch was being merged into which other branch.

Just keeping up with dangermccann.
Just keeping up with dangermccann.
Nowhere in the DCPU-16 v1.7 spec is this behaviour specified and all other implementations do not alter memory at where the SP points at when popping.
Catching up with dangermccann, yet again. And why has github changed their pull request UI? It was so clear before which branch was being merged into which.
@dangermccann
Copy link
Copy Markdown
Owner

Hi, thanks for the pull request! Can you provide some information on the two new devices you added support for? Did you want me to include those JS files by default when we load index.html? Also, I'm thinking that if we add new devices we should probably allow the user to toggle them on / off in the settings screen, the way we do for other devices.

@zarutian-borked
Copy link
Copy Markdown

I was just trying to catch up with your repo basicly and ballsed it up.

The two new devices are a Simple Volatile Memory Module (pretty much
just extra memory) and

a Small Graphical Screen Tile (which multiple instances are meant to
tile together if or when people want bigger screens hence the need for
SVMMs.)

Have only tested the former and I am going to test the latter soonish.

-Zarutian

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants