Commit graph

311 commits

Author SHA1 Message Date
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
Alex-TIMEHACK
21320c8f96 Fixed taskbar bug.............. again......... 2017-05-31 09:23:32 +01:00
Alex-TIMEHACK
976099d38c Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-05-31 09:23:08 +01:00
lempamo
13cd6b245c Merge pull request #2 from TimeHACKDevs/master
Merge
2017-05-30 21:35:05 -04:00
lempamo
9ee1762d72 Update Program.cs 2017-05-25 13:48:09 -04:00
lempamo
0e904f5729 oops made mistake 2017-05-25 13:10:38 -04:00
lempamo
76e8f1e70d Merge pull request #77 from lempamo/master
add arg so th can work on wine without crashing (hopefully)
2017-05-25 13:05:51 -04:00
lempamo
79808fce91 add arg so th can work on wine without crashing (hopefully) 2017-05-25 12:58:55 -04:00
Alex-TIMEHACK
5648792fa6 Merge pull request #76 from Alex-TIMEHACK/master
NOT FINISHED File Explorer!
2017-05-24 21:46:33 +01:00
Alex-TIMEHACK
ac576c0590 Kind of done my File Explorer...
IT'S NOT FINISHED!!!!!!!!
2017-05-24 21:42:48 +01:00
Alex-TIMEHACK
832660987c Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-05-20 16:50:18 +01:00
AShifter
5bd41f103e fix bad
yoy
2017-05-20 09:43:04 -06:00
Alex-TIMEHACK
e7e7cd18e9 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-05-20 16:24:42 +01:00
AShifter
2088dcac27 Start IE4 Overhaul and FTP Client
IE4 finally getting overhauled (soon) and starting FTP client for story
2017-05-20 08:24:44 -06:00
Alex-TIMEHACK
2e5600d955 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-05-20 14:26:11 +01:00
lempamo
6b6678c766 Merge pull request #1 from TimeHACKDevs/master
Merge
2017-05-20 09:19:29 -04:00
Alex-TIMEHACK
516928f112 Merge pull request #75 from Alex-TIMEHACK/master
Fixed broken SaveSystem!
2017-05-20 13:51:06 +01:00
Alex-TIMEHACK
c14b9ee033 Fixed broken SaveSystem! 2017-05-20 13:48:20 +01:00
Alex-TIMEHACK
9af6e5bbff Merge pull request #74 from Alex-TIMEHACK/master
Added my SaveSystem!
2017-05-20 13:42:23 +01:00
Alex-TIMEHACK
c322a51694 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-05-20 13:37:58 +01:00
Alex-TIMEHACK
aaf2960c69 Make a minor adjustment to my SaveSystem! 2017-05-20 13:35:34 +01:00
Alex-TIMEHACK
9328abe384 Added my SaveSystem! 2017-05-20 13:33:32 +01:00
Alex-TIMEHACK
eafc3296a0 Merge pull request #73 from aren-cllc/patch-1
Store saves in AppData instead of My Documents
2017-05-20 12:17:18 +01:00
Aren
b9841ccabc Store saves in AppData instead of My Documents
Required for Windows Store support.
2017-05-20 12:49:25 +02:00
Alex-TIMEHACK
b9857d7aa6 Merge pull request #72 from Alex-TIMEHACK/master
Added my Address Book!
2017-05-20 09:46:20 +01:00
Alex-TIMEHACK
ca9d46fea6 Fixed Conflicts PART 2 2017-05-20 09:44:06 +01:00