StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity
2,037 Commits 2 Branches 1 Tag 69 MiB
45329dc59e
Commit Graph

541 Commits

Author SHA1 Message Date
slvr
1a39c397c5 Implemented Deadline Timer and timer_test 2013-08-12 13:08:03 +01:00
Jfreegman
d87b79d368 a little overkill 2013-08-12 05:59:08 -04:00
Chris Hall
4293c4b1e6 Messenger refactor - redid work from pull request 79 
Moves static state out of Messenger.c and into a Messenger struct
Purely stylistic, no functional changes were made.

This commit also changed all the callers of Messenger as they now have
to pass an instance of the Messenger struct to messenger functions.

Also removed some uses of the 'static' keyword at the beginning of
function definitions when the function was already declared static, as
these caused gcc to whine.
 2013-08-12 21:37:38 +12:00
Jfreegman
46209d958f make connection more robust 2013-08-12 03:10:47 -04:00
Maxim Biro
440871bda1 Fixed warnings on Windows 2013-08-11 14:17:02 -04:00
Simon Levermann
a34403e33b Fix a possible memory leak 2013-08-11 17:51:10 +02:00
irungentoo
c0d5fe9b5b Merge pull request #423 from JFreegman/master 
Auto-connect toxic to DHT on startup
 2013-08-11 07:40:07 -07:00
Jfreegman
2c2d608e29 potential seg fault 2013-08-11 00:55:09 -04:00
lukechampine
1139ca57a5 make argument handling (esp. of strings) more robust 2013-08-10 20:10:03 -04:00
irungentoo
8e05bcb5f9 Merge pull request #422 from slvr/crypto-speed-boost 
Cryptography speed boost
 2013-08-10 16:20:54 -07:00
Jfreegman
56df7e556e was making the ID change on every startup 2013-08-10 18:00:54 -04:00
Jfreegman
401cbeff37 fix memory leak 2013-08-10 16:28:40 -04:00
Jfreegman
216efc91a5 don't need that 2013-08-10 15:50:49 -04:00
Jfreegman
2694fc8d13 auto-connect to DHT on startup 2013-08-10 15:46:29 -04:00
slvr
acca5c8e8f Added crypto_speed_test 2013-08-10 18:06:51 +01:00
slvr
7f27fcaf37 tabs -> spaces 2013-08-10 11:27:36 +01:00
slvr
6052b1f119 network_registerhandler 2013-08-10 00:43:50 +01:00
Christian Brueffer
0b9adb1f26 Kill EOF whitespace. 2013-08-09 20:46:17 +02:00
irungentoo
44902d15a7 Merge pull request #409 from lukechampine/betterprompt 
make toxic handle input in a more sane manner
 2013-08-09 09:29:56 -07:00
Konstantin Kowalski
fa6fd7566b Added headers to fix build errors. 2013-08-09 15:54:14 +00:00
Konstantin Kowalski
4f2ecd20e9 Minor style changes. 2013-08-09 15:45:34 +00:00
Konstantin Kowalski
5f41c30d66 Moved long comments to wiki. 2013-08-09 15:44:22 +00:00
Konstantin Kowalski
1033d897ca Added arrays. 2013-08-09 15:38:21 +00:00
Konstantin Kowalski
fdb3e194ba Added INFO() debugging macro. 2013-08-09 15:35:19 +00:00
Luke Champine
b378a246a0 make toxic handle input in a more sane manner 2013-08-09 10:31:29 -04:00
irungentoo
8542b5bac8 Merge pull request #407 from JFreegman/master 
fixed chat window text wrapping in toxic
 2013-08-09 05:35:01 -07:00
Christian Brueffer
0b8fa72914 Fix a recurring typo in code and comments. 2013-08-09 14:01:35 +02:00
Jfreegman
9910115b4e fixed chat window text wrapping 2013-08-09 00:25:45 -04:00
Konstantin Kowalski
7bd9c8399c Fixed a printf argument. 2013-08-09 01:49:13 +00:00
irungentoo
ff25b59fa6 added -n argument to toxic to disable loading keys from file (for testing) 2013-08-08 18:50:29 -04:00
irungentoo
5024bab930 Merge pull request #400 from JFreegman/master 
Added actions/alternative type of messages
 2013-08-08 12:40:15 -07:00
