Commit graph

57 commits

Author SHA1 Message Date
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
FloppyDiskDrive
753a880c0d Revert "Added a buggy dynamically changing infobox (this will most likely not work)"
This reverts commit 23791cf63b.
2017-09-27 20:34:58 -05:00
John T
0326d646b0 test 2017-09-27 21:26:49 -04:00
FloppyDiskDrive
23791cf63b Added a buggy dynamically changing infobox (this will most likely not work) 2017-09-27 20:00:17 -05:00
John
05740746dd Actually added the new gitignore
Should fix the stupid issues where it uploaded the .vs dir
2017-09-27 20:50:08 -04:00
John T
52dc6e02dd added some stuff to the gitignore 2017-09-27 20:46:40 -04:00
John T
1b28809aad wtf is this 2017-09-27 20:37:26 -04:00
FloppyDiskDrive
1c2bf50041 Commented in the Engine project 2017-09-27 19:36:09 -05:00
John T
f61f67c6d7 Merge branch 'master' of https://github.com/ShiftOS-Rewind/ShiftOS 2017-09-27 18:32:27 -04:00
John T
a25baf0820 added desktop and some small additions and changes to shiftwm 2017-09-27 18:32:16 -04:00
FloppyDiskDrive
92d7a143ca Revert "Began work on a crappy Skinning Engine; Shifter is removed until completed."
This reverts commit 9c24aebd30.
2017-09-27 17:12:44 -05:00
FloppyDiskDrive
9c24aebd30 Began work on a crappy Skinning Engine; Shifter is removed until completed. 2017-09-26 19:09:21 -05:00
FloppyDiskDrive
dc7533184a Added titlebar button hughlighting / pushing 2017-09-25 17:49:40 -05:00
AShifter
f5004702c4 Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master' 2017-09-25 09:35:03 -06:00
FloppyDiskDrive
44d8d5c507 Added a clunky Shifter, made the wm look nicer 2017-09-24 21:06:41 -05:00
AShifter
f77811b2a7 Merge remote-tracking branch 'refs/remotes/ShiftOS-Rewind/master' 2017-09-24 16:40:36 -06:00
IBMPCDOS5
600ce82222 Added the MIT License 2017-09-24 17:27:27 -05:00
IBMPCDOS5
6d14d4a436 Set theme jekyll-theme-midnight 2017-09-24 17:24:41 -05:00
IBMPCDOS5
3e91cdecbb Delete LICENSE 2017-09-24 17:21:49 -05:00
FloppyDiskDrive
4589c10a53 Updated README.MD 2017-09-24 17:13:15 -05:00
FloppyDiskDrive
f5a78ea416 Fully added the infobox 2017-09-24 16:55:03 -05:00
Nayab
59721924f1 Added small text change
I'm useful c:
2017-09-24 16:08:48 -05:00
IBMPCDOS5
554a97739a Merge pull request #5 from AShifter/master
Update WM
2017-09-24 15:10:21 -05:00
AShifter
0a552e3954 Update WM
It's pretty much done. Pair with DE, and serve hot.
2017-09-24 13:56:11 -06:00
IBMPCDOS5
061ce54709 Merge pull request #4 from AShifter/master
Add proper WM and Remove old source
2017-09-24 13:34:14 -05:00
AShifter
9107510c49 Add proper WM and Remove old source
Added a proper, working WM. I also got rid of the old source as we could
just make a new repo for that.
2017-09-24 12:32:50 -06:00
Nayab
2992686ec7 Merge pull request #3 from jtsshieh/master
Horrible person that made me go out of my way to fix his stupid issue…
2017-09-23 20:37:29 -05:00