Commit graph

947 commits

Author SHA1 Message Date
william341
57c8eb3904 gahhhh they were just slightly offcenter and it triggers me 2017-05-06 18:50:37 -07:00
william341
5fbf30dbc0 fixed textlogin 2017-05-06 17:27:39 -07:00
Michael
1d4df69ee9 Fix merge conflicts. 2017-05-06 19:57:59 -04:00
william341
d8004332b6 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ShiftOS_TheReturn/SaveSystem.cs
2017-05-06 16:49:05 -07:00
william341
7d744a64d0 weew new boot sequence 2017-05-06 16:48:08 -07:00
Michael
d0d193bb1b GUI-based login screen with skinning! 2017-05-06 19:25:05 -04:00
william341
b82dfc16ed Title text actually centers on resize
(only if your text is set to center)
2017-05-06 16:11:09 -07:00
william341
7d24f19716 oh god 2017-05-06 14:56:45 -07:00
william341
147cd66b39 label 2 is annoy 2017-05-06 14:35:12 -07:00
william341
2424b91d51 fixed a bug using Try-Catch Brand Duct Tape 2017-05-06 14:32:24 -07:00
Michael
a4a39d9895 user list 2017-05-06 12:45:47 -04:00
Michael
2d8831c29c fix highscore glitch 2017-05-06 12:36:45 -04:00
Michael
e131f72a9b Fix the file skimmer pins. 2017-05-06 12:16:41 -04:00
Aren
c56b59a8a3 Stop pong from ending early.
Pong used to end early because the game would check if secondsleft was 1 after removing one, meaning it would be at 2. Now it checks if secondsleft is 0 which should resolve the issue.
2017-05-06 17:41:49 +02:00
Michael
57277a01d6 Most of TriWrite is implemented. 2017-05-06 09:44:47 -04:00
AShifter
66ea2cf2fd Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-05-05 16:38:44 -06:00
Michael VanOverbeek
ba585e7614 Merge pull request #121 from AShifter/master
actually fix something
2017-05-05 12:43:37 -04:00
AShifter
6eb418dec8 actually fix file skimmer
don't copy dat floppy
2017-05-05 10:34:46 -06:00
AShifter
a7fff72826 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-05-05 10:16:29 -06:00
Michael VanOverbeek
9a2373ec42 Merge pull request #119 from AShifter/master
fix advanced fs
2017-05-05 11:54:14 -04:00
Michael
bbc5a738b1 shiftfs permissions 2017-05-05 11:52:43 -04:00
Michael
39b3b4c62c admin.set_acl and other things 2017-05-05 11:34:17 -04:00
AShifter
13b35b32c2 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-05-04 19:01:03 -06:00
Michael
a57b5855f5 fix blank sysname bug 2017-05-04 16:41:17 -04:00
Michael
3e77916fd2 Fix CRITICAL Pong MP bugs. 2017-05-04 16:32:25 -04:00
Michael
41da0b2500 fix bug with multiplayer ui 2017-05-04 16:06:32 -04:00
Michael
e43d47007e More Multiplayer Pong work. 2017-05-04 15:00:06 -04:00
Michael VanOverbeek
3665e07361 Allow forwarding of messages to other clients. 2017-05-03 18:10:18 +00:00
Michael
24f04e3e12 Basic multiplayer pong. 2017-05-03 11:51:56 -04:00
Michael
53631ad42d Fix highscore list 2017-05-03 09:44:34 -04:00
Rylan/wowmom98
3488ac86fb did something to get more codepoints 2017-05-02 22:12:00 -04:00
AShifter
2fede89938 Catch invalid skin file
I accidentally tried to load 0.0.x skin file, and it crashed. Added a
try/catch around it and if caught, give an infobox saying "This skin is
not compatible with this version of ShiftOS.".
2017-05-02 20:08:43 -06:00
AShifter
5b8d350af0 fix advance file skimmer
it looks better
2017-05-02 19:43:58 -06:00
AShifter
b06801028a Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-05-02 19:43:15 -06:00
Rylan/wowmom98
8381c825b1 fixed dividing by zero 2017-05-02 21:38:52 -04:00
Michael VanOverbeek
49eff9f7ef Merge pull request #118 from AShifter/master
Start working on Advanced File Skimmer
2017-05-02 21:35:28 -04:00
AShifter
bbb21a1b32 start advanced file skimmer
it's cool!
2017-05-02 19:26:59 -06:00
Rylan/wowmom98
c59dcc824d WHY THE FUCK ISNT OPEN SAVE AND NEW WORKING 2017-05-02 21:07:07 -04:00
william341
14c5ba260f fix some nres 2017-05-02 17:52:10 -07:00
Rylan/wowmom98
596db1d5bc added empty tools bar 2017-05-02 20:49:13 -04:00
Rylan/wowmom98
27389413f9 unfucked the titlebar 2017-05-02 20:36:12 -04:00
Rylan/wowmom98
1028850444 centered ui of TriWrite 2017-05-02 20:29:33 -04:00
Michael
99eede4118 pong highscores are semi-fixed 2017-05-02 17:11:31 -04:00
Rylan/wowmom98
0c2f232911 TriWrite is so far now a TextPad clone 2017-05-01 17:12:16 -04:00
Michael
a41f947d8a my hands are typing words\ 2017-05-01 17:02:02 -04:00
Michael
f26bab8310 create user list if it is null 2017-05-01 16:13:21 -04:00
Michael VanOverbeek
f893cbf3a1 Fix user persistence bug 2017-05-01 20:09:51 +00:00
Michael
367e2dd641 User management commands. 2017-05-01 16:06:50 -04:00
AShifter
d30eb35c97 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-05-01 13:37:48 -06:00
Michael
7532df7075 Replace most instances of "CurrentSave.Username" 2017-05-01 15:23:46 -04:00