diff options
| author | lempamo <[email protected]> | 2017-02-25 15:19:16 -0500 |
|---|---|---|
| committer | lempamo <[email protected]> | 2017-02-25 15:19:16 -0500 |
| commit | 4c1824635badbff94762c960513c991b060db0d7 (patch) | |
| tree | b123dc6d4a78676de2c7929641aa1c553edf5916 /ShiftOS.WinForms | |
| parent | ce0819e257497d9307a21770bb80423bbcd53248 (diff) | |
| parent | a398d348dd1d8cd11aa0d2f69e0fa6d2265f2a0a (diff) | |
| download | shiftos_thereturn-4c1824635badbff94762c960513c991b060db0d7.tar.gz shiftos_thereturn-4c1824635badbff94762c960513c991b060db0d7.tar.bz2 shiftos_thereturn-4c1824635badbff94762c960513c991b060db0d7.zip | |
Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
Diffstat (limited to 'ShiftOS.WinForms')
| -rw-r--r-- | ShiftOS.WinForms/Applications/Artpad.cs | 2 | ||||
| -rw-r--r-- | ShiftOS.WinForms/Applications/Pong.cs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ShiftOS.WinForms/Applications/Artpad.cs b/ShiftOS.WinForms/Applications/Artpad.cs index c3b717b..6c1bc1c 100644 --- a/ShiftOS.WinForms/Applications/Artpad.cs +++ b/ShiftOS.WinForms/Applications/Artpad.cs @@ -1686,7 +1686,7 @@ namespace ShiftOS.WinForms.Applications { case "Bold": drawtextfontstyle = FontStyle.Bold; - break; + break; //BREAK COME ON HOO OH YEAHE CHECK IT OUT OH YEAH LETS GO SCRUATCHO HEY case "Italic": drawtextfontstyle = FontStyle.Italic; break; diff --git a/ShiftOS.WinForms/Applications/Pong.cs b/ShiftOS.WinForms/Applications/Pong.cs index f7153a1..af1e156 100644 --- a/ShiftOS.WinForms/Applications/Pong.cs +++ b/ShiftOS.WinForms/Applications/Pong.cs @@ -42,6 +42,7 @@ namespace ShiftOS.WinForms.Applications [DefaultIcon("iconPong")] public partial class Pong : UserControl, IShiftOSWindow { + //I can assure you guaranteed that there is an acorn somewhere, in this place, and the sailors are looking for it int xVel = 7; int yVel = 8; int computerspeed = 8; |