aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-06-10Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'lempamo
2017-06-10Merge pull request #87 from Alex-TIMEHACK/masterAlex-TIMEHACK
Done basically Nothing
2017-06-10Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'Alex-TIMEHACK
# Conflicts: # TimeHACK.Main/obj/Release/CoreCompileInputs.cache
2017-06-10Done basically nothingAlex-TIMEHACK
2017-06-10Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'lempamo
2017-06-10Merge pull request #86 from IBMPCDOS5/masterAlex-TIMEHACK
Win98
2017-06-10Win98IBMPCDOS5
Fixed Shutdown label in 98
2017-06-10Merge pull request #85 from Alex-TIMEHACK/masterAShifter
Added my changes back!
2017-06-10Added my changes back AGAINAlex-TIMEHACK
# Conflicts: # .vs/TimeHACK/v15/.suo
2017-06-10Fixed changes AShifter accidentaly madeAlex-TIMEHACK
Merge conflicts...
2017-06-10fixes all the things!AShifter
compile plz appveyor
2017-06-10Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'Alex-TIMEHACK
2017-06-10re fix thingsAShifter
yoy
2017-06-10Start storyAShifter
hell yeah
2017-06-10Merge pull request #84 from Alex-TIMEHACK/masterAlex-TIMEHACK
Even more tweaks to the explorer and stuff
2017-06-10Even more tweaks to the explorer and stuffAlex-TIMEHACK
2017-06-10Merge pull request #83 from Alex-TIMEHACK/masterAlex-TIMEHACK
A lot of stuff done
2017-06-10Done ALOT of tweaks and Save troubleshooterAlex-TIMEHACK
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-10Updated my fork!Alex-TIMEHACK
2017-06-02Minor adjustmentsAlex-TIMEHACK
2017-06-02Merge pull request #82 from IBMPCDOS5/masterAShifter
Lots of changes
2017-06-02Lots of changesIBMPCDOS5
Revamped Alex's Wibdows Explorer, added an about page, and minor start menu changes, (Changing NotePad to Notepad, Shutdown... to Shut Down...)
2017-06-02Merge pull request #81 from Alex-TIMEHACK/masterAlex-TIMEHACK
Merged my File Explorer!
2017-06-02Added my File ExplorerAlex-TIMEHACK
It also has a File Open and File Save thing configured for the Notepad
2017-06-02Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'Alex-TIMEHACK
2017-06-01Merge pull request #79 from lempamo/masterlempamo
Master
2017-06-01Merge pull request #80 from aren-cllc/patch-2Alex-TIMEHACK
Add Histacom.AU to README
2017-06-01Add Histacom.AU to READMEAren
2017-05-31fixed up bsodlempamo
2017-05-31Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'lempamo
2017-05-31Merge pull request #78 from Alex-TIMEHACK/masterAlex-TIMEHACK
Fixed taskbar bug
2017-05-31Fixed taskbar bug.............. again.........Alex-TIMEHACK
2017-05-31Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'Alex-TIMEHACK
2017-05-30Merge pull request #2 from TimeHACKDevs/masterlempamo
Merge
2017-05-25Update Program.cslempamo
2017-05-25oops made mistakelempamo
2017-05-25Merge pull request #77 from lempamo/masterlempamo
add arg so th can work on wine without crashing (hopefully)
2017-05-25add arg so th can work on wine without crashing (hopefully)lempamo
2017-05-24Merge pull request #76 from Alex-TIMEHACK/masterAlex-TIMEHACK
NOT FINISHED File Explorer!
2017-05-24Kind of done my File Explorer...Alex-TIMEHACK
IT'S NOT FINISHED!!!!!!!!
2017-05-20Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'Alex-TIMEHACK
2017-05-20fix badAShifter
yoy
2017-05-20Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'Alex-TIMEHACK
2017-05-20Start IE4 Overhaul and FTP ClientAShifter
IE4 finally getting overhauled (soon) and starting FTP client for story
2017-05-20Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'Alex-TIMEHACK
2017-05-20Merge pull request #1 from TimeHACKDevs/masterlempamo
Merge
2017-05-20Merge pull request #75 from Alex-TIMEHACK/masterAlex-TIMEHACK
Fixed broken SaveSystem!
2017-05-20Fixed broken SaveSystem!Alex-TIMEHACK
2017-05-20Merge pull request #74 from Alex-TIMEHACK/masterAlex-TIMEHACK
Added my SaveSystem!
2017-05-20Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'Alex-TIMEHACK