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
793 commits 4 branches 2 tags 52 MiB
Commit graph

793 commits

This branch
This branch
All branches
Author SHA1 Message Date
AShifter
90772d1b1f Merge pull request #24 from lempamo/master 
webchat convo
 2017-04-01 10:24:27 -06:00
lempamo
a02ef08386 a little more conversation 2017-04-01 12:18:36 -04:00
lempamo
f75639a00c Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-03-31 22:16:25 -04:00
lempamo
3eaa9e1400 Merge pull request #23 from lempamo/master 
webchat1998 messages are working
 2017-03-31 21:32:54 -04:00
lempamo
6ecb36cc46 webchat1998 messages are working 2017-03-31 21:19:13 -04:00
AShifter
a2c51ec4bc Merge pull request #22 from lempamo/master 
webchat98 things
 2017-03-31 18:24:19 -06:00
lempamo
7841180fc0 webchat98 things 2017-03-31 20:22:59 -04:00
AShifter
5b29f2242e Merge pull request #21 from lempamo/master 
fixed namespace
 2017-03-31 16:38:38 -06:00
lempamo
586f0f7408 fixed tons of things 2017-03-31 18:31:16 -04:00
lempamo
9de6d029cc Merge pull request #20 from lempamo/master 
webchat things
 2017-03-31 17:50:35 -04:00
lempamo
5ec8f66c1a Merge branch 'master' into master 2017-03-31 17:47:56 -04:00
lempamo
27419aa0dc webchat things 2017-03-31 17:44:01 -04:00
AShifter
6a489cc2dc Added Icon to Infobox 
hopefully™️
 2017-03-31 14:47:00 -06:00
AShifter
2468fa286b Merge pull request #19 from lempamo/master 
finished webchat1998 ui
 2017-03-31 14:31:17 -06:00
AShifter
d3d19a5fd6 Add AppVeyor Artifacts 
honeyfri
 2017-03-31 14:28:34 -06:00
AShifter
1e25868f0f Merge remote-tracking branch 'origin/master' 
# Conflicts:

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

#	TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.FileListAbsolute.txt

#	TimeHACK.Engine/obj/Release/TimeHACK.Engine.csproj.GenerateResource.Cache
#	TimeHACK.Main/bin/Release/TimeHACK.application
#	TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferences.cache

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

#	TimeHACK.Main/obj/Release/TimeHACK.Main.csprojResolveAssemblyReference.cache
#	TimeHACK.Main/obj/Release/TimeHACK.application
 2017-03-31 14:19:58 -06:00
AShifter
82557462d1 Added Infobox 
Added an Infobox into the TimeHACK.Engine and removed extra
WindowManager creations in Win95.cs

also probably did some other honeyfries
 2017-03-31 14:17:32 -06:00
lempamo
b2873bc670 finished webchat1998 ui 2017-03-31 16:12:18 -04:00
AShifter
a1e832d886 Update README.md 2017-03-31 12:44:03 -06:00
AShifter
dcbd254dbf Update README.md 2017-03-31 12:43:12 -06:00
AShifter
6c4ae51afd Merge pull request #18 from lempamo/master 
webchat things
 2017-03-31 12:38:15 -06:00
lempamo
19ea483b2b starting work on the actual webchat98 app 2017-03-31 14:36:15 -04:00
lempamo
4c50ceab1c make message parser 2017-03-31 14:28:34 -04:00
AShifter
e2213726e6 Fix stuff 
don't give me any conflicts k thx
 2017-03-31 09:04:48 -06:00
lempamo
055259a437 reorganized 2017-03-31 10:34:59 -04:00
lempamo
5773e8ac9a installer refernces frm95 2017-03-31 10:27:45 -04:00
lempamo
428f001c00 properly named said setup 2017-03-31 10:12:33 -04:00
lempamo
2efdd671c2 webchat setup is showing! 2017-03-31 10:12:01 -04:00
JayXKanz666
d009e515e3 added font to WM 2017-03-29 03:53:18 +02:00
jayxkanz666
e5e1813205 Merge pull request #15 from jayxkanz666/master 
Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master'
 2017-03-29 02:51:01 +02:00
JayXKanz666
20361308e3 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-03-29 02:34:05 +02:00
lempamo
9dde267434 Merge remote-tracking branch 'origin/master' 
# Conflicts:

#	TimeHACK.Main/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
 2017-03-28 17:33:11 -04:00
lempamo
4542c55eba added setup things 2017-03-28 17:15:32 -04:00
AShifter
bea0065d91 testing visual studio git integration 2017-03-28 15:11:17 -06:00
lempamo
3e99bcce46 did some things for webchat 2017-03-28 16:05:13 -04:00
Alex-TIMEHACK
36f06ca57b Merge pull request #14 from lempamo/master 
web chat is getting started
 2017-03-28 20:02:41 +01:00
lempamo
cc8bd453b6 forgot this thing 2017-03-28 15:00:01 -04:00
lempamo
c99fb35aba desktop icons working again 😛 2017-03-28 14:59:02 -04:00
lempamo
6ad331d707 web chat downloader 2017-03-28 14:50:26 -04:00
lempamo
e053882e86 version number that updates 2017-03-28 14:34:48 -04:00
AShifter
fd1b690770 Merge pull request #13 from lempamo/master 
ie4 back and forward and home complete
 2017-03-28 12:03:14 -06:00
lempamo
023db4c64f home button fixed 2017-03-28 13:49:18 -04:00
lempamo
e348b906c3 credit to all the devs 2017-03-28 13:43:51 -04:00
lempamo
2106eb8a4e forward button working 2017-03-28 13:34:52 -04:00
lempamo
772a0ebfb2 back button complete 2017-03-28 13:09:28 -04:00
lempamo
d2e1d1e8d9 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-03-28 13:03:13 -04:00
AShifter
38c5a4310e Update README.md 2017-03-28 09:34:58 -06:00
AShifter
2da751bcd7 Merge pull request #12 from lempamo/master 
back button working kinda sorta
 2017-03-28 09:34:36 -06:00
lempamo
98a7a38d5c back button working kinda sorta 2017-03-28 11:28:31 -04:00
AShifter
ea750c451f Update README.md 
temporary - DO NOT CHANGE
 2017-03-28 08:29:41 -06:00