Commit graph

624 commits

Author SHA1 Message Date
Aren
cacc942f32 Update README.md 2017-04-09 20:52:47 +02:00
lempamo
dd17c932df Merge pull request #37 from lempamo/master
Master
2017-04-09 14:35:36 -04:00
lempamo
fbdca852b1 added notepad 2017-04-09 14:05:04 -04:00
lempamo
a428bf2117 gave proper font to ie4 2017-04-09 12:31:17 -04:00
lempamo
95ec012bea Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-04-09 11:17:14 -04:00
lempamo
f8f9eaefb1 Merge pull request #36 from lempamo/master
Start Menu Icons for Default Programs are IN!
2017-04-09 10:39:50 -04:00
lempamo
46a246024e Start Menu Icons for Default Programs are IN! 2017-04-08 19:02:28 -04:00
AShifter
8cadfe5035 Merge pull request #29 from lempamo/master
webchat plot intensifies
2017-04-02 19:19:26 -06:00
lempamo
3afc5f0362 fixed textbox not auto scrolling to bottom 2017-04-02 20:17:19 -04:00
lempamo
db3a41715a more convo 2017-04-02 20:07:39 -04:00
lempamo
568d5a6573 added AIM sounds to webchat 2017-04-02 13:35:32 -04:00
AShifter
4df4250f29 Merge pull request #28 from lempamo/master
errors for infoboxes
2017-04-01 20:01:39 -06:00
lempamo
49907c5f3a forgot this too 😛 2017-04-01 21:54:17 -04:00
lempamo
f4df5bd646 forgot this 2017-04-01 21:52:32 -04:00
lempamo
21fe930cb2 added error images for infobox 2017-04-01 21:52:12 -04:00
lempamo
a0bb3219e3 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-04-01 20:35:53 -04:00
AShifter
ef8f165210 Merge pull request #27 from lempamo/master
Master
2017-04-01 18:30:53 -06:00
lempamo
6ba96ec879 minor thing. youre welcome 143mailliw. 2017-04-01 19:43:32 -04:00
lempamo
82712c7acb fixed title bar font 2017-04-01 19:03:43 -04:00
lempamo
037bdc1e5a title bar font 2017-04-01 18:44:31 -04:00
AShifter
f99047081f Merge pull request #26 from lempamo/master
Master
2017-04-01 16:31:12 -06:00
lempamo
ddb7134078 fixed font 2017-04-01 18:29:26 -04:00
AShifter
b214553a85 Update README.md 2017-04-01 16:29:12 -06:00
lempamo
d0b92c3e07 more conversation 2017-04-01 17:59:16 -04:00
lempamo
efcebdf860 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-04-01 17:14:15 -04:00
AShifter
5d8b0c4670 Merge pull request #25 from lempamo/master
webchat improved things
2017-04-01 15:09:15 -06:00
AShifter
973fee67a8 PLEASE USE RESOURCES TO ADD ICONS.
If you add an icon to the start menu, USE A FRIGGIN RESOURCE, OR ELSE
EVERYONE WILL HAVE ERRORS.
2017-04-01 14:51:05 -06:00
lempamo
125e35fe98 simpler new lines 2017-04-01 16:44:05 -04:00
lempamo
ecd5324b48 set start sound to play slightly earlier 2017-04-01 16:32:53 -04:00
lempamo
20dcdbf96d webchat extra things 2017-04-01 16:28:34 -04:00
lempamo
bd53d73a13 Merge remote-tracking branch 'refs/remotes/TimeHACKDevs/master' 2017-04-01 13:20:11 -04:00
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