Commit graph

311 commits

Author SHA1 Message Date
AShifter
ffc4a480f2 make the new ultra-cool-main-super-menu™️
**NJFKDSFKJNDSKFMKJEHILHIULHSLKFSDKJEINJFKIJBFIOWEHFIIOGUEYIUQEGIUHEKJLFNDKMNLFKBDNBCM**
2017-06-19 15:47:36 -07:00
AShifter
858d1e7062 Start BIOS
aww yeah baby
2017-06-19 00:14:34 -07:00
AShifter
5c0af49eb6 Start storyline
Actually add some story!
2017-06-18 19:38:27 -07:00
AShifter
bf7fcf52ad Some more terminal work
IT WORKS! IT WWOOOOORRRKKKSS!!! YOu can now use Thread.Sleep(); without
issues.
2017-06-18 18:39:27 -07:00
Alex-TIMEHACK
15f2e1a7e3 Merge pull request #97 from Alex-TIMEHACK/master
A LOT of Tweaks - more to come
2017-06-17 22:27:23 +01:00
Alex-TIMEHACK
2f9031e0ac A LOT of tweaks - more to come 2017-06-17 22:25:33 +01:00
Alex-TIMEHACK
17d94fdc1d Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-17 15:14:11 +01:00
Alex-TIMEHACK
6679f364d2 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-17 14:52:55 +01:00
Alex-TIMEHACK
331ac7f0aa MORE! MORE! MORE! 2017-06-17 14:52:31 +01:00
Alex-TIMEHACK
14044d4e57 EVEN MORE STAAAAAAAFFFFFFFFFFF 2017-06-17 14:45:07 +01:00
Alex-TIMEHACK
9031d3a6c6 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-17 14:36:19 +01:00
Alex-TIMEHACK
f50e7e4d85 Merge pull request #96 from Alex-TIMEHACK/master
Done basically nothing
2017-06-17 14:30:06 +01:00
Alex-TIMEHACK
dcbf41b407 Done basically nothing x2 2017-06-17 14:28:32 +01:00
Alex-TIMEHACK
05946bfb41 STUUUUUUFFFFFFFFF 2017-06-17 14:27:56 +01:00
Alex-TIMEHACK
e1a4a312f4 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-17 14:25:26 +01:00
Alex-TIMEHACK
7dfa6c6b58 Done basically nothing :P 2017-06-17 14:25:24 +01:00
Alex-TIMEHACK
b7d17c511a The more stuff in .gitignore the better, right?
Well... I guess as long as it isn't *.*
2017-06-17 14:18:43 +01:00
Alex-TIMEHACK
8f49a17b3d Update my fork PART 3 2017-06-17 09:10:35 +01:00
Alex-TIMEHACK
3caf2962cf Updated my fork AGAIN
# Conflicts:
#	.vs/TimeHACK/v15/.suo
#	TimeHACK.Engine/bin/Release/TimeHACK.Engine.dll
#	TimeHACK.Engine/bin/Release/TimeHACK.Engine.pdb
#	TimeHACK.Engine/obj/Release/CoreCompileInputs.cache

#	TimeHACK.Engine/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache

#	TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache

#	TimeHACK.Engine/obj/Release/TimeHACK.Engine.csprojResolveAssemblyReference.cache
#	TimeHACK.Engine/obj/Release/TimeHACK.Engine.dll
#	TimeHACK.Engine/obj/Release/TimeHACK.Engine.pdb
#	TimeHACK.Main/bin/Release/TimeHACK.Engine.dll
#	TimeHACK.Main/bin/Release/TimeHACK.Engine.pdb
#	TimeHACK.Main/bin/Release/TimeHACK.application
#	TimeHACK.Main/bin/Release/TimeHACK.exe
#	TimeHACK.Main/bin/Release/TimeHACK.exe.manifest
#	TimeHACK.Main/bin/Release/TimeHACK.pdb
#	TimeHACK.Main/bin/Release/app.publish/TimeHACK.exe
#	TimeHACK.Main/obj/Release/CoreCompileInputs.cache
#	TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache

#	TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
#	TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.FileListAbsolute.txt
#	TimeHACK.Main/obj/Release/TimeHACK.Main.csproj.GenerateResource.Cache

#	TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache

#	TimeHACK.Main/obj/Release/TimeHACK.OS.Win95.Win95Apps.WinClassicIE4.resources
#	TimeHACK.Main/obj/Release/TimeHACK.Properties.Resources.resources