Jfreegman
982c86df1f added /me actions to toxic 2013-08-08 15:01:33 -04:00
Astonex
54bacf49c9 Update nTox_win32.c 
Mispelled function name
 2013-08-08 19:39:29 +01:00
Simon Levermann
320c5a6708 Merge branch 'upstream' 2013-08-08 18:06:10 +02:00
Simon Levermann
caedd4489e Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core into upstream 2013-08-08 18:05:41 +02:00
irungentoo
4542a6b829 Merge pull request #394 from Nominate/patch-2 
Updated chat.c to bring /status inline with prompt.c status command
 2013-08-08 08:27:19 -07:00
irungentoo
997a15d294 Merge pull request #393 from Nominate/patch-1 
Removed superfluous statusmsg
 2013-08-08 08:26:19 -07:00
irungentoo
a3a0fb57cb Moved a define and fixed another. 2013-08-08 10:59:22 -04:00
Simon Levermann
b5f5b1a111 Cleanup and Error fixes 
Add several frees that were missing to prevent memory leaks
Replace strcpy with strdup where appropriate
Replace _stat with __stat64 for building on Windows
 2013-08-08 16:36:16 +02:00
Simon Levermann
97e178db3a Implement proper config directories. 2013-08-08 16:00:12 +02:00
irungentoo
7d7dd641f9 Merge pull request #384 from stqism/master 
Adds full -D support to toxics versioning, includes the commit number
 2013-08-08 06:34:42 -07:00
Nominate
fde09712db Updated chat.c to bring /status inline with prompt.c status command 2013-08-08 11:22:48 +01:00
Nominate
d9750569ac Removed superfluous statusmsg 
Users can just respecify their status with a message.  This will also encourage users to think about which status is actually appropriate instead of just leaving the status alone.
 2013-08-08 11:09:46 +01:00
Sean Qureshi
4d0cce2f69 Merge https://github.com/irungentoo/ProjectTox-Core 2013-08-08 03:07:41 -07:00
Sean Qureshi
1bbdd9d2db Merged upstream main.c changes 2013-08-08 03:04:36 -07:00
Jfreegman
0f2b4e5c77 oops 2013-08-08 04:55:22 -04:00
Jfreegman
6f98fc47b0 fix magic numbers 2013-08-08 04:51:58 -04:00
Simon Levermann
d7e2cca854 Attempt to get and create a proper directory for config storage. 2013-08-08 10:15:07 +02:00
Sean Qureshi
b3e02d9c9d Adds full -D support to toxics versioning, includes the commit number 2013-08-07 18:52:11 -07:00
Maxim Biro
f669b28a6c Merge branch 'master' of http://github.com/irungentoo/ProjectTox-Core 
Conflicts:
	core/Messenger.c
	core/Messenger.h
 2013-08-07 19:18:40 -04:00
irungentoo
81fccf68d6 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-07 18:23:26 -04:00
irungentoo
00ecb05c1b Merge branch 'master' of https://github.com/stqism/ProjectTox-Core into pull-requests 
Conflicts:
	testing/toxic/prompt.c
 2013-08-07 18:20:36 -04:00
Maxim Biro
b1a2af23e5 Modified clients to properly work with the changes 2013-08-07 18:12:59 -04:00
Sean Qureshi
3622a5c04c Manually merged prompt.c to upstream 2013-08-07 10:57:17 -07:00
irungentoo
59f873fd68 Merge branch 'read-receipt' of https://github.com/stal888/ProjectTox-Core into pull-requests 
Conflicts:
	testing/toxic/chat.c
	testing/toxic/prompt.c
 2013-08-07 13:51:58 -04:00
Sean Qureshi
ece3407c55 Moved main.c to maaster 2013-08-07 10:36:32 -07:00
Robert Sutton
83112c588a Fix incompatible pointer type warning by changing type of print_statuschange to match parameter of userstatus callback. 2013-08-07 13:30:14 -04:00
Sebastian Stal
9f6262f3dd Check for correct error value in toxic. 2013-08-07 09:57:23 -07:00
Robert Sutton
a102fa7cb0 Add #undef before #define to fix redefinition warning 2013-08-07 12:54:42 -04:00
Sean Qureshi
2b916b96bd Fixed it not compiling 2013-08-07 09:35:37 -07:00
irungentoo
5a8da17e61 Merge branch 'provide-status-type' of https://github.com/jin-eld/ProjectTox-Core into pull-requests 2013-08-07 09:11:51 -04:00
irungentoo
0c4788030f Merge branch 'master' of https://github.com/ptrasd/ProjectTox-Core into pull-requests 2013-08-07 09:11:41 -04:00
irungentoo
e760c9eeff Merge pull request #360 from DarkSER/master 
fixed print_statuschange & m_set_userstatus usage in nTox_win32.c
 2013-08-07 06:07:44 -07:00
