Code

dmca#1

Code

Open

E4zily wants to merge 108 commits intolucianoforks:masterlucianoforks/falling-block-puzzle-game-os:masterfrom zment4:masterzment4/tetris-os:masterCopy head branch name to clipboard

+768-473

Commits

Commits on Apr 19, 2021

• Update README.md

  jdah

  authored
  3b458cf

  Copy full SHA for 3b458cf

Commits on Apr 22, 2021

• removed unnecessary second backbuffer

  DanB91

  committed
  6ea1ba0

  Copy full SHA for 6ea1ba0

• Update README.md

  jdah

  authored
  6036c50

  Copy full SHA for 6036c50

• Added music enable #define, made theme full AABA

  jdah

  committed
  c688e0e

  Copy full SHA for c688e0e

• Merge branch 'master' of https://github.com/jdah/tetris-os

  jdah

  committed
  e9c541d

  Copy full SHA for e9c541d

• Update README.md

  jdah

  authored
  d7ff866

  Copy full SHA for d7ff866

• Fixed linux builds

  jdah

  committed
  9dca2d1

  Copy full SHA for 9dca2d1

• Merge branch 'master' of https://github.com/jdah/tetris-os

  jdah

  committed
  bd41afe

  Copy full SHA for bd41afe

• Remove duplicate Makefile directive

  jdah

  committed
  b5d8772

  Copy full SHA for b5d8772

• Bump BUFFER_MS to 40

  jdah

  committed
  47644fc

  Copy full SHA for 47644fc

• Update README.md

  jdah

  authored
  dd21ffd

  Copy full SHA for dd21ffd

• Update README.md

  jdah

  authored
  2f73062

  Copy full SHA for 2f73062

• Update README.md

  jdah

  authored
  afc9ed2

  Copy full SHA for afc9ed2

• reverted kernel.bin to remove merge conflict

  DanB91

  committed
  bf281d9

  Copy full SHA for bf281d9

Commits on Apr 23, 2021

• Update README.md

  jdah

  authored
  308d024

  Copy full SHA for 308d024

Commits on Apr 24, 2021

• Added QEMU paramters

  Alee14

  committed
  873fe98

  Copy full SHA for 873fe98

Commits on Apr 25, 2021

• Sound is now disabled automatically if SB16 reset procedure fails, no need to use compile-time defines.

  zment4

  committed
  6e59d00

  Copy full SHA for 6e59d00

• Updated Windows running and compiling instructions

  zment4

  committed
  a0d8bce

  Copy full SHA for a0d8bce

• preliminary CHS reads

  zment4

  committed
  83fd9c2

  Copy full SHA for 83fd9c2

Commits on Apr 26, 2021

• Updated windows usage and compilation instructions

  zment4

  committed
  ec93922

  Copy full SHA for ec93922

• Windows instructions to i386-elf-toolchain

  Show description for 6d0d07b
  zment4

  authored
  6d0d07b

  Copy full SHA for 6d0d07b

• Added some pops and fixed sector reset

  zment4

  committed
  4234b2e

  Copy full SHA for 4234b2e

• CHS reads working, LBA tried first

  zment4

  committed
  864e337

  Copy full SHA for 864e337

• Changed test drivenum write to readable again

  zment4

  committed
  59f867f

  Copy full SHA for 59f867f

• Accidentally modified the wrong value for reads

  zment4

  committed
  3e4f6a7

  Copy full SHA for 3e4f6a7

• Added CHS reads as backup after LBA reads

  zment4

  committed
  c734b3a

  Copy full SHA for c734b3a

• Changed the sector read value lower to circumvent a bug

  zment4

  committed
  72be22a

  Copy full SHA for 72be22a

• Update README.md

  zment4

  authored
  1515090

  Copy full SHA for 1515090

• Added mention of WSL

  zment4

  authored
  a01ae27

  Copy full SHA for a01ae27

• Disable SB16 dynamically

  zment4

  committed
  a8fe564

  Copy full SHA for a8fe564

• JNE changed to JNA on head count conditional jump

  Show description for 37d7a9c
  zment4

  authored
  37d7a9c

  Copy full SHA for 37d7a9c

• Update README.md

  zment4

  authored
  28e85b5

  Copy full SHA for 28e85b5

• Update README.md

  zment4

  authored
  d379568

  Copy full SHA for d379568

• Update README.md

  zment4

  authored
  60104a9

  Copy full SHA for 60104a9

• Update README.md

  zment4

  authored
  62de6b4

  Copy full SHA for 62de6b4

