aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-02-26Merge remote-tracking branch 'refs/remotes/shiftos-game/master'lempamo
2017-02-26make most recent notification appear at topMichael
2017-02-26working so hardlempamo
2017-02-26Merge remote-tracking branch 'refs/remotes/shiftos-game/master'lempamo
2017-02-26Merge remote-tracking branch 'refs/remotes/shiftos-game/master'lempamo
2017-02-26no not 5x, 3xwowmom98
2017-02-26Increase shiftletters payout (and shiftnet sub stuff)Michael
2017-02-26Merge remote-tracking branch 'origin/master'wowmom98
# Conflicts: # ShiftOS.WinForms/Resources/Shiftorium.txt
2017-02-26rebalences bc people yelled at me to do themwowmom98
2017-02-26Merge remote-tracking branch 'refs/remotes/shiftos-game/master'lempamo
2017-02-26fix bug with string messagesMichael VanOverbeek
2017-02-26more shiftsweeper stuffslempamo
2017-02-26Merge remote-tracking branch 'refs/remotes/shiftos-game/master'lempamo
2017-02-26server-side for shiftnet subscriptionsMichael VanOverbeek
2017-02-26setting up minefieldlempamo
2017-02-26Merge remote-tracking branch 'refs/remotes/shiftos-game/master'lempamo
2017-02-26shiftorium does not need to have a exceptionwilliam341
as a result you can now create new saves
2017-02-26more fixesMichael VanOverbeek
2017-02-26ss things 2lempamo
2017-02-26ShiftSweeper basicslempamo
2017-02-26Merge remote-tracking branch 'refs/remotes/shiftos-game/master'lempamo
2017-02-26Desktop panel RGB 1,0,1 transparency.Michael
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-26Merge remote-tracking branch 'refs/remotes/shiftos-game/master'lempamo
2017-02-26attempt transparency fixMichael
2017-02-26Merge remote-tracking branch 'refs/remotes/shiftos-game/master'lempamo
2017-02-26OCDAren
"You have: 1 lives left!"
2017-02-26more beta 1.2 stuffMichael
2017-02-26shiftletters improvementsMichael
2017-02-26Merge pull request #1 from shiftos-game/masterlempamo
merge
2017-02-26HEY STUPIDMichael
2017-02-26Merge pull request #96 from lempamo/masterMichael VanOverbeek
extra shiftletters stuff
2017-02-26Merge branch 'master' into masterMichael VanOverbeek
2017-02-25Color picker no longer british, more color picker ui fixes, and possible fix ↵wowmom98
to issue #97
2017-02-25massive shiftletters improvementsMichael
2017-02-25I've been coding ShiftOS for years. Silly me.Michael
2017-02-25Add about box and fix desktop panel transparency bugMichael
2017-02-25removed numberslempamo
2017-02-25forgot thislempamo
2017-02-25Added custom wordlist feature to shiftletterslempamo
2017-02-25Merge pull request #95 from lempamo/masterwilliam341
icons and stuffs
2017-02-25Merge remote-tracking branch 'refs/remotes/shiftos-game/master'lempamo
2017-02-25infernal noises from hell (aka DooMwilliam341
2017-02-25kek i should push diswilliam341
2017-02-25Merge remote-tracking branch 'refs/remotes/shiftos-game/master'lempamo
2017-02-25ffswilliam341
2017-02-25Basic AudioPlayerlempamo
planning to use naudio api for this. thoughts?
2017-02-25Merge remote-tracking branch 'refs/remotes/shiftos-game/master'lempamo
2017-02-25fixed iconslempamo
2017-02-25Revert "Revert "fix notification mark as read not updating""william341
This reverts commit bd41ad18fe55fcd5bcba9fdbd0bb2c86edd01411, reversing changes made to c4f855f3a559195d7b683ec4b96a18c42ce7b5fb.
2017-02-25ShiftLetters iconlempamo