Skip to content
This repository has been archived by the owner on Jan 4, 2023. It is now read-only.

Commit

Permalink
Merging changes from v1.9.7.1 branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
jessefreeman committed Apr 12, 2020
2 parents 0e69808 + 4f40cca commit 7d6050a
Show file tree
Hide file tree
Showing 314 changed files with 177,099 additions and 1,656 deletions.
1 change: 1 addition & 0 deletions Disks/PixelVisionOS/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.DS_Store
51 changes: 51 additions & 0 deletions Disks/PixelVisionOS/License.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
Microsoft Public License (MS-PL)

This license governs use of the accompanying software. If you use the software, you accept this
license. If you do not accept the license, do not use the software.

1. Definitions

The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning
here as under U.S. copyright law.

A "contribution" is the original software, or any additions or changes to the software.

A "contributor" is any person that distributes its contribution under this license.

"Licensed patents are a contributor's patent claims that read directly on its contribution.

2. Grant of Rights

(A) Copyright Grant- Subject to the terms of this license, including the license conditions and
(limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free
(copyright license to reproduce its contribution, prepare derivative works of its contribution, and
(distribute its contribution or any derivative works that you create.

(B) Patent Grant- Subject to the terms of this license, including the license conditions and
(limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free
(license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or
(otherwise dispose of its contribution in the software or derivative works of the contribution in
(the software.

3. Conditions and Limitations

(A) No Trademark License- This license does not grant you rights to use any contributors' name,
(logo, or trademarks.

(B) If you bring a patent claim against any contributor over patents that you claim are infringed by
(the software, your patent license from such contributor to the software ends automatically.

(C) If you distribute any portion of the software, you must retain all copyright, patent, trademark,
(and attribution notices that are present in the software.

(D) If you distribute any portion of the software in source code form, you may do so only under this
(license by including a complete copy of this license with your distribution. If you distribute any
(portion of the software in compiled or object code form, you may only do so under a license that
(complies with this license.

(E) The software is licensed "as-is." You bear the risk of using it. The contributors give no
(express warranties, guarantees or conditions. You may have additional consumer rights under your
(local laws which this license cannot change. To the extent permitted under your local laws, the
(contributors exclude the implied warranties of merchantability, fitness for a particular purpose
(and non-infringement.

21 changes: 21 additions & 0 deletions Disks/PixelVisionOS/README.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
Welcome to Pixel Vision OS

Are you a Fantasy Club
Member? Join today for
free to access the demos,
docs, tutorials, artpacks,
and more.

You'll find everything you
need to start making your
own PV8 games!

Visit PixelVision8.com to
create your new account.

You can also join the
community on the official
discord server by visiting
discord.gg/pixelvision8 or
follow on twitter at
@pixelvision8
6 changes: 6 additions & 0 deletions Disks/PixelVisionOS/System/Libs/attach-debugger.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
print("Waiting for debugger")

connectDebugger = true

debuggerTime = 0
debuggerDelay = 10

0 comments on commit 7d6050a

Please sign in to comment.