Commit Graph

644 Commits

Author SHA1 Message Date
irungentoo
9e5800ab10 Fixed regression. 2013-08-02 20:21:49 -04: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
irungentoo
802236272f Merge branch 'Jeffail-master' 2013-08-02 16:20:26 -04:00
irungentoo
7b46b04ce7 Time is better as an unsigned variable. 2013-08-02 15:57:53 -04:00
irungentoo
346e4b28ca Fixed problems. 2013-08-02 15:28:48 -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
irungentoo
948c82a0cb Merge pull request #273 from rlt3/master
Changing INSTALL.md in response to Issue #239
2013-08-02 11:30:43 -07:00
rlt3
960078db40 INSTALL.md should reflect how you build on OSX now. 2013-08-02 14:05:23 -04:00
rlt3
e739de92aa reverting unneeded changes 2013-08-02 14:01:34 -04:00
rlt3
e13e714099 Forgot the include to packages to grab for the non-homebrew steps 2013-08-02 13:50:02 -04:00
rlt3
1c99d5c52e removing useless files 2013-08-02 13:43:54 -04:00
rlt3
14c8f7f6f8 changing OSX instructions in INSTALL.md to reflect how everything works 2013-08-02 13:42:30 -04:00
irungentoo
a464752060 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-02 13:03:54 -04:00
irungentoo
85324e07a0 Merge pull request #269 from ragesalmon/master
Fixed a build error due to the removal of getnumfriends()
2013-08-02 10:01:01 -07:00
ragesalmon
563c2b3157 Fixed a build error due to the removal of getnumfriends() 2013-08-02 12:40:39 -04:00
charmlesscoin
b114575df8 updated return value comments 2013-08-02 12:35:34 -04:00
charmlesscoin
4b49df896f added #defines for friend.status as well as for erroring on m_addfriend* 2013-08-02 12:33:11 -04:00
irungentoo
2a074d1160 Merge branch 'master' into Jeffail-master 2013-08-02 12:17:24 -04:00
irungentoo
eba7fdb9ba Merge pull request #265 from theshadowfog/patch-4
Update README.md
2013-08-02 08:53:21 -07:00
irungentoo
c7d383dd25 Merge pull request #266 from CharmlessCoin/core
Removed getnumfriends()
2013-08-02 08:53:12 -07:00
irungentoo
df8a8ff67e Merge branch 'master' into Jeffail-master 2013-08-02 11:46:12 -04:00
charmlesscoin
6ed5b89e5b removed getnumfriends() 2013-08-02 11:36:39 -04:00
irungentoo
d428091b46 Merge branch 'master' of https://github.com/irungentoo/ProjectTox-Core 2013-08-02 11:13:35 -04:00
Andreas Schneider
247c420957 cmake: Rewrite FindSODIUM.
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Signed-off-by: irungentoo <irungentoo@gmail.com>
2013-08-02 11:12:27 -04:00
Greg
388076a8e8 Update README.md
Added link to commands.rst
2013-08-02 10:55:57 -04:00
irungentoo
b9176974a8 Merge branch 'master' into Jeffail-master
Conflicts:
	core/DHT.c
2013-08-02 10:41:03 -04:00
irungentoo
a2b4b3fa8d Merge pull request #263 from theshadowfog/patch-7
Update commands.rst
2013-08-02 06:47:08 -07:00
Andreas Schneider
20951dda7d DHT: Fix return value of time().
Signed-off-by: Andreas Schneider <asn@cryptomilk.org>
Signed-off-by: irungentoo <irungentoo@gmail.com>
2013-08-02 09:41:22 -04:00
Greg
751ecba283 Update commands.rst 2013-08-02 09:17:29 -04:00
irungentoo
7379392d80 Merge pull request #253 from nickodell/master
Remove some magic numbers; use macros to clarify intent
2013-08-02 04:54:57 -07:00
irungentoo
eba742896f Merge pull request #262 from stqism/master
Fixed the WIKI link, made the first INSTALL.md a link
2013-08-02 04:36:54 -07:00
irungentoo
f2c713fd8f Merge pull request #259 from JFreegman/master
fixed cursor in toxic.c
2013-08-02 04:33:50 -07:00
Sean Qureshi
35d24ab02e The bold INSTALL.md did not look correct 2013-08-02 04:30:46 -07:00
Sean Qureshi
637096be33 Updated the readme to the new wiki page, linked the Mac OSX INSTALL.md 2013-08-02 04:27:41 -07:00
Jeffail
67efb67f96 Refactored DHT.c from end of NAT punching to EOF 2013-08-02 10:59:09 +01:00
Jeffail
bcf36e8115 Refactored DHT.c, all of NAT punching functions (line 1217 2013-08-02 10:56:10 +01:00
Jeffail
1708dc1a88 Refactored DHT.c down to line 1048 (beginning of NAT) 2013-08-02 10:53:28 +01:00
Jeffail
f9816b43f3 Refactored DHT.c down to line 881 2013-08-02 10:49:54 +01:00
Jeffail
cef8a3e4e5 Refactored DHT.c down to line 779 2013-08-02 10:47:32 +01:00
Jeffail
a5a1f917ab Refactored DHT.c down to line 567 2013-08-02 10:43:00 +01:00
Jeffail
e7f74555ea Refactored DHT.c down to line 367 2013-08-02 10:39:04 +01:00
Jeffail
fda296e41d Refactored client/friend helper functions (down to line 274) 2013-08-02 10:32:25 +01:00
Jfreegman
fd9ca04c9b Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core 2013-08-02 05:12:15 -04:00
Jfreegman
7189f4c7b2 fixed cursor 2013-08-02 05:10:41 -04:00
Jfreegman
1205b902e4 rm unused arg 2013-08-02 05:08:04 -04:00
Jfreegman
fbf92e4f5e remove cursor from friend and chat windows 2013-08-02 04:58:15 -04:00