shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-01-23 02:12:14 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
472 commits 1 branch 0 tags 67 MiB
Commit graph

472 commits

This branch
This branch
All branches
Author SHA1 Message Date
lempamo
ce0819e257 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-25 14:48:57 -05:00
Michael
68eb6e95c6 Button for marking all notes as read. 2017-02-25 14:46:21 -05:00
lempamo
4c9640dcb2 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-25 14:39:26 -05:00
william341
bd41ad18fe Revert "fix notification mark as read not updating" 
This reverts commit c4f855f3a5.
 2017-02-25 12:37:14 -07:00
william341
c4f855f3a5 fix notification mark as read not updating 2017-02-25 12:36:26 -07:00
Michael
569ad6fd7a Fire event when note is marked read 2017-02-25 14:32:08 -05:00
lempamo
4d769d43e3 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-25 13:49:46 -05:00
Aren
ed5b654936 Merge pull request #92 from lempamo/master 
calc finished
 2017-02-25 19:44:56 +01:00
lempamo
9aa549e2b9 Calculator finished 2017-02-25 13:36:05 -05:00
william341
68828baafd re-enable music, it works 2017-02-25 10:48:11 -07:00
william341
5da5f16aef rip warnings 2017-02-25 10:24:40 -07:00
lempamo
e26453ebee Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-25 12:19:14 -05:00
lempamo
d23d4826f0 Added plus & equals functionality 2017-02-25 12:18:08 -05:00
lempamo
6a50e9fdda Calc improvements 1 2017-02-25 12:08:34 -05:00
lempamo
4b9f08581b Made Calc buttons work 2017-02-25 11:20:33 -05:00
lempamo
a152967d33 Merge remote-tracking branch 'refs/remotes/shiftos-game/master' 2017-02-25 10:53:23 -05:00
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