906 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Aren	9b3303c2d5	Merge branch 'master' of https://github.com/shiftos-game/shiftos	2017-02-25 16:49:43 +01:00
Michael VanOverbeek	41ea4a927c	Merge pull request #90 from lempamo/master ... calc buttons	2017-02-25 11:28:18 -05:00
Aren	57e955e3d4	Improved ShiftLetters and added more words.	2017-02-25 16:47:51 +01:00
lempamo	7070587e18	calc update 3	2017-02-25 10:40:41 -05:00
Michael	c502062a62	fix calc upgrades	2017-02-25 10:30:52 -05:00
lempamo	046560fe99	Merge remote-tracking branch 'refs/remotes/shiftos-game/master'	2017-02-25 10:07:28 -05:00
Michael VanOverbeek	413a7da898	Merge pull request #89 from lempamo/master ... Calc stuffs 2	2017-02-25 10:04:11 -05:00
Michael	910a1c455e	Notification counter on desktop.	2017-02-25 10:03:36 -05:00
lempamo	271c973c3f	Merge remote-tracking branch 'refs/remotes/shiftos-game/master'	2017-02-25 09:49:33 -05:00
lempamo	3e5498e2f9	Calculator stuffs 2	2017-02-25 09:48:02 -05:00
Michael	ea18e37bff	finish notification backend	2017-02-25 09:45:22 -05:00
lempamo	cc4b3c6f09	Merge remote-tracking branch 'refs/remotes/shiftos-game/master'	2017-02-25 08:21:55 -05:00
Aren	d5678e127c	ShiftLetters now actually gives you codepoints, however, I'd appreciate it if someone else could add more words.	2017-02-25 14:20:00 +01:00
Aren	9cd4ea556b	Added ShiftLetters as a new game, made Audio Volume upgrade more expensive.	2017-02-25 14:08:48 +01:00
Michael	5573e82ca4	Notification app resets UI when new note is posted	2017-02-24 21:55:23 -05:00
Michael	dc78cb99e6	Forgot to add NotificationMade event.	2017-02-24 21:41:25 -05:00
Michael	894c2275d9	Notification backend.	2017-02-24 21:39:46 -05:00
Michael	bdd8e61600	Notification frontend. Sorta.	2017-02-24 21:16:45 -05:00
Rylan	1e355ca5d1	Merge pull request #88 from lempamo/master ... Calc basic stuffs	2017-02-24 20:36:11 -05:00
lempamo	0b65949e74	Added Licenses	2017-02-24 20:24:57 -05:00
lempamo	4ff53eb4a2	Get started on Calculator	2017-02-24 20:12:14 -05:00
lempamo	ed008c1898	Merge remote-tracking branch 'refs/remotes/shiftos-game/master'	2017-02-24 16:18:57 -05:00
Rylan	80282d31c2	Merge pull request #87 from lempamo/master ... Optimized tutorial for 1366x768 resolution	2017-02-24 16:12:36 -05:00
lempamo	8ca7ea0929	Optimized tutorial for 1366x768 resolution	2017-02-24 15:56:33 -05:00
Michael VanOverbeek	12f2fa9f21	Merge pull request #85 from craftxbox/patch-3 ... NO ONE LIKES BEING YELLED AT BY MICHAEL	2017-02-24 15:18:59 -05:00
craftxbox	c3ecf8a946	NO ONE LIKES BEING YELLED AT BY MICHAEL	2017-02-24 16:40:40 -03:30
craftxbox	a93b958a29	NO ONE LIKES BEING YELLED AT BY MICHAEL	2017-02-24 16:39:20 -03:30
Michael VanOverbeek	dd4d278ef4	Merge pull request #84 from lempamo/master ... Fixed NRE	2017-02-24 14:54:34 -05:00
lempamo	bb65020a6e	Fixed NRE	2017-02-24 14:47:37 -05:00
Rylan	0295ca9df7	Merge pull request #82 from AShifter/master ... WOW ASHIFTER YOU DID IT	2017-02-24 14:26:47 -05:00
AShifter	57b1cbd698	Sorry! ... well... It's in the code.	2017-02-24 12:23:00 -07:00
Michael Webb	4d968e3efe	Merging PR from @craftxbox (Pong Issue)	2017-02-24 07:17:47 -06:00
craftxbox	ed6db11f3d	THE ISSUE WAS STILL NOT FIXED	2017-02-24 09:44:21 -03:30
Aren	867a95493a	Merge pull request #77 from craftxbox/patch-1 ... Pong paddle size upgrade now actually does something	2017-02-23 23:43:12 +01:00
craftxbox	bd051072ff	NOT BE AN IDIOT	2017-02-23 19:07:21 -03:30
craftxbox	f13bd3f563	FIX THE OTHER DAMN ISSUE FOR THE THIRD TIME	2017-02-23 19:01:25 -03:30
Michael	741c9ad153	no music it is then..	2017-02-23 17:19:29 -05:00
Michael	a082c2cc17	unmute ingame music	2017-02-23 17:13:04 -05:00
Michael	45ed8faac0	RGB 1,0,1 for desktop panel and applauncher BGs	2017-02-23 17:09:25 -05:00
Michael VanOverbeek	dcc9d72046	Save deletion (server)	2017-02-23 22:05:15 +00:00
Michael	eb4c65f192	Save deletion (client)	2017-02-23 17:04:10 -05:00
Michael	39d3579e27	Fix menu renderer.	2017-02-23 16:45:53 -05:00
Michael	2bd4a815d3	Fix savesystem oddities.	2017-02-23 16:25:29 -05:00
Michael	ad76a525fe	Fix login bugs related to #71 .	2017-02-23 15:41:22 -05:00
Michael	750b776349	Fix the terminal. #71	2017-02-23 12:47:42 -05:00
Michael VanOverbeek	a3fe772dbe	Merge pull request #72 from craftxbox/patch-1 ... FIX THE DAMN ISSUE	2017-02-22 21:02:56 -05:00
craftxbox	0ee6270a3d	FIX THE DAMN ISSUE	2017-02-22 22:32:18 -03:30
Michael	55530087cb	Add login button to OOBE register screen	2017-02-22 08:50:34 -05:00
Michael	1c24beb100	Fix menu rendering bug.	2017-02-21 13:26:17 -05:00
Michael	994f6b991a	SFT making utilities	2017-02-19 20:19:00 -05:00