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 |
|