aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-01-14Update README.mdCarver Harrison
2017-01-14Finish legion creatorMichael
2017-01-14#5 - Users can be given CP over the MUDMichael
Currently not usable in the UI, but will be used to power shops.
2017-01-14Added links to GitHub profiles in CREDITSMichael
2017-01-13beginning of color picker fix not finished yet though wait a minRylan/wowmom98
haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaands
2017-01-13Merge pull request #32 from carverh/patch-16Michael VanOverbeek
Added Credits File
2017-01-13Added CreditsCarver Harrison
2017-01-11Merge pull request #31 from vicr123/masterMichael VanOverbeek
Catch exception when a command throws an unhandled exception
2017-01-12Add localisation string to the correct placeVictor Tran
2017-01-11Catch exception when a command throws an unhandled exceptionVictor Tran
2017-01-10Forgotten MUD CTRL centre workMichael
2017-01-10Merge pull request #30 from pfgithub/patch-1pfgithub
Additional information on contribution and usage of our project
2017-01-10Create PullRequestTemplate.mdpfgithub
2017-01-10Create IssueTemplate.mdpfgithub
2017-01-10Create CONTRIBUTING.mdpfgithub
2017-01-10Update README.mdpfgithub
Information on contributing and wording changes.
2017-01-08fix appvoyer buildswilliam341
2017-01-08Merge pull request #29 from carverh/patch-14william341
Make it look nice
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
Moved Stuff into files and made things look better
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
read the summary
2017-01-08Merge pull request #26 from shiftos-game/revert-25-masterwilliam341
Revert "Moved Leigion into its own file"
2017-01-08Revert "Moved Leigion into its own file"william341
2017-01-08Merge pull request #25 from carverh/masterRylan
Moved Leigion into its own file
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
Added trm.echo command
2017-01-08Added trm.echo commandCarver Harrison
2017-01-08Merge pull request #20 from carverh/patch-10william341
Update Resources.resx
2017-01-08Merge pull request #17 from carverh/patch-8william341
Rename Home.html to index.html
2017-01-08Merge pull request #19 from carverh/patch-9william341
Rename NotFound.txt to 404.html
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