shiftos-archive/ShiftOS_TheReturn
1
0
Fork 0
mirror of https://git.alee14.me/shiftos-archive/ShiftOS_TheReturn.git synced 2025-04-20 02:30:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
438 commits 1 branch 0 tags 67 MiB
Commit graph

110 commits

Author SHA1 Message Date
pfg
b20d77edd1 Merge branch 'master' of https://github.com/shiftos-game/ShiftOS 2017-03-07 17:33:44 -08:00
pfg
4989356d67 Very early version of FormatEditor 2017-03-07 17:33:39 -08:00
Michael
2a747334bd WHOA HACKING 2017-03-07 14:56:57 -05:00
Michael
17957f9bb8 Fix bootstrapper bug. 2017-03-07 10:06:20 -05:00
Michael
0ea74f3088 story stuff 2017-03-07 09:18:45 -05:00
Michael
a28a68bcf8 story IDs are now treated as shiftorium upgrades 2017-03-07 08:22:52 -05:00
Michael
081b59d749 Modular stories 2017-03-06 20:05:24 -05:00
Michael
4e52b93912 sos.help indexes non-engine commands now 2017-03-06 18:58:06 -05:00
Michael
bb4a380162 Beginning screensaver work 2017-02-28 17:01:14 -05:00
lempamo
dd95bc225f found a NRE 2017-02-28 12:27:16 -05:00
william341
496b0cbf86 tweaks here and there 2017-02-26 21:16:11 -07:00
lempamo
ba1519e3ce LIcenses 2017-02-26 21:54:41 -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
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
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
william341
00f676a5d4 ffs 2017-02-25 14:41:39 -07: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
wowmom98
ac7f2fa5bd I can assure you guaranteed that there is an acorn somewhere, in this place, and the sailors are looking for it 
changed a few comments and made a bit of code family friendly
 2017-02-25 15:11:24 -05:00
Michael
68eb6e95c6 Button for marking all notes as read. 2017-02-25 14:46:21 -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
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
Michael
c502062a62 fix calc upgrades 2017-02-25 10:30:52 -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
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
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
AShifter
57b1cbd698 Sorry! 
well... It's in the code.
 2017-02-24 12:23:00 -07:00
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
2bd4a815d3 Fix savesystem oddities. 2017-02-23 16:25:29 -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
Michael
55c1fbeaa2 Make title text back color transparent 2017-02-19 19:23:11 -05:00
Michael
762bd11cdf Kill experience shifter. 
Now all we need is a Lua->SFT compiler (not that hard) and then we can
generate 0:/system/kernel.sft and have whatever's in there run at
startup.
 2017-02-19 13:47:51 -05:00
Michael
1a0d863263 fix bug with win.open type prober 2017-02-19 10:11:50 -05:00
Michael
476b82264f Flow, panel, button and label controls in lua 2017-02-18 14:04:51 -05:00
Michael
423569f4ae Add on_key_down event and other goodies 2017-02-18 13:25:30 -05:00
Michael
5c025fd165 InvokeOnWorkerThread Michael... 2017-02-18 11:22:19 -05:00
Michael
30dbf1ecb9 Fix bug with client-side for update_your_cp 2017-02-18 11:19:54 -05:00
Michael
9b8d5861a9 WHOA LUA STUFF 💃 2017-02-18 10:37:11 -05:00
Michael
8448ee3479 No swears. xD 2017-02-17 08:34:33 -05:00