• Merge branch 'updated_windows_instructions'

  zment4

  committed
  c283ee6

  Copy full SHA for c283ee6

• Fixed missing br in "Instructions for MINGW64"

  zment4

  authored
  5e85458

  Copy full SHA for 5e85458

• Fixed missing merge

  zment4

  committed
  9f02145

  Copy full SHA for 9f02145

• Update README.md

  zment4

  authored
  d7bec5e

  Copy full SHA for d7bec5e

Commits on Apr 27, 2021

• Optimized stage0 for size and clarity, added hex print and load progress

  zment4

  committed
  2429f87

  Copy full SHA for 2429f87

• Melody playback implemented with PCSPK

  zment4

  committed
  5ae79ff

  Copy full SHA for 5ae79ff

• Changed Makefile build from .iso to .bin

  zment4

  committed
  e430748

  Copy full SHA for e430748

• Merge branch 'master' into pcspk

  zment4

  committed
  043c6dd

  Copy full SHA for 043c6dd

• Removed offending empty line

  zment4

  committed
  e311629

  Copy full SHA for e311629

• Removed BLOCK/ALIGN and end clauses from linker script

  zment4

  committed
  2f79d0f

  Copy full SHA for 2f79d0f

• Reading 0x40 sectors at stage0

  zment4

  committed
  8b13aa3

  Copy full SHA for 8b13aa3

• Merge branch 'master' into pcspk

  zment4

  committed
  f0e28f2

  Copy full SHA for f0e28f2

• Added some checks to prevent useless note setting

  zment4

  committed
  544b539

  Copy full SHA for 544b539

• Update README.md

  zment4

  authored
  f8b08e9

  Copy full SHA for f8b08e9

• Moved the WSL note to the correct spot

  zment4

  authored
  b443a1e

  Copy full SHA for b443a1e

• Added header6 tags to instructions for MINGW64

  zment4

  authored
  00daa6d

  Copy full SHA for 00daa6d

• Merge branch 'master' into updated_windows_instructions

  zment4

  authored
  7c83297

  Copy full SHA for 7c83297

• Merge pull request #1 from zment4/updated_windows_instructions

  Show description for 14e1e76
  zment4

  authored
  14e1e76

  Copy full SHA for 14e1e76

• Fixed mentions of iso to bin

  zment4

  authored
  441185c

  Copy full SHA for 441185c

• Update README.md

  zment4

  authored
  1b00011

  Copy full SHA for 1b00011

• Changed mention of ISO to IMAGE, and used that define in the final recipe

  zment4

  committed
  40899e3

  Copy full SHA for 40899e3

• Made all depend on image as they were almost the same but now semantically more correct in my mind

  zment4

  committed
  8f754b8

  Copy full SHA for 8f754b8

• Merge pull request #2 from DanB91/master

  Show description for e4b9e8b
  zment4

  authored
  e4b9e8b

  Copy full SHA for e4b9e8b

• SB16 max sample-rate is 44100

  zment4

  committed
  0470eb6

  Copy full SHA for 0470eb6

• Merge branch 'fixed_sampling_rate'

  zment4

  committed
  723aeed

  Copy full SHA for 723aeed

Commits on Apr 28, 2021

• Initial commit

  jdah

  committed
  da00de7

  Copy full SHA for da00de7

• Merge pull request #44 from zment4/chs_reads_pr

  Show description for 4bc572f
  jdah

  authored
  4bc572f

  Copy full SHA for 4bc572f

• Merge branch 'chs-reads-jdh'

  jdah

  committed
  59e1a1f

  Copy full SHA for 59e1a1f

• Change ISO to IMG

  jdah

  committed
  a955a56

  Copy full SHA for a955a56

• Added noaudio, completed merge

  jdah

  committed
  f323204

  Copy full SHA for f323204

• Merge branch 'dynamic_sb16_disable'

  jdah

  committed
  aee5129

  Copy full SHA for aee5129

• Fix dynamic sound disabling, add notification system

  jdah

  committed
  6a9bcd4

  Copy full SHA for 6a9bcd4

• Reduce sampling ratee

  jdah

  committed
  5333055

  Copy full SHA for 5333055

• Updated README.md

  jdah

  committed
  9fac3d2

  Copy full SHA for 9fac3d2

• PC speaker support

  jdah

  committed
  7d8e336

  Copy full SHA for 7d8e336

• Sound drivers

  jdah

  committed
  b4ebced

  Copy full SHA for b4ebced

• Tiny README fix

  jdah

  committed
  baf4c98

  Copy full SHA for baf4c98