irungentoo
48d7d60a47 Merge pull request #370 from JFreegman/master 
Fixed two bugs
 2013-08-07 06:04:11 -07:00
Simon Levermann
924219b1ab Actually use write_result 2013-08-07 13:23:12 +02:00
Simon Levermann
6349ccc97b Don't ignore the result of fwrite. Since we're building with -Wall and -Werror, this causes compile failures. 2013-08-07 13:13:04 +02:00
Sergej
defabe8e0a set USERSTATUS_KIND_RETAIN as default 2013-08-07 09:43:05 +02:00
jin-eld
ba48234bfc Allow to set a specific userstatus type in toxic 
Use:
status <type> <message>, where type is one of
online
away
busy
offline

The message parameter is optional.

To set only the status message, as it was before, use:
statusmsg <message>
 2013-08-07 10:28:17 +03: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
3f3be026b7 forgot this 2013-08-07 02:52:56 -04:00
Jfreegman
90524356a7 Fixed two bugs 2013-08-07 02:34:55 -04:00
ptrasd
caa75b52c3 testing/toxic/prompt.c: changed execute() to ignore whitespace at end of commands 2013-08-07 02:25:20 -04:00
ptrasd
b32a7b2294 testing/toxic/prompt.c: changed execute() to skip whitespace at start of command 2013-08-07 02:10:46 -04:00
Nick ODell
e18bbaf118 Merge remote-tracking branch 'upstream/master' 2013-08-06 18:13:58 -06:00
Nick ODell
34f531553a Fix bug where file handle wasn't closed on success 2013-08-06 18:11:13 -06:00
Konstantin Kowalski
f603342acf Added ERROR() and WARNING() for debugging. 2013-08-06 18:11:13 -06:00
Konstantin Kowalski
60f333328c Added a linked list implementation. 2013-08-06 18:11:12 -06:00
irungentoo
804216580d Merge pull request #363 from JFreegman/master 
code format/clean up
 2013-08-06 16:59:34 -07:00
Jfreegman
16b3ec746e code format/clean up 2013-08-06 18:27:51 -04:00
Konstantin Kowalski
3dfaa464ac Added ERROR() and WARNING() for debugging. 2013-08-06 16:47:15 -04:00
DarkSER
14413c4724 fixed print_statuschange & m_set_userstatus usage in nTox_win32.c 2013-08-06 22:06:17 +02:00
Konstantin Kowalski
543b129ba7 Added a linked list implementation. 2013-08-06 13:52:05 -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
Sebastian Stal
37afc3c583 Windoze 2013-08-05 17:20:41 -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
Jfreegman
a91aee0a9f Merge remote-tracking branch 'upstream/master' into testing 2013-08-05 13:42:15 -04: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
irungentoo
519e22677a Merge pull request #312 from Niautanor/master 
fix for Issue #288
 2013-08-05 07:19:50 -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
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
Tim Malte Gräfje
0259cb0194 added fix in nTox_win32.c 2013-08-04 13:01:20 +02: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
Tim Malte Gräfje
5817c2c888 fix for #288 
nTox will now display a message if you try to accept a not yet received
or already accepted friend request
 2013-08-04 01:46:54 +02: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
