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

999 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
8e2b00840a MUD modularization work. 2017-02-11 11:48:26 -05:00
Michael
f8a37dd101 Skin engine optimizations 2017-02-10 15:53:53 -05:00
Michael
f6ab3b3e85 App Launcher text is now skinnable. 
Find the new App Launcher Text Color and App Launcher font settings in
Desktop -> App Launcher in Shifter!
 2017-02-10 15:19:26 -05:00
Michael
8df06f34b8 Fix maximization skinning bug 2017-02-10 15:06:48 -05:00
Aren
bc1a631ef8 Fixed issue #63 2017-02-10 14:59:24 +01:00
Michael
de14574800 Compress shop items on server-side. 2017-02-09 20:32:53 -05:00
Michael
d6b2b15526 Fix JSON parse bug with shop listing 2017-02-09 19:00:26 -05:00
Michael
f0b7634d52 <, not <=. 
It really is true that messing up a single character can screw up all
your code with a fatal bug.
 2017-02-09 18:51:08 -05:00
Michael
8b0e4f34b1 Possible download manager fix. 2017-02-09 18:37:53 -05:00
Michael
c544e4081d Dramatic shop optimizations. 2017-02-09 18:32:48 -05:00
Michael
86f204ee49 TransferCodepointsFrom no longer prints trm prompt 2017-02-08 18:23:13 -05:00
Michael
f7c5354205 Fix shop editor 2017-02-08 18:19:09 -05:00
Michael
48fd30794f Shop fixes 2017-02-08 18:01:13 -05:00
Michael
beb2bb27d7 "My Shop" menu item works. 2017-02-08 16:33:01 -05:00
Michael
d8eb2d79e0 Shop item editor 2017-02-08 16:21:52 -05:00
Michael
51ad9434bb Shop work. 
- Shop Editor implemented.
- Shop List implemented.
- Shops are now a way to earn Codepoints.
 2017-02-08 15:51:22 -05:00
Michael
a4b49ab68b Mute the background music during OOBE 2017-02-08 12:59:26 -05:00
Aren
f66cf31e5d Merge branch 'master' of https://github.com/shiftos-game/shiftos 2017-02-08 18:22:33 +01:00
Aren
b6dff54e95 Fixed #50 and errors during Oobe will no longer restart the entire step. 2017-02-08 18:22:02 +01:00
Michael
f5cbbaf892 Fix Shiftorium init bugs. 2017-02-08 11:58:16 -05:00
Michael
512a02ba88 Mind my language... 
We finally fixed the god damn fucking fuckity fucking Tutorial bug.
Finally, for fucks sake.
 2017-02-08 11:20:02 -05:00
Michael VanOverbeek
530d34e1ae Merge pull request #56 from aren-cllc/patch-1 
This should help debug the tutorial hang issue
 2017-02-08 10:40:00 -05:00
aren-cllc
42cfccfdbe Comment out stuff for debugging purposes 2017-02-08 16:34:45 +01:00
aren-cllc
4164394fc2 Update Oobe.cs 2017-02-08 16:22:19 +01:00
aren-cllc
1ac01d9a27 This should help debug the tutorial hang issue 
Please don't merge this yet, as VS may have messed something up again. I will comment once I checked if everything works.
 2017-02-08 16:17:28 +01:00
Michael
982c575f9a More icons. 2017-02-08 08:46:33 -05:00
Rylan/wowmom98
a2219a0441 here michael here's the thing you wanted that may not work 2017-02-08 08:45:16 -05:00
Michael
07192c6c2e Add default icons for most apps 2017-02-07 18:39:30 -05:00
Michael
7a29121456 Added defaulticonattribute. 2017-02-07 17:30:14 -05:00
Michael VanOverbeek
aa45e10f4a Merge pull request #55 from aren-cllc/patch-1 
VS failed to save
 2017-02-07 12:04:15 -05:00
aren-cllc
3a7939c5f7 VS failed to save 
For some reason Visual Studio didn't save *all* my changes. This caused my previous PR to make audio commands require a shiftorium upgrade that didn't exist. This is now fixed.
 2017-02-07 17:32:06 +01:00
Michael VanOverbeek
8e553e14e4 Merge pull request #54 from aren-cllc/master 
Added audio.mute and shiftorium upgrade for audio commands
 2017-02-07 11:22:29 -05:00
Aren
22e567ca3f Added audio volume shiftorium upgrade 2017-02-07 16:58:22 +01:00
Aren
28f0cda0c5 Added audio.mute 2017-02-07 16:17:06 +01:00
Michael
82de84638a Icon backend :D 2017-02-06 20:15:22 -05:00
Michael
aa9234c681 Fix console forwarding with infoboxes 2017-02-06 16:00:01 -05:00
Michael
481623e074 OSFT-ifying part 1.1: fix threading issue 2017-02-06 15:33:18 -05:00
Michael
c73611e5c5 OSFT-ifying part 1: infobox debug commands 2017-02-06 15:21:53 -05:00
Michael
ce32f66c1e Debugging of tutorial 2017-02-05 13:55:27 -05:00
Michael
38ab4e5708 #51 - DevX seizure 
Added a wait in the TextType() method so that it doesn't fire until the
current call finishes.
 2017-02-05 13:09:32 -05:00
Rylan/wowmom98
4b46d338c0 thx github for not actually commiting every single change i made 2017-02-05 12:03:31 -05:00
Rylan/wowmom98
f26333431a Revert "Revert "color picker fixes but OOPS I CANT TEST IT"" 
This reverts commit 76250f4df78dc35039de2ae197c9ef877b7f796c.
 2017-02-05 12:01:38 -05:00
Rylan/wowmom98
7ef5896ab3 Revert "color picker fixes but OOPS I CANT TEST IT" 
This reverts commit e97117c82272da37e8813631541c1c7cfc07808d.
 2017-02-05 12:01:37 -05:00
Rylan/wowmom98
c8eec15e45 color picker fixes but OOPS I CANT TEST IT 
plz michael how 2 get past tutorial
 2017-02-05 12:01:36 -05:00
Michael
4c048779ce Fix downloader UI 
It now shoes the icon of the file it's downloading... and I just
misspelled 'shows' as 'shoes' and don't feel like correcting it.
 2017-02-05 11:54:33 -05:00
Michael
bf8d9f5099 Fix missing return statement 2017-02-05 11:28:45 -05:00
Michael
5c0cf15160 fix 'register' button in setup wizard 2017-02-05 11:18:37 -05:00
Michael
e2f25a92ba Fix tutorial reboot 2017-02-05 11:15:50 -05:00
Michael
ae7553fa95 Stop hashing passwords - we encrypt saves now 2017-02-05 10:57:47 -05:00
Michael
19b13528f6 Server now FULLY encrypts saves 2017-02-05 10:56:48 -05:00