Michael
|
9aab77b2f1
|
Added links to GitHub profiles in CREDITS
|
2017-01-14 09:11:20 -06:00 |
|
Rylan/wowmom98
|
9f989878e5
|
beginning of color picker fix not finished yet though wait a min
haaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaands
|
2017-01-13 16:20:52 -05:00 |
|
Michael VanOverbeek
|
93ba573039
|
Merge pull request #32 from carverh/patch-16
Added Credits File
|
2017-01-13 15:14:48 -05:00 |
|
Carver Harrison
|
70271171cb
|
Added Credits
|
2017-01-13 12:08:10 -08:00 |
|
Michael VanOverbeek
|
5b71be06a2
|
Merge pull request #31 from vicr123/master
Catch exception when a command throws an unhandled exception
|
2017-01-11 08:42:41 -05:00 |
|
Victor Tran
|
32fc0f960d
|
Add localisation string to the correct place
|
2017-01-12 00:38:43 +11:00 |
|
Victor Tran
|
627c456172
|
Catch exception when a command throws an unhandled exception
|
2017-01-11 14:22:12 +11:00 |
|
Michael
|
5958b0acff
|
Forgotten MUD CTRL centre work
|
2017-01-10 19:43:51 -05:00 |
|
pfgithub
|
9ecbdb19e2
|
Merge pull request #30 from pfgithub/patch-1
Additional information on contribution and usage of our project
|
2017-01-10 12:58:19 -08:00 |
|
pfgithub
|
60b016bb8f
|
Create PullRequestTemplate.md
|
2017-01-10 12:46:48 -08:00 |
|
pfgithub
|
eaf5620582
|
Create IssueTemplate.md
|
2017-01-10 12:45:41 -08:00 |
|
pfgithub
|
a283196d8d
|
Create CONTRIBUTING.md
|
2017-01-10 12:43:14 -08:00 |
|
pfgithub
|
cb51affeb7
|
Update README.md
Information on contributing and wording changes.
|
2017-01-10 12:32:13 -08:00 |
|
william341
|
1fad20429a
|
fix appvoyer builds
|
2017-01-08 21:33:42 -07:00 |
|
william341
|
87cef86378
|
Merge pull request #29 from carverh/patch-14
Make it look nice
|
2017-01-08 19:50:49 -07:00 |
|
Carver Harrison
|
a9610fd071
|
Make it look nice
|
2017-01-08 18:46:56 -08:00 |
|
Michael
|
3979c2a02a
|
Made some nice labels for README [3/3]
|
2017-01-08 20:08:54 -06:00 |
|
TheRandomMelon
|
b6ae3b9678
|
svgs were borked, things are now in png (2/3)
|
2017-01-08 20:06:20 -06:00 |
|
TheRandomMelon
|
7d176cf647
|
Merge branch 'master' of https://github.com/shiftos-game/ShiftOS
|
2017-01-08 20:03:03 -06:00 |
|
TheRandomMelon
|
ce3fa2c400
|
Better README labels (1/2)
|
2017-01-08 20:02:50 -06:00 |
|
william341
|
5ba9d870cd
|
Merge pull request #28 from carverh/master
Moved Stuff into files and made things look better
|
2017-01-08 16:46:53 -07:00 |
|
Carver Harrison
|
6393f91ad1
|
Moved Stuff into files and made things look better
|
2017-01-08 15:38:54 -08:00 |
|
william341
|
65449eda4c
|
Update README.md
|
2017-01-08 16:30:25 -07:00 |
|
william341
|
1cc8368baa
|
Update README.md
|
2017-01-08 16:30:14 -07:00 |
|
william341
|
3bad43698a
|
Update README.md
|
2017-01-08 16:29:48 -07:00 |
|
Michael VanOverbeek
|
2950f6c024
|
Update README to test our gitbot on discord
|
2017-01-08 18:05:48 -05:00 |
|
Rylan/wowmom98
|
78fcfce252
|
localization in titles of programs
read the summary
|
2017-01-08 17:48:56 -05:00 |
|
william341
|
d6aa2f4f16
|
Merge pull request #26 from shiftos-game/revert-25-master
Revert "Moved Leigion into its own file"
|
2017-01-08 15:04:07 -07:00 |
|
william341
|
ca45ae1bda
|
Revert "Moved Leigion into its own file"
|
2017-01-08 15:03:34 -07:00 |
|
Rylan
|
4b65fc1b86
|
Merge pull request #25 from carverh/master
Moved Leigion into its own file
|
2017-01-08 17:01:07 -05:00 |
|
Carver Harrison
|
693f0b5f44
|
Update Objects.cs
|
2017-01-08 13:58:03 -08:00 |
|
Carver Harrison
|
5c5f940003
|
Update Legion.cs
|
2017-01-08 13:57:30 -08:00 |
|
Carver Harrison
|
412f3a12c6
|
Update Legion.cs
|
2017-01-08 13:57:05 -08:00 |
|
Carver Harrison
|
a0cd53f033
|
Create Legion.cs
|
2017-01-08 13:56:42 -08:00 |
|
william341
|
b203b746b0
|
on buy update cp shiftorium
|
2017-01-08 14:38:58 -07:00 |
|
william341
|
51208cb5c8
|
Merge pull request #22 from carverh/patch-12
Added trm.echo command
|
2017-01-08 13:27:29 -07:00 |
|
Carver Harrison
|
03964a4dd7
|
Added trm.echo command
|
2017-01-08 12:23:16 -08:00 |
|
william341
|
252307cd3e
|
Merge pull request #20 from carverh/patch-10
Update Resources.resx
|
2017-01-08 13:17:28 -07:00 |
|
william341
|
153a0dd4a9
|
Merge pull request #17 from carverh/patch-8
Rename Home.html to index.html
|
2017-01-08 13:15:43 -07:00 |
|
william341
|
58f427ae86
|
Merge pull request #19 from carverh/patch-9
Rename NotFound.txt to 404.html
|
2017-01-08 13:15:37 -07:00 |
|
william341
|
176b0d3355
|
fine ill take it seriously
|
2017-01-08 13:13:50 -07:00 |
|
william341
|
3d6454bce1
|
to take this seriously
|
2017-01-08 13:13:03 -07:00 |
|
Carver Harrison
|
19340e5205
|
Update Resources.resx
|
2017-01-08 12:12:50 -08:00 |
|
Carver Harrison
|
7a30644426
|
Rename NotFound.txt to 404.html
|
2017-01-08 12:10:57 -08:00 |
|
Carver Harrison
|
2e0daf41df
|
Rename Home.html to index.html
|
2017-01-08 12:10:03 -08:00 |
|
william341
|
c6ec12bb8f
|
ass was too big
|
2017-01-08 13:07:13 -07:00 |
|
Michael
|
6a12008f97
|
Fixed AppVeyor badge placement
|
2017-01-08 14:06:18 -06:00 |
|
william341
|
7f5486502e
|
ass was too small
|
2017-01-08 13:05:08 -07:00 |
|
william341
|
18da0d0f24
|
Update README.md
|
2017-01-08 13:04:39 -07:00 |
|
Rylan
|
03b2b4e957
|
Merge pull request #15 from carverh/patch-5
Ass was too big
|
2017-01-08 15:02:30 -05:00 |
|