86 Commits

Author	SHA1	Message	Date
Sean Qureshi	ece3407c55	Moved main.c to maaster	2013-08-07 10:36:32 -07:00
Sean Qureshi	2b916b96bd	Fixed it not compiling	2013-08-07 09:35:37 -07:00
Sean Qureshi	c02e1a095c	Fixed flash killing beep	2013-08-07 00:26:21 -07:00
Sean Qureshi	ea969c6e42	Manually merged my earlier commits with upstream	2013-08-07 00:24:37 -07:00
Jfreegman	16b3ec746e	code format/clean up	2013-08-06 18:27:51 -04:00
irungentoo	eacd12385f	Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master ... Conflicts: testing/toxic/prompt.c	2013-08-06 10:16:26 -04:00
Nominate	532f16a377	Fixed formatting	2013-08-06 11:50:10 +01:00
Nominate	fb9791bc69	Update prompt.c	2013-08-06 11:20:11 +01:00
Nominate	45c84e55e6	Corrected wrap-around ... This should allow wrap-around and allow proper execution.	2013-08-06 11:16:17 +01:00
Nominate	1f001b2f91	Stops line-spamming and clears before printing help ... This addresses one issue in #340 perfectly and slightly improves the other.	2013-08-06 08:10:05 +01:00
Sean Qureshi	56ac2af45b	Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core	2013-08-05 17:50:08 -07:00
Sean Qureshi	caee2c3fe5	Added flash, apparently in weird cases it works when beep fails	2013-08-05 17:47:49 -07:00
irungentoo	7aa45107be	Merge pull request #351 from joshuaj/toxic_flicker_fix ... Fixed toxic friends list flicker	2013-08-05 17:37:10 -07:00
irungentoo	5d1657432a	Merge pull request #350 from stqism/master ... Removed a useless ! from toxics status	2013-08-05 17:25:33 -07:00
irungentoo	109fe7bd0a	Merge pull request #341 from stal888/userstatus-ext ... An extension to user statuses.	2013-08-05 17:24:04 -07:00
Sean Qureshi	798504905b	Removed a useless ! from toxics status	2013-08-05 17:08:05 -07:00
Sean Qureshi	cb39cdbe5e	Throws in a bell when a message is recieved, to warn to user	2013-08-05 15:39:32 -07:00
Jfreegman	663764e046	spacing didn't match outgoing msgs	2013-08-05 18:38:55 -04:00
Jfreegman	3f712d2650	bug fix and added wrapping on friends list	2013-08-05 18:07:08 -04:00
Jfreegman	16a74ffaf9	list commands on chat window popup	2013-08-05 16:34:55 -04:00
Jfreegman	4b76983a69	chat window deleting and re-adding - it just werks	2013-08-05 16:04:06 -04:00
Sebastian Stal	5ec3b2330e	Make test clients compatible with userstatus kinds ... No features were added, just fixed callbacks.	2013-08-05 12:30:40 -07:00
Nominate	42c79dfcbb	Grammar/aesthetic amendment	2013-08-05 18:52:28 +01:00
Nominate	39545a92da	Added a 'clear' function to the prompt	2013-08-05 18:33:16 +01:00
joshuaj	bafd996e72	Fixed toxic friends list flicker	2013-08-05 10:14:44 -07:00
Jfreegman	29880b4299	init array	2013-08-05 02:48:59 -04:00
Jfreegman	17f121c58e	Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into testing	2013-08-05 02:33:15 -04:00
Jfreegman	e479f338c1	test	2013-08-05 02:32:50 -04:00
Jfreegman	3bc7f15fe5	added ability to close and reopen chat windows & other minor changes	2013-08-05 01:57:29 -04:00
Sean Qureshi	a8f752130b	Fixed 2 Null pointer derefrences in both nTox and toxic	2013-08-04 14:36:09 -07:00
Sean Qureshi	0fad8e3638	Fixed a calloc getting freed before being used	2013-08-04 13:16:08 -07:00
irungentoo	b2622726b1	Merge pull request #319 from stqism/master ... Manually merged #314 and #317, resolving errors if both merged	2013-08-04 07:18:20 -07:00
Sean Qureshi	b471236c50	Manally merged #314 and #317	2013-08-04 03:52:24 -07:00
plutooo	5300e98288	toxic: Fixed doMessenger() interval.. Toxic is much faster and responsive now.	2013-08-04 03:27:36 -07:00
Jfreegman	91d883c4a4	already a pull request with this addition	2013-08-04 05:32:53 -04:00
Jfreegman	7b380ed6d2	didn't mean to delete that	2013-08-04 05:00:16 -04:00
Jfreegman	b513c3d352	added command functionality to chat windows and a few minor improvements	2013-08-04 04:42:17 -04:00
Jfreegman	357c02ac22	Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core	2013-08-04 02:40:57 -04:00
charmlesscoin	a65715e811	fix for issue #306	2013-08-03 17:29:18 -04:00
Jfreegman	c13de2d285	added command to clear prompt screen	2013-08-03 17:13:44 -04:00
irungentoo	1ddd28f52b	Merge pull request #276 from stqism/master ... Adds timestamp to toxic, fixes issue #217	2013-08-03 13:33:27 -07:00
charmlesscoin	9b56e21f81	added a proper error message for messing up the -f flag	2013-08-03 16:12:02 -04:00
charmlesscoin	d34e4a3408	added the -f flag for toxic	2013-08-03 15:12:02 -04:00
Sean Qureshi	54aebfd807	Removed an early break	2013-08-03 11:51:40 -07:00
Sean Qureshi	6209d103f4	Merge branch 'master' of https://github.com/stqism/ProjectTox-Core	2013-08-03 11:45:07 -07:00
Sean Qureshi	e4d63c63c7	Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core	2013-08-03 11:41:47 -07:00
NemDiggers	a1c31557f2	People aren't that excited to send messages	2013-08-03 11:53:51 -04:00
Michael Kress	1ae2bfbb75	added seconds to time stamp in toxic	2013-08-03 16:26:23 +02:00
Michael Kress	28944151c7	fixed printing time stamp in toxic	2013-08-03 16:00:48 +02:00
irungentoo	8cb960e785	Merge pull request #281 from JFreegman/master ... cursor done better, fixed for chat windows	2013-08-03 05:14:44 -07:00