229 Commits

Author	SHA1	Message	Date
Maxim Biro	f03dc44e97	Fixed Windows build	2013-08-04 21:20:48 -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	b9f387b3b7	Merge pull request #311 from CharmlessCoin/nTox ... nTox Cleaning	2013-08-04 08:27:15 -07:00
irungentoo	b4ae32c1c3	Merge pull request #313 from CharmlessCoin/bug_fixes ... Removed memory leak, thanks to diath for spotting it.	2013-08-04 07:24:00 -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
charmlesscoin	ae8367dc3e	whoops, returning a free'd variable is really not what I meant...	2013-08-04 05:09:12 -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
charmlesscoin	0b6806d7f7	Removed memory leak, thanks to diath for spotting it.	2013-08-04 04:29:32 -04:00
Jfreegman	357c02ac22	Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core	2013-08-04 02:40:57 -04:00
charmlesscoin	b36bca295c	fixed bug that would cause this to always exit	2013-08-03 21:59:17 -04:00
charmlesscoin	175a434de3	removed some magic numbers from line_eval()	2013-08-03 18:06:28 -04:00
charmlesscoin	6222e32848	added some better error checking for print_nickname() anr print_statuschange()	2013-08-03 18:02:09 -04:00
charmlesscoin	43f6608530	cleaned up load_key() and added more error checking	2013-08-03 17:57:44 -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	09a6d2d351	Merge branch 'nTox' of https://github.com/CharmlessCoin/ProjectTox-Core into CharmlessCoin-nTox ... Conflicts: testing/nTox.c	2013-08-03 16:46:58 -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	2e476a06b6	Merge branch 'master' of github.com:m-kress/ProjectTox-Core	2013-08-03 16:18:01 +02:00
Astonex	8fac63f6df	Changing status to offline when quitting wont overwrite last saved status	2013-08-03 15:12:22 +01:00
Michael Kress	28944151c7	fixed printing time stamp in toxic	2013-08-03 16:00:48 +02:00
Astonex	da8996dbdd	Merge branch 'master' of git://github.com/irungentoo/ProjectTox-Core	2013-08-03 14:57:42 +01:00
Astonex	fcad4d0a5a	nTox_win32 - Updated friends list display	2013-08-03 14:14:33 +01: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
irungentoo	dc8e188f30	Merge pull request #287 from greato/master ... Added break; Statement	2013-08-03 05:03:05 -07:00
Michael Kress	d5493bb24f	added backspace to nTox; removed trailing spaces	2013-08-03 13:27:52 +02:00
Sean Qureshi	86d7734efe	Removed some useless code	2013-08-03 04:10:47 -07:00
Sean Qureshi	6cfdf68940	Merge branch 'master' of github.com:stqism/ProjectTox-Core	2013-08-03 04:00:13 -07:00
Sean Qureshi	52f1dcd9ff	Fixed a segfault when recieving text	2013-08-03 03:59:27 -07:00
Astonex	892249eabb	Merge remote-tracking branch 'ProjectTox/master'	2013-08-03 11:33:46 +01:00
Astonex	c1a8bc52f6	Can only accept friend request when one is pending now	2013-08-03 11:32:58 +01:00
Sean Qureshi	e9c330dc60	Merged a change from a pull request, added a break ... Merged from https://github.com/greato/ProjectTox-Core	2013-08-03 01:52:13 -07:00
Sean Qureshi	cef0c68bdc	Merge https://github.com/greato/ProjectTox-Core	2013-08-03 01:46:01 -07:00
g	dd6f44a2c7	Added break Statement	2013-08-03 15:59:46 +08:00
Sean Qureshi	97fbdea304	Merge https://github.com/JFreegman/ProjectTox-Core	2013-08-02 22:31:21 -07:00
charmlesscoin	9b6283c084	whoops, removed part of a string by accident.	2013-08-03 01:27:20 -04:00
charmlesscoin	bb2ea0e5b4	Fixed the printing of a few strings, moved some code around.	2013-08-03 01:14:30 -04:00
charmlesscoin	6b8f12e33c	added a getopt system, with -f and -h flags	2013-08-03 00:45:34 -04:00
Sean Qureshi	62bf320b6e	Removed the seconds patch, it breaks things	2013-08-02 19:58:00 -07:00