Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-16 15:48:58 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2
28725 commits 69 branches 56 tags 1.2 GiB
Commit graph

28725 commits

This branch
This branch
All branches
Author SHA1 Message Date
Stephen Birarda
0f534b9f7b fixes for new read and NLPacketList 2015-07-17 15:43:20 -07:00
Stephen Birarda
ad63be4efc Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-17 15:40:03 -07:00
Atlante45
e3f7c33767 Fix index check in setJointRotation 2015-07-17 15:39:25 -07:00
Stephen Birarda
dbc19cb467 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-17 15:39:20 -07:00
Atlante45
d505527e5a Remove setExtendedheader call 2015-07-17 15:38:36 -07:00
Atlante45
c97c2f0ed0 Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-17 15:32:45 -07:00
Stephen Birarda
59e14dfd65 Merge branch 'protocol' of https://github.com/huffman/hifi into atp 2015-07-17 15:32:09 -07:00
ZappoMan
ccd2f98a76 one more try 2015-07-17 15:28:25 -07:00
Stephen Birarda
34617f0391 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-17 15:28:01 -07:00
Stephen Birarda
9a4cc1308d fix packet list segment break 2015-07-17 15:27:57 -07:00
Ryan Huffman
1e7691941c Add raw data read to Packet 2015-07-17 15:27:29 -07:00
Atlante45
3f4041595a Fix compile error in connect 2015-07-17 15:26:04 -07:00
Andrew Meadows
32b1fe0918 proper fix for incorrect render of scaled entities 2015-07-17 15:21:02 -07:00
Atlante45
cbf7f7c2e1 Merge branch 'protocol' of https://github.com/birarda/hifi into protocol 2015-07-17 15:16:21 -07:00
Stephen Birarda
8447046636 Merge pull request #7 from birarda/atp 
repairs for new networking code
 2015-07-17 15:07:58 -07:00
Brad Hefta-Gaub
2df75f8bff Merge pull request #5337 from bwent/audioStatsDialog 
Added a dialog box to display Audio Network Statistics
 2015-07-17 14:45:51 -07:00
Stephen Birarda
fe0cdc0529 put AvatarHashMap slots back to private 2015-07-17 14:35:38 -07:00
Bradley Austin Davis
3bfa8aae0b Removing debug output 2015-07-17 14:34:24 -07:00
Brad Davis
914b47069b Working on line height 2015-07-17 14:33:32 -07:00
Bradley Austin Davis
24643ca282 Working on line spacing 2015-07-17 14:19:39 -07:00
Stephen Birarda
8ff8a17f02 remove TODO added for DS, check sockets 2015-07-17 14:17:48 -07:00
Stephen Birarda
8a2bb55231 add back a removed comment from jurisdiction map 2015-07-17 14:00:02 -07:00
Stephen Birarda
08bd2adb51 remove dead listeners from set of directly connected objects 2015-07-17 13:58:14 -07:00
bwent
5ba82faa4b keyLightDirection displays in degrees in edit.js UI 2015-07-17 13:52:00 -07:00
Brad Davis
6f998e5d28 Working on line spacing on mac 2015-07-17 13:32:31 -07:00
ZappoMan
4dadf60724 some tweaks from Sam 2015-07-17 12:50:20 -07:00
Bradley Austin Davis
c5e0298f8d Working on mac sizing 2015-07-17 12:22:38 -07:00
Andrew Meadows
1c7afbda04 workaround for bad sphere radius 2015-07-17 12:14:53 -07:00
Andrew Meadows
f09b3eb736 set creation time when loading unknown timestamp 2015-07-17 12:14:07 -07:00
David Rowe
550e9224c5 Mute / un-mute face tracking when menu item is changed from script 2015-07-17 11:45:15 -07:00
ZappoMan
33464dfd6c cleanup dead code 2015-07-17 11:35:42 -07:00
Howard Stearns
2d277a2abd Fix https://app.asana.com/0/30233891560551/41734486809354/f 2015-07-17 11:28:25 -07:00
Stephen Birarda
1c98c5e02c remove unregisterListener that isn't needed anymore 2015-07-17 11:20:05 -07:00
Stephen Birarda
7a13c867ae quit the ScriptEngine thread once the script is done 2015-07-17 11:18:14 -07:00
Howard Stearns
c9658b2c13 Merge pull request #5354 from PhilipRosedale/master 
Sample script flockOfBirds.js with sounds and flocking behavior
 2015-07-17 13:15:08 -05:00
Stephen Birarda
eaeaa23f03 resolve conflicts on merge with origin/protocol 2015-07-17 11:10:30 -07:00
Stephen Birarda
33f42bec78 Merge branch 'protocol' of https://github.com/Atlante45/hifi into atp 2015-07-17 11:07:17 -07:00
Atlante45
fec6b6b0bb Merge branch 'protocol' of https://github.com/huffman/hifi into protocol 2015-07-17 11:07:13 -07:00
Stephen Birarda
eb80922325 Merge branch 'protocol' of https://github.com/huffman/hifi into atp 2015-07-17 11:07:10 -07:00
Stephen Birarda
357963b6e0 fix reference to packet that is now buffer 2015-07-17 11:06:39 -07:00
Atlante45
6da9825bac Include stdlib string instead of cstring 2015-07-17 11:06:23 -07:00
Stephen Birarda
e5722098f6 resolve conflicts on merge with upstream/master 2015-07-17 11:06:01 -07:00
Ryan Huffman
9725184b24 Move dataSent signal from PacketReceiver to LimitedNodeList 2015-07-17 11:05:07 -07:00
Atlante45
fbaf25f3f9 Remove unused header 2015-07-17 11:04:54 -07:00
bwent
b22fd3f4a0 fixed lagging issues 2015-07-17 10:58:30 -07:00
Atlante45
cf453952f4 Rename should nack 2015-07-17 10:52:27 -07:00
Atlante45
7487f708b9 Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-17 10:49:40 -07:00
Stephen Birarda
0811553c41 add a direct registration for EntityEditPacketSender 2015-07-17 10:49:24 -07:00
Ryan Huffman
68564a79b0 Merge branch 'protocol' of github.com:Atlante45/hifi into protocol 2015-07-17 09:59:05 -07:00
Atlante45
7f9d6dafce Merge branch 'atp' of https://github.com/birarda/hifi into protocol 2015-07-17 09:56:41 -07:00