aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-11-18Delete storage.idejtsshieh
2017-11-18Merge pull request #15 from Alex-TIMEHACK/masterjtsshieh
Fully working command handler (Alex)
2017-11-18Fixed tiny caret issue.Alex-TIMEHACK
2017-11-18I don't know WHAT git did but I fixed it.Alex-TIMEHACK
2017-11-18Fixed fork?Alex-TIMEHACK
2017-11-18Updated my fork!Alex-TIMEHACK
Conflicts: ShiftOS.Engine/ShiftOS.Engine.csproj ShiftOS.Engine/Terminal/Commands/Hello.cs ShiftOS.Engine/Terminal/TerminalBackend.cs ShiftOS.Engine/Terminal/TerminalCommand.cs ShiftOS.Main/ShiftOS.Main.csproj ShiftOS.Main/ShiftOS/Apps/Terminal.cs ShiftOS.Main/ShiftOS/Desktop.cs
2017-11-18Removed Input() stuff!Alex-TIMEHACK
2017-11-17Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'AShifter
2017-11-11Only 1/4 broken ShiftFS and WIP File SkimmerJohn T
2017-11-05Added a half-complete ShiftFS and did some code cleanupJohn T
2017-11-05Began to add textpad, extra functionality to the infobox templateFloppyDiskDrive
2017-10-15It's broken.Alex-TIMEHACK
2017-10-15added the dang storage.ide file to the gitignoreFloppyDiskDrive
2017-10-15Tiny change - github bugging outAlex-TIMEHACK
2017-10-15Merge pull request #13 from AShifter/masterAShifter
Master
2017-10-15Removed Magick.NET and added .gitignoreAShifter
Removed Magick.NET and added a .gitignore to ignore storage.ide (visual studio file, someitmes causes merge conflicts).
2017-10-15Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'AShifter
2017-10-15Merge pull request #12 from AShifter/masterAShifter
Master
2017-10-15Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'AShifter
2017-10-14Finish Skinning and Serialize Current SkinAShifter
Almost fixed the contect button glitch and i'm using Newtonsoft.JSON to save skins!
2017-10-14Merge pull request #10 from Alex-TIMEHACK/masterIBMPCDOS5
Terminal. With a little example command.
2017-10-14Improved example commandAlex-TIMEHACK
2017-10-14YOY terminalAlex-TIMEHACK
2017-10-14Updated forkAlex-TIMEHACK
Conflicts: .vs/ShiftOS/v15/sqlite3/storage.ide
2017-10-14Merge pull request #9 from AShifter/masterAShifter
Master
2017-10-14Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'AShifter
2017-10-14More SkinningAShifter
You can now set a skin and it will persist throughout all windows - though there is a bug where hovering over a context button will change it's color and leaving it will change it back to black. Will fix soon:tm:.
2017-10-14Done like a few things but I need to update so....Alex-TIMEHACK
2017-10-03Merge pull request #8 from AShifter/masterAShifter
Master
2017-10-03Adding basic skinningAShifter
Open up the shifter, choose a skin and hit Apply. I ll work on it more later.
2017-10-01Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'AShifter
2017-10-01Merge pull request #7 from AShifter/masterAShifter
Master
2017-10-01whomst'veAShifter
2017-10-01Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'AShifter
2017-10-01Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'AShifter
2017-10-01Merge pull request #6 from AShifter/masterAShifter
Master
2017-10-01Shifting is workingAShifter
owow
2017-10-01Revert "Added a fuckton of changes"FloppyDiskDrive
This reverts commit c23e42cc396d4fc55799d659bae2149cc183dbf6.
2017-10-01Added a fuckton of changesFloppyDiskDrive
New infobox icons, new WIP port of Snakey, we are getting closer to a pre-alpha!
2017-10-01Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master'AShifter
2017-09-27Merge branch 'master' of https://github.com/ShiftOS-Rewind/ShiftOSFloppyDiskDrive
2017-09-27Revert "Added a buggy dynamically changing infobox (this will most likely ↵FloppyDiskDrive
not work)" This reverts commit 23791cf63b61a2a922e80e5077ec5a3ad0ce7c53.
2017-09-27testJohn T
2017-09-27Added a buggy dynamically changing infobox (this will most likely not work)FloppyDiskDrive
2017-09-27Actually added the new gitignoreJohn
Should fix the stupid issues where it uploaded the .vs dir
2017-09-27added some stuff to the gitignoreJohn T
2017-09-27wtf is thisJohn T
2017-09-27Commented in the Engine projectFloppyDiskDrive
2017-09-27Merge branch 'master' of https://github.com/ShiftOS-Rewind/ShiftOSJohn T
2017-09-27added desktop and some small additions and changes to shiftwmJohn T