Sean Qureshi
7dd63b45ca Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-02 19:55:44 -07:00
charmlesscoin
b9e3bf1fa6 changed some formatting, fixed the removal of x and y 2013-08-02 22:34:45 -04:00
Jfreegman
8fa074db5e cursor done better, fixed for chat windows 2013-08-02 21:36:01 -04:00
charmlesscoin
3678b302db cleaned up print_friendlist(), it now prints a message if you have _no_ friends 2013-08-02 21:22:02 -04:00
Sean Qureshi
d19b4b9db1 Moved PATCH.md to the toxic folder 2013-08-02 17:50:35 -07:00
Sean Qureshi
8bc8016291 By popular demand, I made a patch to add seconds to the timestamp 2013-08-02 17:44:30 -07:00
Sean Qureshi
9267ab2fca Fixed a bug with the minutes only being 1 character long when less than 10 2013-08-02 17:14:47 -07:00
charmlesscoin
f906fd628f cleaned up my changes 2013-08-02 19:54:57 -04:00
charmlesscoin
809ee9af75 new_lines should use strncpy, and wrote get_id() to declutter code 2013-08-02 19:51:08 -04:00
Sean Qureshi
10feea4474 Adds timestamp to toxic, fixes issue #217 2013-08-02 16:44:32 -07:00
irungentoo
f8f24ba48a Fixed crashes. 2013-08-02 16:56:53 -04:00
irungentoo
0ec775c50e Removed deprecated function. 2013-08-02 16:50:22 -04:00
irungentoo
f9d28d3792 Merge branch 'master' of https://github.com/Astonex/ProjectTox-Core into Astonex-master 
Conflicts:
	testing/nTox_win32.c
 2013-08-02 16:36:52 -04:00
irungentoo
61f41474e3 Fixed warnings. 2013-08-02 16:29:21 -04:00
Astonex
58ef293ca4 Update nTox_win32.c 
Changed maxnumfriends to uint32_t
 2013-08-02 19:50:32 +01:00
Astonex
b1be9eebd0 Re-arranged the code, and added a maxnumfriends counter 2013-08-02 19:46:43 +01:00
ragesalmon
563c2b3157 Fixed a build error due to the removal of getnumfriends() 2013-08-02 12:40:39 -04:00
Jfreegman
7189f4c7b2 fixed cursor 2013-08-02 05:10:41 -04:00
irungentoo
af8e843451 Merge pull request #229 from JFreegman/master 
fixed friend add bugs and gave no message its own error
 2013-08-01 17:38:29 -07:00
irungentoo
4c949c5b13 Merge pull request #252 from nickodell/master 
Fix a bug and remove useless code.
 2013-08-01 16:52:25 -07:00
Nick ODell
67b7523b18 Remove code that did nothing. 2013-08-01 16:19:01 -06:00
Nick ODell
ff2e04b107 Fix bug where messages from yourself were preceeded by [-1] 2013-08-01 16:15:56 -06:00
plutooo
9fbff0c758 nTox: fixed 2 possible crashes, 3 incorrect packet lengths 2013-08-01 16:28:48 -04:00
Jfreegman
8abc0a3462 added error code for no message on friend add & updated nTox.c/nTox_win32.c 2013-08-01 15:27:08 -04:00
irungentoo
f6c510b3cc Merge pull request #244 from plutooo/master 
core: getaddrinfo() lookup error handling
 2013-08-01 12:21:45 -07:00
plutooo
3d916b35f2 core: getaddrinfo() lookup error handling 2013-08-01 11:54:06 -07:00
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
Jfreegman
a604de9017 fixed friend add bugs 2013-07-31 21:44:57 -04: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
irungentoo
374a4e32cb Merge pull request #155 from Astonex/master 
Updating nTox_win32 and adding Messenger.c method
 2013-07-30 04:22:39 -07:00
Emir Unluturk
1c345e7f6b Add invalid command 2013-07-30 12:31:02 +03:00
Astonex
6ea5420a07 Implemented m_delfriend() 2013-07-30 09:56:39 +01:00
Astonex
d5e5412cb3 Slight aesthetic change 2013-07-30 09:23:15 +01:00
Astonex
e920be4c01 Fixed the friends listing 2013-07-30 09:21:22 +01:00
Astonex
84a0871cf6 Fixed bugs, added friend listing (slightly buggy), and changed the general aesthetics 2013-07-30 08:52:18 +01:00
Ryan Lewon
20aad9c73b Removed unneeded include. 
Fixed formatting and cleaned up output.
 2013-07-30 07:26:58 +00:00
Ryan Lewon
09a71f37ec New friend list function for nTox client. 2013-07-30 07:19:54 +00:00
Maxim Biro
1d8f6e94e7 Fixed formatting of some cmake files 2013-07-29 20:45:53 -04:00
irungentoo
d503941f6c Merge pull request #138 from Astonex/master 
nTox modified for Windows (ncurses removed)
 2013-07-29 17:43:55 -07:00
Astonex
59ccce35a6 Added multi-threading so user input doens't hold up checking the network 2013-07-30 01:27:48 +01:00