#	TimeHACK.Main/obj/Release/TimeHACK.WinClassicForms.WinClassicInstaller.resources
#	TimeHACK.Main/obj/Release/TimeHACK.application
#	TimeHACK.Main/obj/Release/TimeHACK.exe
#	TimeHACK.Main/obj/Release/TimeHACK.exe.manifest
#	TimeHACK.Main/obj/Release/TimeHACK.pdb
2017-06-17 09:10:20 +01:00
Alex-TIMEHACK
3a8ada000a Updated my fork 2017-06-17 08:56:10 +01:00
lempamo
cfed11508e Merge pull request #94 from STTADev/master
forgot this thing 😛
2017-06-15 00:24:47 +00:00
lempamo
accf753205 forgot this thing 😛 2017-06-14 20:22:37 -04:00
lempamo
792f407215 Merge pull request #93 from STTADev/master
font fix
2017-06-15 00:14:05 +00:00
lempamo
92f1b7b926 quick fix to the fonts 2017-06-14 20:12:37 -04:00
lempamo
f9d0254ec8 Create README.md 2017-06-14 17:31:28 -04:00
Alex-TIMEHACK
a430ef0e25 Remove a goal that's been done 2017-06-14 18:19:53 +01:00
lempamo
a2053d72dd Merge pull request #91 from jamierocks/pr/housekeeping
repo: Improve gitignore and gitattributes
2017-06-12 00:06:03 +00:00
lempamo
faf77fe89f Delete TimeHACK.Main.csproj.FileListAbsolute.txt 2017-06-11 20:05:45 -04:00
lempamo
7c059ef7ab Merge pull request #92 from lempamo/master
fonts moved
2017-06-11 22:14:55 +00:00
lempamo
98485ebbbc moved fonts 2017-06-11 18:13:28 -04:00
lempamo
9f1be00ea3 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-11 17:59:30 -04:00
Jamie Mansfield
eef1e2b945
repo: Improve gitignore and gitattributes
The gitignore has been improved to ignore the following:
 - IDE configuration for Visual Studio, VSCode, and Rider
 - OS files for macOS, Linux, and Windows

The gitattributes has been improved to properly diff the following:
 - Normalise line endings
 - Common Files - .md, .png, etc
 - C# Files
 - Visual Studio Files
2017-06-11 22:31:46 +01:00
AShifter
4b20ee479f Merge pull request #90 from lempamo/master
gitignore
2017-06-11 14:03:05 -07:00
lempamo
8f7f5ef45e gitignore 2017-06-11 17:01:23 -04:00
Alex-TIMEHACK
6a75247ac9 Create .gitattributes 2017-06-11 21:43:25 +01:00
lempamo
215f1ba784 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-11 16:32:55 -04:00
AShifter
cb901e986f fix the bug with Hack1.cs
yoy let's maek story
2017-06-11 08:31:26 -06:00
AShifter
ab67708a62 Fix dial-up sound bug
Play the sound on a different thread, and BAM IT WORKS WOW YOY and also
link the threads so the main thread waits for the sound thread to end
something like that just look at Hack1.cs
2017-06-11 08:28:32 -06:00
AShifter
2cdfabd49c Merge pull request #89 from lempamo/master
survive the day part 2
2017-06-11 07:19:18 -07:00
lempamo
fc471fdac2 i srsly thought i commited this >:( 2017-06-11 10:15:33 -04:00
lempamo
cfda6d25f2 more survive the day options 2017-06-11 09:57:51 -04:00
lempamo
66ad623c59 Merge pull request #88 from lempamo/master
survive the day
2017-06-11 04:00:35 +00:00
lempamo
83548f23c2 survive the day is working
while its being worked on, you can access it via the internet connection
wizard in the start menu
2017-06-10 23:58:33 -04:00
lempamo
5dd994748c added survivethedaygame 2017-06-10 20:02:04 -04:00
lempamo
600f04badd Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-10 19:44:10 -04:00
Alex-TIMEHACK
54b6d63c61 Merge pull request #87 from Alex-TIMEHACK/master
Done basically Nothing
2017-06-10 21:36:18 +01:00
Alex-TIMEHACK
6a97a95fc7 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'
# Conflicts:
#	TimeHACK.Main/obj/Release/CoreCompileInputs.cache
2017-06-10 21:34:36 +01:00
Alex-TIMEHACK
77e6fc3cb8 Done basically nothing 2017-06-10 21:33:53 +01:00
lempamo
46cca8051d Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-10 15:23:05 -04:00
Alex-TIMEHACK
f7a0abb9c8 Merge pull request #86 from IBMPCDOS5/master
Win98
2017-06-10 18:26:12 +01:00