shiftos-archive/ShiftOS-Rewind
1
0
Fork 0
mirror of https://github.com/ShiftOS-Rewind/ShiftOS.git synced 2025-01-22 17:52:15 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
83 commits 1 branch 0 tags 41 MiB
Commit graph

83 commits

This branch
This branch
All branches
Author SHA1 Message Date
FloppyDiskDrive
98f6f02993 yay updates 2017-11-18 17:32:11 -06:00
AShifter
3f9ad02ca1
Merge pull request #17 from AShifter/master 
Master
 2017-11-18 13:37:46 -07:00
AShifter
11bb4cea77 desktop 
someone needs to fix it but it's a thing now
 2017-11-18 13:37:20 -07:00
AShifter
14036dbe5d Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master' 2017-11-18 11:53:07 -07:00
FloppyDiskDrive
b61561692c Merge branch 'master' of https://github.com/ShiftOS-Rewind/ShiftOS 2017-11-18 12:29:34 -06:00
FloppyDiskDrive
b737aa8ded new cmd and stuff 2017-11-18 12:29:15 -06:00
AShifter
55ac320b52
Merge pull request #16 from AShifter/master 
Master
 2017-11-18 11:04:51 -07:00
AShifter
ad5f166619 added WHOA support for skins 
The game supports WHOA skins and should now build properly.
 2017-11-18 11:04:01 -07:00
AShifter
b4a8a646b1 Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master' 2017-11-18 10:04:42 -07:00
jtsshieh
cc734557de
Delete storage.ide 2017-11-18 12:00:19 -05:00
jtsshieh
ce700260e6
Merge pull request #15 from Alex-TIMEHACK/master 
Fully working command handler (Alex)
 2017-11-18 11:56:23 -05:00
Alex-TIMEHACK
c0400bc229 Fixed tiny caret issue. 2017-11-18 16:48:19 +00:00
Alex-TIMEHACK
179ec19e6b I don't know WHAT git did but I fixed it. 2017-11-18 16:46:45 +00:00
Alex-TIMEHACK
6faabfbbd8 Fixed fork? 2017-11-18 16:33:30 +00:00
Alex-TIMEHACK
4037be53b2 Updated my fork! 
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-18 16:29:54 +00:00
Alex-TIMEHACK
65b7ac2b8c Removed Input() stuff! 2017-11-18 16:09:54 +00:00
AShifter
ebdc09fe67 Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master' 2017-11-17 20:29:46 -07:00
John T
97722fbe9d Only 1/4 broken ShiftFS and WIP File Skimmer 2017-11-11 08:53:55 -05:00
John T
a10440a45c Added a half-complete ShiftFS and did some code cleanup 2017-11-05 18:47:46 -05:00
FloppyDiskDrive
019da5b9eb Began to add textpad, extra functionality to the infobox template 2017-11-05 14:13:06 -06:00
Alex-TIMEHACK
b2f7322f30 It's broken. 2017-10-15 20:25:37 +01:00
FloppyDiskDrive
70ccdd214e added the dang storage.ide file to the gitignore 2017-10-15 11:41:36 -05:00
Alex-TIMEHACK
7efdde5832 Tiny change - github bugging out 2017-10-15 17:01:17 +01:00
AShifter
f590c5f51b Merge pull request #13 from AShifter/master 
Master
 2017-10-15 08:48:11 -06:00
AShifter
1d0b393e69 Removed Magick.NET and added .gitignore 
Removed Magick.NET and added a .gitignore to ignore storage.ide (visual
studio file, someitmes causes merge conflicts).
 2017-10-15 08:47:24 -06:00
AShifter
b533b99874 Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master' 2017-10-15 08:39:47 -06:00
AShifter
db4a54dcec Merge pull request #12 from AShifter/master 
Master
 2017-10-15 08:36:45 -06:00
AShifter
ed1d876aaa Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master' 2017-10-15 08:33:26 -06:00
AShifter
9c31cf53be Finish Skinning and Serialize Current Skin 
Almost fixed the contect button glitch and i'm using Newtonsoft.JSON to
save skins!
 2017-10-14 21:45:59 -06:00
IBMPCDOS5
b0fb6ed50e Merge pull request #10 from Alex-TIMEHACK/master 
Terminal. With a little example command.
 2017-10-14 13:44:48 -05:00
Alex-TIMEHACK
9952cfd7eb Improved example command 2017-10-14 18:47:54 +01:00
Alex-TIMEHACK
09215a05dd YOY terminal 2017-10-14 18:42:11 +01:00
Alex-TIMEHACK
5d1004015d Updated fork 
Conflicts:
	.vs/ShiftOS/v15/sqlite3/storage.ide
 2017-10-14 16:31:58 +01:00
AShifter
db714a32b9 Merge pull request #9 from AShifter/master 
Master
 2017-10-14 09:28:26 -06:00
AShifter
c2f59d0b9d Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master' 2017-10-14 09:27:50 -06:00
AShifter
e9a8a6df70 More Skinning 
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™️.
 2017-10-14 09:27:27 -06:00
Alex-TIMEHACK
59a7eabcbe Done like a few things but I need to update so.... 2017-10-14 16:23:41 +01:00
AShifter
6f0e416011 Merge pull request #8 from AShifter/master 
Master
 2017-10-03 20:45:18 -06:00
AShifter
385d800066 Adding basic skinning 
Open up the shifter, choose a skin and hit Apply. I
ll work on it more later.
 2017-10-03 20:44:54 -06:00
AShifter
eb54509f16 Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master' 2017-10-01 11:15:23 -06:00
AShifter
5077745a2c Merge pull request #7 from AShifter/master 
Master
 2017-10-01 10:00:41 -06:00
AShifter
b52e503209 whomst've 2017-10-01 10:00:17 -06:00
AShifter
e81cc06e5a Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master' 2017-10-01 09:59:54 -06:00
AShifter
bc4894d524 Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master' 2017-10-01 09:53:31 -06:00
AShifter
fa6be30156 Merge pull request #6 from AShifter/master 
Master
 2017-10-01 09:53:13 -06:00
AShifter
b45df71168 Shifting is working 
owow
 2017-10-01 09:52:36 -06:00
FloppyDiskDrive
aa44f27eab Revert "Added a fuckton of changes" 
This reverts commit c23e42cc39.
 2017-10-01 09:52:26 -05:00
FloppyDiskDrive
c23e42cc39 Added a fuckton of changes 
New infobox icons, new WIP  port of Snakey, we are getting closer to a
pre-alpha!
 2017-10-01 09:49:14 -05:00
AShifter
46fe7eb709 Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master' 2017-10-01 08:23:50 -06:00
FloppyDiskDrive
f2ed0c673c Merge branch 'master' of https://github.com/ShiftOS-Rewind/ShiftOS 2017-09-27 20:35:08 -05:00