Commit Graph

152 Commits

Author SHA1 Message Date
irungentoo
8b4c116aa5 Merge pull request #241 from clpr/master
Add back-tab support for toxic.
2013-08-01 11:11:13 -07:00
clpr
1d04ab39b4 Add back-tab support for toxic. 2013-08-01 18:48:50 +01:00
irungentoo
1d19cbcb1c Merge pull request #238 from clpr/master
Use print_usage for help command
2013-08-01 04:34:36 -07:00
clpr
aee2d059df Use print_usage for help command 2013-08-01 12:03:01 +01:00
Spittie
42e955db8c Add nicknames to the chat list
Change from [chat <number>] to [<nickname> (<number>)]
2013-08-01 06:32:54 +02:00
irungentoo
c3b5fe3fa1 Merge pull request #227 from Proplex/master
Add help command to Toxic
2013-07-31 17:29:35 -07:00
irungentoo
b5b28e43f8 Merge branch 'master' of https://github.com/Astonex/ProjectTox-Core into Astonex-master
Conflicts:
	testing/nTox_win32.c
2013-07-31 20:27:13 -04:00
NemDiggers
1e1c731470 Add help command to Toxic 2013-07-31 20:23:15 -04:00
Astonex
7417dfe216 Fixed friends list and deleting friends. Automatically loads name/status from last time. 2013-08-01 01:14:02 +01:00
irungentoo
bf17d6eb2e Merge pull request #224 from cedeon/master
added required linker flag to 'compile with' remark
2013-07-31 16:44:18 -07:00
NemDiggers
d7dcb6f095 Remove period from status set
It can make for awkward displays if you put a period in your status.
2013-07-31 19:02:06 -04:00
William Culver
5d8a1c60e8 added required linker flag to 'compile with' remark 2013-08-01 00:01:35 +01:00
Astonex
f05aa30870 Merge remote-tracking branch 'ProjectTox/master' 2013-07-31 23:02:09 +01:00
Astonex
8dfba27242 Slight changes 2013-07-31 23:01:59 +01:00
Jfreegman
52ddf5ec43 forgot to print messages 2013-07-31 17:45:45 -04:00
Jfreegman
00e2cf8a41 formatting 2013-07-31 17:40:19 -04:00
Jfreegman
44d9e24855 small fix 2013-07-31 17:38:39 -04:00
Jfreegman
0ae9ec1815 partially fixed friend add bug (key length test still broken) 2013-07-31 17:36:04 -04:00
Jfreegman
8f6e1d8fbf partially fixed friend add bug (key length test still broken) 2013-07-31 17:30:16 -04:00
Jfreegman
3eafbc900e remove debugging printf statement 2013-07-31 15:34:34 -04:00
irungentoo
0d5eef4b43 Backspace key should now work on more terminals in toxic. 2013-07-31 15:22:43 -04:00
irungentoo
639d1faa5d Merge pull request #215 from plutooo/master
toxic: Made everything 1000x more userfriendly.
2013-07-31 11:23:13 -07:00
plutooo
0815d1110d toxic: Made everything 1000x more userfriendly. 2013-07-31 11:20:16 -07:00
irungentoo
3c177d6a83 Merge pull request #213 from plutooo/master
Added chat windows, and some clean up.
2013-07-31 10:31:21 -07:00
plutooo
2247b7fad5 Added chat windows, and some clean up. 2013-07-31 10:20:03 -07:00
Nick ODell
ccbe4c6799 Show error message instead of "added friendnumber -1" 2013-07-31 10:38:13 -06:00
irungentoo
bdd13d1954 Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master
Conflicts:
	testing/nTox.c
2013-07-31 10:25:29 -04:00
irungentoo
7252456c87 Merge pull request #171 from AMDmi3/freebsd-fixes
FreeBSD fixes
2013-07-31 04:46:12 -07:00
irungentoo
f2d310b91a Merge pull request #191 from theshadowfog/patch-6
Update nTox.c
2013-07-31 04:42:48 -07:00
irungentoo
0c27406389 Merge pull request #193 from Astonex/master
Fixed cpu usage
2013-07-31 04:42:08 -07:00
Jfreegman
17e64b3ee5 initialize num_requests 2013-07-31 05:52:08 -04:00
Marco Hinz
439de6fa3a Fix space/tab indentation 2013-07-31 10:36:02 +02:00
Stuart Banks
207c067cf2 Clean up/format code 2013-07-31 02:15:01 -04:00
Astonex
d848c15912 Fixed cpu usage 2013-07-31 04:32:18 +01:00
Greg
2d7143e850 Update nTox.c
Made the help message a string type.
2013-07-30 21:36:22 -04:00
Greg
20e4cd0a17 Update nTox.c
Edited help message.
2013-07-30 17:51:16 -04:00
Greg
3edb2f1f12 Update nTox.c
Gives the user his ID.
2013-07-30 17:36:25 -04:00
plutooo
026790e181 Fixed a bunch of bugs in TOXIC, added friendlist and more. 2013-07-30 12:47:40 -07:00
Dmitry Marakasov
5ac7f3d990 Fix "comparison is always true due to limited range of data type" warning 2013-07-30 22:41:09 +04:00
Dmitry Marakasov
6d0abb4132 Add missing newlines at EOF in sources
(missing newlines break build due to -Werror)
2013-07-30 22:39:04 +04:00
irungentoo
87388b302e Merge branch 'master' of https://github.com/blackwolf12333/ProjectTox-Core into blackwolf12333-master
Also fixed his pull request.
2013-07-30 14:30:33 -04:00
irungentoo
066c5e4780 Merge pull request #166 from theshadowfog/patch-2
Update nTox.c
2013-07-30 09:27:10 -07:00
Maxim Biro
184eaacd2a Fixed cmake 2013-07-30 12:08:48 -04:00
Greg
915ffaa888 Update nTox.c
Added help command to nTox.c
2013-07-30 11:58:51 -04:00
Peter Maatman
dc57b779d2 added utility function format_message 2013-07-30 17:43:17 +02:00
Peter Maatman
2c756f1c53 changing testing clients to reflect changes made in core/Messenger.h 2013-07-30 17:10:20 +02:00
irungentoo
3f85bdca15 Fixed warning. 2013-07-30 08:48:36 -04:00
irungentoo
5a6645709b Fixed build. 2013-07-30 07:38:47 -04:00
irungentoo
b1726f55ed Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere into nurupo-master
Conflicts:
	testing/CMakeLists.txt
2013-07-30 07:31:51 -04:00
irungentoo
0c251d4b1d Merge pull request #154 from xistance21/master
Add invalid command
2013-07-30 04:23:11 -07:00