shiftos-archive/Histacom2
1
0
Fork 0
mirror of https://github.com/HistacomUnity/Histacom2-old.git synced 2025-01-22 17:12:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions
433 commits 4 branches 2 tags 52 MiB
Commit graph

433 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alex-TIMEHACK
da6e7a7e8b Moar stuff 2017-07-01 22:17:57 +01:00
lempamo
19ca07404c Merge pull request #103 from lempamo/master 
Master
 2017-07-01 20:03:16 +00:00
lempamo
4af9777601 improved launcher 2017-07-01 15:49:09 -04:00
lempamo
1e15555a88 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-07-01 11:33:34 -04:00
Alex-TIMEHACK
971683c5f7 Reorganised a lot of stuff PART 2 2017-07-01 09:59:40 +01:00
Alex-TIMEHACK
f3bac11ff6 Reorganised ALOT OF STUFF 2017-07-01 09:59:26 +01:00
Alex-TIMEHACK
a22ceeedc7 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-30 19:17:49 +01:00
Alex-TIMEHACK
6357242767 Merge pull request #102 from Alex-TIMEHACK/master 
Remove thing sry for da ping :P
 2017-06-28 18:07:44 +01:00
Alex-TIMEHACK
b95fe5caa5 Remove thing 2017-06-28 18:05:06 +01:00
Alex-TIMEHACK
48c468d6ee Merge pull request #101 from Alex-TIMEHACK/master 
Increased performance
 2017-06-28 18:04:23 +01:00
Alex-TIMEHACK
576326f8ef Increased startup performance 2017-06-28 17:59:04 +01:00
Alex-TIMEHACK
2044d74cbb Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-28 17:42:46 +01:00
Alex-TIMEHACK
35abc60de2 Merge pull request #100 from Alex-TIMEHACK/master 
Made the TitleScreen use the WindowManager
 2017-06-24 21:42:18 +01:00
Alex-TIMEHACK
7da34021e2 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-24 21:39:54 +01:00
Alex-TIMEHACK
1027a2cff0 Should be fixed now. 2017-06-24 21:36:20 +01:00
Alex-TIMEHACK
031c9999a3 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-24 21:28:57 +01:00
Alex-TIMEHACK
56e8436863 oops - I made a massive mistake 2017-06-24 21:28:06 +01:00
Alex-TIMEHACK
baf3b622e9 Slight update of gitignore 2017-06-24 21:22:57 +01:00
Alex-TIMEHACK
4a57dd8877 Made the new TitleScreen use the WindowManager 2017-06-24 21:17:29 +01:00
lempamo
fc728100a3 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-20 17:21:27 -04:00
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
lempamo
e83df06641 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-14 17:02:09 -04:00
Alex-TIMEHACK
a430ef0e25 Remove a goal that's been done 2017-06-14 18:19:53 +01:00
lempamo
a307bc7f45 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-06-11 22:27:24 -04: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