Commit graph

999 commits

Author SHA1 Message Date
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
Carver Harrison
43a9abbd4b Ass was too big 2017-01-08 12:01:29 -08:00
Michael
ed3c7e675b Create some nice ass ;) 2017-01-08 13:58:42 -06:00
Michael
638744b41b HTML5-ified NotFound.txt | carverh 2017-01-08 13:56:14 -06:00
Michael
a9c7ddbc78 Documented Infobox.cs | carverh 2017-01-08 13:55:29 -06:00
Michael
b535b0fa8f HTML5 correction from carverh
Made Home.txt HTML5
2017-01-08 13:54:35 -06:00
Michael
347bea3315 Murdered WPF and edited some legion stuff 2017-01-08 14:50:03 -05:00
Carver Harrison
b33c78669d Update Home.txt 2017-01-08 11:48:12 -08:00
Carver Harrison
97cdc9a905 Update NotFound.txt 2017-01-08 11:45:48 -08:00
Carver Harrison
f01aeef7c7 Update Infobox.cs 2017-01-08 11:41:51 -08:00
TheRandomMelon
f46e6e8bbc Merge branch 'master' of https://github.com/shiftos-game/ShiftOS 2017-01-08 13:35:40 -06:00
TheRandomMelon
16689da571 Fixed bug where you could type while story is happening 2017-01-08 13:35:24 -06:00
Rylan
bfd214fe90 Merge pull request #11 from carverh/patch-1
Update README.md
2017-01-08 14:21:27 -05:00
Carver Harrison
ece122df0d Update README.md 2017-01-08 11:20:28 -08:00
Rylan/wowmom98
bbb83046c8 email test
haaaaaaaaaaaaaaaaands
2017-01-08 10:35:00 -05:00
Rylan
4dc6b4b17d Merge branch 'master' of https://github.com/shiftos-game/ShiftOS 2017-01-08 10:19:25 -05:00
Rylan
3dc1ba9dcc how to email 2017-01-08 10:18:25 -05:00
Michael
57c11bf41e Add license to top of ALL code files. 2017-01-08 10:17:07 -05:00
Michael
2d42d868ac migrate gitignore 2017-01-08 09:58:50 -05:00
Michael
f30dcf5ef4 Initial upload 2017-01-08 09:57:10 -05:00
Michael VanOverbeek
69dfad5472 Initial commit 2017-01-08 09:43:13 -05:00