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 |
|
irungentoo
|
a39ee46b18
|
Fixed build.
|
2013-07-29 19:42:04 -04:00 |
|
plutooo
|
04fdd9eadb
|
Initial commit for Toxic, a new curses interface for Tox.
Still a work-in-progress.
|
2013-07-29 16:32:39 -07:00 |
|
Astonex
|
7e973c8cac
|
Some changes so the user's ID gets displayed
|
2013-07-30 00:05:51 +01:00 |
|
Astonex
|
0cd561ee48
|
Removed unsued HISTORY define
|
2013-07-29 23:15:12 +01:00 |
|
Astonex
|
6c6a54b132
|
Adding nTox_win32.make
|
2013-07-29 23:11:20 +01:00 |
|
Astonex
|
5ad33e7398
|
Essentially nTox without the ncurses for Windows. Slightly modified main()
|
2013-07-29 23:00:56 +01:00 |
|
notadecent
|
200e704be5
|
Minor formatting edits
|
2013-07-29 20:17:30 +02:00 |
|
irungentoo
|
caaa1ff888
|
nTox now tells you if it could not send the message.
|
2013-07-27 21:33:01 -04:00 |
|
irungentoo
|
b83359cd05
|
Added friend request accepting to nTox and fixed a bug.
Fixed a bug in Lossless UDP that prevented 2 clients from sometimes
connecting when they connected at the same time to each other.
|
2013-07-27 20:04:56 -04:00 |
|
nfkd
|
52a11813a6
|
styling
|
2013-07-27 13:43:30 -03:00 |
|
Konstantin Kowalski
|
ecab4c8777
|
Fixing broken commit
|
2013-07-27 12:17:31 -04:00 |
|
Konstantin Kowalski
|
b3fa1fc8f4
|
[fixed]created new files misc_tools.(c|h) and moved hex_string_to_bin() there.
|
2013-07-27 12:10:41 -04:00 |
|
Konstantin Kowalski
|
77ebbed91b
|
created new files misc_tools.(c|h) and moved hex_string_to_bin() there.
|
2013-07-27 10:53:01 -04:00 |
|
Konstantin Kowalski
|
241aca98bd
|
A *lot* of style changes.
|
2013-07-26 23:07:25 -04:00 |
|
Konstantin Kowalski
|
a1b93c397c
|
took out several strlen() calls out of the loop; replaced int's with size_t where needed
|
2013-07-26 16:16:58 -04:00 |
|
SilentSand
|
59b34e423b
|
Formatting.
Many stylistic changes, mostly formatting code more closely to the
coding style.
|
2013-07-26 04:02:17 -04:00 |
|
SilentSand
|
f377eb9ca2
|
Licensing
Added the GPLv3 license to some files in addition to fixing some
comments at the beginning of the files.
|
2013-07-25 21:45:56 -04:00 |
|
Maxim Biro
|
ea550d4c86
|
Some cleanup
|
2013-07-23 12:23:17 -04:00 |
|
irungentoo
|
11d02de9a1
|
Fixed small thing in DHT.
|
2013-07-22 16:26:10 -04:00 |
|
irungentoo
|
37b7e4c12e
|
Merge stuff from notadecent.
|
2013-07-22 15:30:59 -04:00 |
|
irungentoo
|
55361eac6f
|
Modified the way friend requests worked.
Added routing of friend requests.
|
2013-07-22 14:52:42 -04:00 |
|
TrevorDorl
|
488c8af0c9
|
Adds the option 'nokey' to disable loading and saving keys, for debugging purposes
|
2013-07-22 12:09:30 -05:00 |
|
irungentoo
|
635e921c14
|
Fixed warnings.
|
2013-07-22 07:26:25 -04:00 |
|
irungentoo
|
11891e2475
|
Merge pull request #84 from nurupo/master
Improved build system
|
2013-07-22 04:09:45 -07:00 |
|
Maxim Biro
|
2ab2ebe5a5
|
Fixed comments
|
2013-07-21 21:32:15 -04:00 |
|
Maxim Biro
|
d60f5eafdb
|
Excluded tests that are not currently supported on building platform
|
2013-07-21 21:12:44 -04:00 |
|
Oliver Hunt
|
1dbd121ea8
|
moved saving to nTox.c
|
2013-07-22 02:11:19 +01:00 |
|
Maxim Biro
|
6260df230f
|
Fixed missed version and policy
|
2013-07-21 20:51:37 -04:00 |
|
irungentoo
|
c211e361d2
|
Merge pull request #76 from notadecent/master
Updated nTox.c (added timestamp)
|
2013-07-21 14:37:31 -07:00 |
|
notadecent
|
7863a552aa
|
Updated nTox.c (added timestamp)
It's very glitchy. But it works.
|
2013-07-21 22:54:09 +02:00 |
|
irungentoo
|
550725c11a
|
Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core
|
2013-07-21 13:15:42 -04:00 |
|
irungentoo
|
7fecd73ae0
|
Added routing functions to DHT.
|
2013-07-21 13:14:36 -04:00 |
|