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
312 commits 1 branch 0 tags 67 MiB
Commit graph

312 commits

This branch
This branch
All branches
Author SHA1 Message Date
Michael
177c22a24b I'm drunk. 2017-02-12 10:56:24 -05:00
Michael
110438929c More MUD refactoring (I'm almost done!) 2017-02-12 10:51:53 -05:00
Aren
88e84f74e1 Added basic discord integration, please improve UI, someone 2017-02-12 15:57:25 +01:00
Michael
118174ec13 Admin panel login system is working. 2017-02-11 20:40:40 -05:00
Michael
263ee283de wat 2017-02-11 18:53:09 -05:00
Michael
46b4bb61a8 Begin admin panel work. 2017-02-11 18:51:20 -05:00
Michael
4fd98597b8 Slight artpad modifications 2017-02-11 13:56:01 -05:00
Michael
79b166b275 Final modifications to pong as far as backend 2017-02-11 13:41:07 -05:00
Michael
6f939e295e Fix Pong UI and panel buttons 2017-02-11 13:32:26 -05:00
Michael
d90ea0ba01 commit really safe for work 
crash handler now shows assemblyname and assemblydescription
 2017-02-11 12:43:57 -05:00
Michael
c7a50f87ef commit safe for work 2017-02-11 12:32:40 -05:00
william341
a3c1c1d945 Revert "commit not safe for children" 
This reverts commit 4ec9ca6eca.
 2017-02-11 10:29:59 -07:00
Michael
4ec9ca6eca commit not safe for children 2017-02-11 12:27:35 -05:00
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