• Update README.md

  zment4

  authored
  463b8d9

  Copy full SHA for 463b8d9

Commits on Apr 29, 2021

• Merge branch 'master' of github.com:zment4/tetris-os

  zment4

  committed
  fd20120

  Copy full SHA for fd20120

• Preliminary merged, requires testing

  zment4

  committed
  3e3446d

  Copy full SHA for 3e3446d

• Fixed merge saves

  zment4

  committed
  6401452

  Copy full SHA for 6401452

• Recalculated needed sectors to read, changed to img

  zment4

  committed
  fc6440f

  Copy full SHA for fc6440f

• Removed output binaries from version control

  zment4

  committed
  e4191e9

  Copy full SHA for e4191e9

• Removed unneede *.bin removal from Makefile

  zment4

  committed
  9fd0dbc

  Copy full SHA for 9fd0dbc

• Added accidentally removed inc sector for LBA reads

  zment4

  committed
  5b9163e

  Copy full SHA for 5b9163e

• Changed incb sector to long to read more than 255 sectors

  zment4

  committed
  e276ca2

  Copy full SHA for e276ca2

• Removed writeToUSB.py

  zment4

  committed
  1d89b68

  Copy full SHA for 1d89b68

• Removed old speaker code

  zment4

  committed
  fc3af47

  Copy full SHA for fc3af47

• Fixed PC speaker backend not pausing on NOTE_NONE

  zment4

  committed
  161a9fb

  Copy full SHA for 161a9fb

• Fixed PC Speaker not pausing

  zment4

  committed
  35a0360

  Copy full SHA for 35a0360

• Update README.md

  zment4

  authored
  10e46ed

  Copy full SHA for 10e46ed

• Fixed missed boot.bin -> boot.img

  zment4

  authored
  6437587

  Copy full SHA for 6437587

• Merge upstream

  zment4

  committed
  a19fadd

  Copy full SHA for a19fadd

• Update sound_speaker.c

  jdah

  authored
  d677bfe

  Copy full SHA for d677bfe

• Merge pull request #57 from zment4/pcspk_pausefix_pr

  Show description for 9441c38
  jdah

  authored
  9441c38

  Copy full SHA for 9441c38

• Small PCSPK update

  jdah

  committed
  50de871

  Copy full SHA for 50de871

• Removed inexistent include

  zment4

  committed
  a8202b0

  Copy full SHA for a8202b0

• Fixed PC Speaker attack

  zment4

  committed
  ff47ffa

  Copy full SHA for ff47ffa

• Fixed missing attack

  zment4

  committed
  8521a18

  Copy full SHA for 8521a18

• Merge branch 'pcspk_pausefix_pr' of github.com:zment4/tetris-os into pcspk_pausefix_pr

  zment4

  committed
  9791a89

  Copy full SHA for 9791a89

• current_note was never set, added

  zment4

  committed
  c9f8e7c

  Copy full SHA for c9f8e7c

• Merge branch 'pcspk_pausefix_pr'

  zment4

  committed
  16dddf1

  Copy full SHA for 16dddf1

• Pause fixed

  zment4

  committed
  d1e5ddf

  Copy full SHA for d1e5ddf

• Pausefix, again

  zment4

  committed
  c929aea

  Copy full SHA for c929aea

• Merge branch 'pcspk_pausefix_pr'

  zment4

  committed
  3a2f320

  Copy full SHA for 3a2f320

• Makefile now selects the correct sound backend with SOUND

  zment4

  committed
  dbe7e9a

  Copy full SHA for dbe7e9a

• Merge pull request #59 from zment4/pcspk_pausefix_pr

  Show description for 3e3a464
  jdah

  authored
  3e3a464

  Copy full SHA for 3e3a464

• Update README.md

  zment4

  authored
  5834719

  Copy full SHA for 5834719

Commits on Apr 30, 2021

• Fix $(IMG) in Makefile

  jdah

  committed
  b76babf

  Copy full SHA for b76babf

• Merge branch 'master' of https://github.com/jdah/tetris-os

  jdah

  committed
  4b07b03

  Copy full SHA for 4b07b03

• Switch QEMU commands to use $(IMG)

  jdah

  committed
  c82d2d1

  Copy full SHA for c82d2d1

Commits on May 5, 2021

• Merge remote-tracking branch 'upstream/master'

  zment4

  committed
  c9ab0ff

  Copy full SHA for c9ab0ff

Commits on Jan 5, 2023

• Update README.md

  zment4

  authored
  4ff18f6

  Copy full SHA for 4ff18f6