475 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
Michael	fed3801060	Add about box and fix desktop panel transparency bug	2017-02-25 20:54:43 -05:00
lempamo	ab8c5c6f46	removed numbers	2017-02-25 20:34:17 -05:00
lempamo	8c679e4650	forgot this	2017-02-25 20:30:13 -05:00
lempamo	b2bd8eb462	Added custom wordlist feature to shiftletters	2017-02-25 20:28:58 -05:00
william341	0b3873bb94	Merge pull request #95 from lempamo/master ... icons and stuffs	2017-02-25 16:03:07 -07:00
lempamo	f51200b5d7	Merge remote-tracking branch 'refs/remotes/shiftos-game/master'	2017-02-25 17:11:53 -05:00
william341	8a60eba70b	infernal noises from hell (aka DooM	2017-02-25 15:04:35 -07:00
william341	f4ce36a18a	kek i should push dis	2017-02-25 15:02:40 -07:00
lempamo	5dd55f698b	Merge remote-tracking branch 'refs/remotes/shiftos-game/master'	2017-02-25 16:50:33 -05:00
william341	00f676a5d4	ffs	2017-02-25 14:41:39 -07:00
lempamo	84abd2cd11	Basic AudioPlayer ... planning to use naudio api for this. thoughts?	2017-02-25 16:10:59 -05:00
lempamo	420a5e0a4b	Merge remote-tracking branch 'refs/remotes/shiftos-game/master'	2017-02-25 15:40:02 -05:00
lempamo	202572ae2d	fixed icons	2017-02-25 15:33:37 -05:00
william341	5afced5136	Revert "Revert "fix notification mark as read not updating"" ... This reverts commit bd41ad18fe, reversing changes made to c4f855f3a5.	2017-02-25 13:19:53 -07:00
lempamo	1c0172f857	ShiftLetters icon	2017-02-25 15:19:33 -05:00