Commit graph

286 commits

Author SHA1 Message Date
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
IBMPCDOS5
320634db07 Win98
Fixed Shutdown label in 98
2017-06-10 12:24:40 -05:00
AShifter
1d1d8286e7 Merge pull request #85 from Alex-TIMEHACK/master
Added my changes back!
2017-06-10 09:58:07 -07:00
Alex-TIMEHACK
ec8361de2a Added my changes back AGAIN
# Conflicts:
#	.vs/TimeHACK/v15/.suo
2017-06-10 17:55:28 +01:00
Alex-TIMEHACK
1fbd9c1c76 Fixed changes AShifter accidentaly made
Merge conflicts...
2017-06-10 17:45:37 +01:00
AShifter
d9b6009e49 fixes all the things!
compile plz appveyor
2017-06-10 10:34:33 -06:00
Alex-TIMEHACK
86fc00d98a Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-10 17:30:00 +01:00
AShifter
6fe33a8837 re fix things
yoy
2017-06-10 10:28:06 -06:00
AShifter
22b7ec620f Start story
hell yeah
2017-06-10 10:24:20 -06:00
Alex-TIMEHACK
819f802152 Merge pull request #84 from Alex-TIMEHACK/master
Even more tweaks to the explorer and stuff
2017-06-10 17:13:53 +01:00
Alex-TIMEHACK
e4db9cc77a Even more tweaks to the explorer and stuff 2017-06-10 17:12:28 +01:00
Alex-TIMEHACK
801ac36d56 Merge pull request #83 from Alex-TIMEHACK/master
A lot of stuff done
2017-06-10 12:24:38 +01:00
Alex-TIMEHACK
316b7739bd Done ALOT of tweaks and Save troubleshooter
There is now a save troubleshooter that checks your save files if they
can't load! Also, it checks what OS to load on startup of the game!
2017-06-10 12:22:50 +01:00
Alex-TIMEHACK
a15d2c212a Updated my fork! 2017-06-10 07:54:26 +01:00
Alex-TIMEHACK
acbf56b32a Minor adjustments 2017-06-02 17:46:26 +01:00
AShifter
9f7790cef9 Merge pull request #82 from IBMPCDOS5/master
Lots of changes
2017-06-02 08:51:35 -07:00
IBMPCDOS5
1b6c41b0a4 Lots of changes
Revamped Alex's Wibdows Explorer, added an about page, and minor start
menu changes, (Changing NotePad to Notepad, Shutdown... to Shut Down...)
2017-06-02 10:28:03 -05:00
Alex-TIMEHACK
b08c213ecf Merge pull request #81 from Alex-TIMEHACK/master
Merged my File Explorer!
2017-06-02 15:09:05 +01:00
Alex-TIMEHACK
cf7392f930 Added my File Explorer
It also has a File Open and File Save thing configured for the Notepad
2017-06-02 15:06:52 +01:00
Alex-TIMEHACK
a1b2e2b65d Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-02 11:07:19 +01:00
lempamo
9b63adb046 Merge pull request #79 from lempamo/master
Master
2017-06-01 07:36:50 -04:00
Alex-TIMEHACK
3050713795 Merge pull request #80 from aren-cllc/patch-2
Add Histacom.AU to README
2017-06-01 09:35:44 +01:00
Aren
b58ee3f47e Add Histacom.AU to README 2017-06-01 10:34:10 +02:00
lempamo
0344f0f2ba fixed up bsod 2017-05-31 17:38:32 -04:00
lempamo
d400883500 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-05-31 16:50:55 -04:00
Alex-TIMEHACK
33f4099d3a Merge pull request #78 from Alex-TIMEHACK/master
Fixed taskbar bug
2017-05-31 09:24:56 +01:00