summaryrefslogtreecommitdiff
path: root/core
AgeCommit message (Collapse)Author
2013-08-12Resolve Merge Conflictslvr
2013-08-12Merge remote-tracking branch 'upstream/master' into timerslvr
Conflicts: core/Messenger.c
2013-08-12remember to call timer_pollslvr
2013-08-12Messenger Timerslvr
2013-08-12Added LAN discovery timerslvr
2013-08-12Added support for userdata in callbacksalek900
2013-08-12Implemented Deadline Timer and timer_testslvr
2013-08-12Messenger refactor - redid work from pull request 79Chris Hall
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-11Send our current status and name to friend that just came online.alek900
Our username and status might have changed while our friend was offline.
2013-08-11Fixed a mistakeMaxim Biro
2013-08-11Fixed a typoMaxim Biro
2013-08-11Replaced friendstatus with connectionstatusMaxim Biro
2013-08-11Fixed warnings on WindowsMaxim Biro
2013-08-11Merge pull request #429 from dparnell/pristineirungentoo
Fixed m_sendmessage to return the ID of the message sent
2013-08-11Merge pull request #427 from Alek900/masterirungentoo
m_addfriend triggerd m_callback_friendstatus with a friendid thats not yet returned from m_addfriend
2013-08-11Fixed m_sendmessage to return the ID of the message sentDaniel Parnell
2013-08-11m_addfriend triggerd m_callback_friendstatus with a friendid thats not ↵alek900
returned yet from m_addfriend
2013-08-10Merge pull request #422 from slvr/crypto-speed-boostirungentoo
Cryptography speed boost
2013-08-10That define doesn't belong here.irungentoo
2013-08-10handle_ping_response function signature correctionslvr
2013-08-10Merge remote-tracking branch 'upstream/master' into prslvr
2013-08-10Ensure encrypt_precompute is called when status == CONN_ESTABLISHEDslvr
2013-08-10Implemented encrypt_data_fast, decrypt_data_fast and crypto testsslvr
2013-08-10tabs -> spacesslvr
2013-08-10networking_poll: receivepacket(&ip_port, data, &length) == -1slvr
2013-08-09Fixed possible bug.irungentoo
2013-08-10core/substrate.h wasn't supposed to be hereslvr
2013-08-10fixed typo: handle_ping_request -> handle_ping_responseslvr
2013-08-10Updated initMessengerslvr
2013-08-10network_registerhandlerslvr
2013-08-09Merge pull request #413 from nurupo/masterirungentoo
Cleanup of Messenger.c
2013-08-09Returned the length checkMaxim Biro
2013-08-09Introduced data pointer and data_lengthMaxim Biro
2013-08-09Changed the way statusmessage is allocatedMaxim Biro
2013-08-09Moved some checks aroundMaxim Biro
2013-08-09Extracted repeated code into a functionMaxim Biro
2013-08-09Kill EOF whitespace.Christian Brueffer
2013-08-09Fix a recurring typo in code and comments.Christian Brueffer
2013-08-08Merge pull request #403 from jin-eld/fix-friend-status-callbackirungentoo
Fix typo in function name which results in missing symbol
2013-08-09Fix typo in function name which results in missing symboljin-eld
2013-08-08Merge pull request #400 from JFreegman/masterirungentoo
Added actions/alternative type of messages
2013-08-08added actions/alternate messagesJfreegman
2013-08-08Merge branch 'master' of https://github.com/nurupo/InsertProjectNameHere ↵irungentoo
into nurupo-master Conflicts: core/Messenger.c
2013-08-08Made name consistent with other 'on change' callbacksMaxim Biro
2013-08-08Fixed a silly code ordering mistakeMaxim Biro
2013-08-08Fixed dynamic memory allocation.irungentoo
2013-08-08Merge pull request #396 from lukechampine/dynamicfriendsirungentoo
make friendlist resize dynamically
2013-08-08Moved a define and fixed another.irungentoo
2013-08-08make friendlist resize dynamicallyLuke Champine
2013-08-08Made a callback for Friend.status changeMaxim Biro