aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2016-07-27Update Credits.txtHEADmasterCarver Harrison
2016-07-27Update Credits.txtCarver Harrison
2016-07-25Update Not Foundwilliam341
2016-07-25Merge branch 'master' of https://github.com/MichaelTheShifter/ShiftOS-C-william341
2016-07-25Create .gitignorewilliam341
2016-07-25Merge remote-tracking branch 'origin/master'william341
# Conflicts: # source/WindowsFormsApplication1/bin/Debug/ShiftOS.exe # source/WindowsFormsApplication1/bin/Debug/ShiftOS.pdb # source/WindowsFormsApplication1/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache # source/WindowsFormsApplication1/obj/Debug/ShiftOS.Properties.Resources.resources # source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.FileListAbsolute.txt # source/WindowsFormsApplication1/obj/Debug/ShiftOS.csproj.GenerateResource.Cache # source/WindowsFormsApplication1/obj/Debug/ShiftOS.csprojResolveAssemblyReference.cache # source/WindowsFormsApplication1/obj/Debug/ShiftOS.exe # source/WindowsFormsApplication1/obj/Debug/ShiftOS.pdb
2016-07-25OooOOO easter eggwilliam341
2016-07-25Fix Cheats and some designer stuffMichael VanOverbeek
2016-07-25Merge pull request #17 from MichaelTheShifter/shiftui_integrationMichael VanOverbeek
Shiftui integration
2016-07-25Merge remote-tracking branch 'refs/remotes/origin/master' into ↵Michael VanOverbeek
shiftui_integration
2016-07-25Something.Michael VanOverbeek
//I have no idea what this does. - Michael
2016-07-25#17 revert shifter UI to old UI.Michael VanOverbeek
Gonna add the new UI when I know more System.Reflection stuff.
2016-07-24fix borders biachwilliam341
2016-07-24pt2Carver Harrison
2016-07-24It worksCarver Harrison
2016-07-24Merge branch 'shiftui_integration' of ↵Carver Harrison
https://github.com/MichaelTheShifter/ShiftOS-C- into shiftui_integration
2016-07-24Fixed 300 ErrorsCarver Harrison
2016-07-24editCarver Harrison
2016-07-24HOLY **** THATS A LOT OFF ADDIITIONSCarver Harrison
2016-07-24quick file changewilliam341
2016-07-24Added Hashing API and Fixed BugsCarver Harrison
2016-07-23Update API.csv1.0.0-alpha1v0.1.2-alpha3Carver Harrison
2016-07-23It's all smooth scrolling from here!william341
2016-07-23Update README.mdcarverh
2016-07-23Update README.mdcarverh
2016-07-23Update README.mdwilliam341
2016-07-23Less retarded terminal printing + Fix scrollingwilliam341
2016-07-23Fix knowledge inputwilliam341
2016-07-23Fix TextPadwilliam341
2016-07-23Fix Info box.william341
2016-07-23Fix Artpad cancelwilliam341
2016-07-23Fix pongwilliam341
2016-07-23Re Implemented Cheatswilliam341
2016-07-23Shiftorium fully functionalwilliam341
2016-07-23Fixed shiftoriumwilliam341
2016-07-23WOOwilliam341
2016-07-23Update README.mdwilliam341
2016-07-23Terminal tweaks and no more beepingwilliam341
2016-07-23I dun derped.MichaelTheShifter
2016-07-23Begin backporting commitswilliam341
2016-07-23Attempt to fix panel buttons.MichaelTheShifter
2016-07-23DISCLAIMER IN ALL CAPSwilliam341
JUST SO NO ONE SUES US
2016-07-23Fix panel buttonsMichaelTheShifter
2016-07-23Better Load iconwilliam341
2016-07-23lederpComputeLinux
2016-07-23Remove Philp's personal stuffComputeLinux
2016-07-23Fix somethingComputeLinux
2016-07-23Merge pull request #16 from ComputeLinux/masterwilliam341
I am a major derp
2016-07-23I am a major derpComputeLinux
2016-07-23Merge pull request #15 from ComputeLinux/masterwilliam341
Commiting something