aboutsummaryrefslogtreecommitdiff
AgeCommit message (Expand)Author
2017-01-10Update README.mdpfgithub
2017-01-08fix appvoyer buildswilliam341
2017-01-08Merge pull request #29 from carverh/patch-14william341
2017-01-08Make it look niceCarver Harrison
2017-01-08Made some nice labels for README [3/3]Michael
2017-01-08svgs were borked, things are now in png (2/3)TheRandomMelon
2017-01-08Merge branch 'master' of https://github.com/shiftos-game/ShiftOSTheRandomMelon
2017-01-08Better README labels (1/2)TheRandomMelon
2017-01-08Merge pull request #28 from carverh/masterwilliam341
2017-01-08Moved Stuff into files and made things look betterCarver Harrison
2017-01-08Update README.mdwilliam341
2017-01-08Update README.mdwilliam341
2017-01-08Update README.mdwilliam341
2017-01-08Update README to test our gitbot on discordMichael VanOverbeek
2017-01-08localization in titles of programsRylan/wowmom98
2017-01-08Merge pull request #26 from shiftos-game/revert-25-masterwilliam341
2017-01-08Revert "Moved Leigion into its own file"william341
2017-01-08Merge pull request #25 from carverh/masterRylan
2017-01-08Update Objects.csCarver Harrison
2017-01-08Update Legion.csCarver Harrison
2017-01-08Update Legion.csCarver Harrison
2017-01-08Create Legion.csCarver Harrison
2017-01-08on buy update cp shiftoriumwilliam341
2017-01-08Merge pull request #22 from carverh/patch-12william341
2017-01-08Added trm.echo commandCarver Harrison
2017-01-08Merge pull request #20 from carverh/patch-10william341
2017-01-08Merge pull request #17 from carverh/patch-8william341
2017-01-08Merge pull request #19 from carverh/patch-9william341
2017-01-08fine ill take it seriouslywilliam341
2017-01-08to take this seriouslywilliam341
2017-01-08Update Resources.resxCarver Harrison
2017-01-08Rename NotFound.txt to 404.htmlCarver Harrison
2017-01-08Rename Home.html to index.htmlCarver Harrison
2017-01-08ass was too bigwilliam341
2017-01-08Fixed AppVeyor badge placementMichael
2017-01-08ass was too smallwilliam341
2017-01-08Update README.mdwilliam341
2017-01-08Merge pull request #15 from carverh/patch-5Rylan
2017-01-08Ass was too bigCarver Harrison
2017-01-08Create some nice ass ;)Michael
2017-01-08HTML5-ified NotFound.txt | carverhMichael
2017-01-08Documented Infobox.cs | carverhMichael
2017-01-08HTML5 correction from carverhMichael
2017-01-08Murdered WPF and edited some legion stuffMichael
2017-01-08Update Home.txtCarver Harrison
2017-01-08Update NotFound.txtCarver Harrison
2017-01-08Update Infobox.csCarver Harrison
2017-01-08Merge branch 'master' of https://github.com/shiftos-game/ShiftOSTheRandomMelon
2017-01-08Fixed bug where you could type while story is happeningTheRandomMelon
2017-01-08Merge pull request #11 from carverh/patch-1Rylan