Commit graph

640 commits

Author SHA1 Message Date
lempamo
57453a13e0 do more snake stuffs 2017-02-27 18:25:23 -05:00
lempamo
7525f0a0d0 Set up grid system for snakey 2017-02-27 16:32:29 -05:00
Michael
4dbe7bd2c6 Chatlogging (client)
MUD Chat now requests last 50 lines of the chat log when the user joins.
2017-02-27 16:31:55 -05:00
Michael VanOverbeek
69ef3ba644 Chat logging. 2017-02-27 21:19:37 +00:00
Aren
f90247001e Why was Snakey unquittable? ;) 2017-02-27 19:03:40 +01:00
lempamo
43364450a2 Snakey basics 2017-02-27 12:08:50 -05:00
lempamo
8ceef636cd Merge pull request #100 from lempamo/master
shiftsweeper prettied up
2017-02-27 10:50:00 -05:00
lempamo
83f87a3893 Merge remote-tracking branch 'refs/remotes/shiftos-game/master'
# Conflicts:
#	ShiftOS.WinForms/Applications/ShiftSweeper.Designer.cs
2017-02-27 09:56:31 -05:00
lempamo
750ee14486 made shiftsweeper look a bit nicer 2017-02-27 09:53:39 -05:00
william341
496b0cbf86 tweaks here and there 2017-02-26 21:16:11 -07:00
william341
843143b86a Merge pull request #98 from lempamo/master
shiftsweeper
2017-02-26 19:58:03 -07:00
lempamo
ba1519e3ce LIcenses 2017-02-26 21:54:41 -05:00
lempamo
e1ddab3900 finished shiftsweeper 2017-02-26 21:37:06 -05:00
lempamo
c37f4a7874 almost there 2017-02-26 20:36:01 -05:00
lempamo
dd65c54eda by george, i think ive finished it! 2017-02-26 18:41:41 -05:00
lempamo
8f72641e2a Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-26 18:22:53 -05:00
Michael
e9acecf0de make most recent notification appear at top 2017-02-26 17:50:57 -05:00
lempamo
077e0e5271 working so hard 2017-02-26 17:31:19 -05:00
lempamo
bf67e0c7b5 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-26 16:07:44 -05:00
lempamo
f02a07b02f Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-26 16:01:30 -05:00
wowmom98
868a549292 no not 5x, 3x 2017-02-26 15:59:55 -05:00
Michael
82a5ca296b Increase shiftletters payout (and shiftnet sub stuff) 2017-02-26 15:57:09 -05:00
wowmom98
ec61f5dfe9 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	ShiftOS.WinForms/Resources/Shiftorium.txt
2017-02-26 15:52:08 -05:00
wowmom98
2809d9c76d rebalences bc people yelled at me to do them 2017-02-26 15:45:20 -05:00
lempamo
705d1daefa Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-26 15:15:38 -05:00
Michael VanOverbeek
0e3362e8e3 fix bug with string messages 2017-02-26 20:09:32 +00:00
lempamo
c49c7ac9c6 more shiftsweeper stuffs 2017-02-26 15:02:40 -05:00
lempamo
7ba86e65c4 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-26 15:02:19 -05:00
Michael VanOverbeek
1c3ddeaeda server-side for shiftnet subscriptions 2017-02-26 19:51:15 +00:00
lempamo
4fba2d86af setting up minefield 2017-02-26 13:36:01 -05:00
lempamo
ca703e314d Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-26 13:35:39 -05:00
william341
337d0ac1dd shiftorium does not need to have a exception
as a result you can now create new saves
2017-02-26 11:14:49 -07:00
Michael VanOverbeek
a05cebba57 more fixes 2017-02-26 18:10:04 +00:00
lempamo
f765e3ef33 ss things 2 2017-02-26 12:09:52 -05:00
lempamo
281382f120 ShiftSweeper basics 2017-02-26 11:52:38 -05:00
lempamo
e816cabaf7 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-26 11:45:51 -05:00
Michael
83542a4b81 Desktop panel RGB 1,0,1 transparency.
Finally. After **YEARS** of research and development by both me and
Philip Adams, and other ShiftOS devs, I was the one who finally
implemented it.
2017-02-26 11:43:26 -05:00
lempamo
8d9be8e167 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-26 11:33:01 -05:00
Michael
de6a5ee4ac attempt transparency fix 2017-02-26 11:17:35 -05:00
lempamo
8756989633 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-26 10:50:03 -05:00
Aren
e2284a7bc5 OCD
"You have: 1 lives left!"
2017-02-26 16:47:47 +01:00
Michael
78a5a4281c more beta 1.2 stuff 2017-02-26 10:24:27 -05:00
Michael
8d72f2c4d4 shiftletters improvements 2017-02-26 10:11:58 -05:00
lempamo
d1469e5f6b Merge pull request #1 from shiftos-game/master
merge
2017-02-26 09:00:15 -05:00
Michael
46d53ae128 HEY STUPID 2017-02-26 08:47:03 -05:00
Michael VanOverbeek
dcae8927d1 Merge pull request #96 from lempamo/master
extra shiftletters stuff
2017-02-26 08:37:29 -05:00
Michael VanOverbeek
e1e0d142dc Merge branch 'master' into master 2017-02-26 08:37:06 -05:00
wowmom98
3a46014d65 Color picker no longer british, more color picker ui fixes, and possible fix to issue #97 2017-02-25 22:25:35 -05:00
Michael
4e00fc827d massive shiftletters improvements 2017-02-25 21:58:57 -05:00
Michael
973512118b I've been coding ShiftOS for years. Silly me. 2017-02-25 21:03:45 -05:00