Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-25 01:19:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
27793 commits 71 branches 56 tags 1.2 GiB
Commit graph

27793 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
6cf0018914 repairs required for domain-server build 2015-07-09 11:07:13 -07:00
Stephen Birarda
19c5f0b67c resolve conflicts on merge with upstream/master 2015-07-08 22:54:36 -07:00
Stephen Birarda
8c2cf2cf25 fix an unused variable warning 2015-07-08 22:48:44 -07:00
Stephen Birarda
f2a198dfdd add O_OBJECT macros to appropriate classes, fix PacketList errors 2015-07-08 22:46:43 -07:00
Brad Hefta-Gaub
02c3b63f45 Merge pull request #5282 from jherico/entity_parsing 
Working on fixing entity item parsing
 2015-07-08 21:02:23 -07:00
Brad Davis
b173ac397c Merge pull request #5278 from samcake/yellow 
Adding more NSight instrumentation
 2015-07-08 20:28:18 -07:00
Stephen Birarda
302e502d84 remove NLPacket forward declare 2015-07-08 20:17:23 -07:00
Stephen Birarda
8935baf3aa add missing return of new packet 2015-07-08 20:11:08 -07:00
Stephen Birarda
d3e48e1293 fix a missing templated type in PacketList 2015-07-08 20:08:25 -07:00
Atlante45
cb49d89369 Fix link errors 2015-07-08 19:56:07 -07:00
Atlante45
405e4f37ab Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-08 19:17:14 -07:00
Stephen Birarda
46e6f9cf4f add a type for templated return 2015-07-08 19:15:40 -07:00
Atlante45
0b0361f6fd Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-08 19:15:22 -07:00
Stephen Birarda
0d1c4a4177 add classes to templated methods 2015-07-08 19:14:32 -07:00
Stephen Birarda
b08c0d3817 Merge remote-tracking branch 'clement/protocol' into atp 2015-07-08 19:13:27 -07:00
Atlante45
6b8414d364 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-08 19:13:25 -07:00
Atlante45
263e737137 Move template func body outside of class 2015-07-08 19:13:01 -07:00
Stephen Birarda
8c188d6478 move templates below class in PacketList 2015-07-08 19:12:56 -07:00
Stephen Birarda
1f689c8fe6 Merge remote-tracking branch 'clement/protocol' into atp 2015-07-08 19:12:33 -07:00
Stephen Birarda
04e7b8cd02 fix static assert error message 2015-07-08 19:10:13 -07:00
Atlante45
846e9f8105 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-08 19:10:06 -07:00
Stephen Birarda
f6fbc14f5a put Packet templates in header 2015-07-08 19:07:45 -07:00
Stephen Birarda
cf7ae5fbf5 fix templated write/read in PacketList 2015-07-08 19:06:42 -07:00
Stephen Birarda
c2ae73650c go back to writing the number of deleted IDs 2015-07-08 19:03:42 -07:00
Stephen Birarda
8f900d22ca prefer typename to class for templates 2015-07-08 18:58:35 -07:00
Stephen Birarda
658ad6bd02 fix eachNode lambda in Application 2015-07-08 18:55:26 -07:00
Atlante45
4bc71bb39e Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-08 18:55:14 -07:00
Brad Davis
f2beb79d23 Updating buffer parser to use new heapless API 2015-07-08 18:54:38 -07:00
Stephen Birarda
86a218ad20 fix for templated read/write in PacketList 2015-07-08 18:52:15 -07:00
Stephen Birarda
b0b8dd2e7d add back readDatagram to get to build 2015-07-08 18:46:06 -07:00
Stephen Birarda
da3502eb6c resolve conflicts on merge with upstream/master 2015-07-08 18:41:48 -07:00
Atlante45
d4e01742e5 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-08 18:40:18 -07:00
Brad Davis
49a14e3446 Merge remote-tracking branch 'upstream/master' into entity_parsing 2015-07-08 18:37:41 -07:00
Stephen Birarda
cf15cbc62f fix a cast, move a packet 2015-07-08 18:37:25 -07:00
Stephen Birarda
c5840d085c replace packet header size check with 0 2015-07-08 18:35:56 -07:00
Stephen Birarda
dfa5be1a0c fix for killPacket in MyAvatar and DatagramProcessor header check 2015-07-08 18:35:04 -07:00
Brad Davis
625cc86f83 Merge pull request #5283 from ZappoMan/optimizeByteCountCoded 
Optimize ByteCountCoded<> to not do extra heap allocations
 2015-07-08 18:35:02 -07:00
Stephen Birarda
dc7c268467 fixes for changed API in Application 2015-07-08 18:27:10 -07:00
Atlante45
e2718d5c94 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-08 18:26:36 -07:00
Stephen Birarda
791c7e2de1 re-expose readDatagram to get back to build for writes 2015-07-08 18:25:56 -07:00
Stephen Birarda
9c18277e9c packet fixes in script-engine and Application 2015-07-08 18:24:49 -07:00
ZappoMan
7790e35d24 added bytes consumed result to decode, and exit early after bytes consumed 2015-07-08 18:19:12 -07:00
Brad Davis
600e9cbf52 Fixing template specialization compilation error on gcc/clang 2015-07-08 18:17:03 -07:00
Stephen Birarda
5dc09692b4 more packet creation fixes for entitites 2015-07-08 18:13:06 -07:00
Seth Alves
7bea4a54a3 Merge pull request #5274 from AndrewMeadows/argon 
cleanup of EntityActionInterface and friends
 2015-07-08 17:54:52 -07:00
ZappoMan
c0cdf3256c comment and dead code 2015-07-08 17:34:36 -07:00
ZappoMan
e885ac1821 improved performance of ByteCountCoding<> decode 2015-07-08 17:32:51 -07:00
Brad Davis
98e0688e98 Reducing heap allocation in network packet parsing 2015-07-08 17:21:38 -07:00
Philip Rosedale
61be0beba1 Merge pull request #5281 from howard-stearns/sword-offset-only-for-mosue 
sword-offset-only-for-mouse
 2015-07-08 17:13:45 -07:00
Howard Stearns
c8da325213 Fudge the offset so that operates only when using the mouse. 2015-07-08 16:59:54 -07:00