Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-06-24 11:49:19 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
13936 commits 25 branches 0 tags 1.1 GiB
Commit graph

13936 commits

This branch
This branch
All branches
Author SHA1 Message Date
wangyix
06f8464ec9 edit nacks ready for test; seq numbers sometimes repeat?? 2014-06-16 17:17:48 -07:00
Philip Rosedale
0084c36cd0 Merge pull request #3024 from Barnold1953/OculusOverlay 
Exposed sixense mouse options and oculus UI angle to prefs
 2014-06-16 16:42:33 -07:00
wangyix
e3db60d1ef forgot to add "break;"s 2014-06-16 16:42:04 -07:00
wangyix
4d84e1fff1 added processNackPacket calls to DatagramProcessor 2014-06-16 16:41:00 -07:00
wangyix
18a9d74b88 changed OctreeEditPacketSender to queue packets for resend as nack is parsed 2014-06-16 16:35:30 -07:00
wangyix
95b2524784 removed magic number 65536 from OctreeInboundPacketProcessor 2014-06-16 16:08:48 -07:00
wangyix
5e37704772 SentPacketHistory now handles rollover 
updated SentPacketHistory path in comments
 2014-06-16 15:59:38 -07:00
wangyix
ddfe98ad43 added code to parse nack packets in OctreeEditPacketSender 2014-06-16 15:32:39 -07:00
barnold1953
2b374470b0 Allow clicking on magnified controls 2014-06-16 15:24:53 -07:00
Andrzej Kapolka
77b6a209ab More progress on json reading. 2014-06-16 14:51:22 -07:00
barnold1953
84d183b2bc Switched Oculus magnify method to a manual mode 2014-06-16 14:46:40 -07:00
Kai Ludwig
d08b63b247 changed 2000 into a constant defined inline 2014-06-16 23:30:28 +02:00
wangyix
14f50f4576 removed old SentPacketHistory 2014-06-16 14:05:27 -07:00
wangyix
69c2a2d12b moved SentPacketHistory to libraries/networking/src 2014-06-16 14:04:21 -07:00
wangyix
0f7ce694c0 minor changes before moving SentPacketHistory 2014-06-16 13:52:01 -07:00
wangyix
ebfd65dea8 added OctreeInboundPacketProcessor::process() override to send nack periodically 
added code to remove dead nodes' stats in sendNackPackets()
 2014-06-16 12:30:16 -07:00
Stephen Birarda
f84abeaa7b Merge pull request #3027 from huffman/19779 
Code Review for Job #19779
 2014-06-16 11:51:17 -07:00
Ryan Huffman
9faf9d7749 Remove extra connect and disconnect for multipleDestinationsDecision 2014-06-16 11:43:04 -07:00
Ryan Huffman
a13810bd72 Merge branch 'master' of git://github.com/highfidelity/hifi into 19779 
Conflicts:
	interface/src/location/LocationManager.cpp
 2014-06-16 11:35:55 -07:00
Ryan Huffman
978b7521db Move connect call for multiple destinations to constructor 2014-06-16 11:30:47 -07:00
Brad Hefta-Gaub
e8a7c5dbb4 Merge pull request #3026 from Atlante45/model_support_for_inspect_js 
Model support for inspect js
 2014-06-16 11:03:32 -07:00
Atlante45
b3b3a72946 Disable editModels.js mouse events when ALT is pressed. (no conflict with inspect.js) 2014-06-16 10:55:34 -07:00
Atlante45
d5aa12db7d Added models support to inspect.js 2014-06-16 10:55:05 -07:00
Ryan Huffman
af3b2a9d0f Update LocationManager::goTo to use new addresses API 
The new API address is now used for goTo when # or @ isn't present
Fixed the multiple locations popup to show when multiple locations are
found
 2014-06-16 10:43:13 -07:00
barnold1953
031fe323ea Got rid of some verbosity 2014-06-16 10:12:09 -07:00
barnold1953
94e58e9559 Fixed coding standard and made getCursorPixelRangeMultiplier more clear 2014-06-16 10:04:56 -07:00
wangyix
2b20720f51 added sendNackPackets() to OctreeInboundPacketProcessor 
added rollover handling in _missingSequenceNumbers pruning; added
EditNack packet types; added getMyEditNackType() to OctreeServer
subclasses; added code to randomly skip edit packet sequence numbers for
testing in OctreeEditPacketSender
 2014-06-16 09:57:05 -07:00
Andrzej Kapolka
24ec441df7 Starting to work on JSON reading. 2014-06-15 17:57:09 -07:00
Andrzej Kapolka
3ec127afde Spoke a little too soon. 2014-06-15 16:46:43 -07:00
Andrzej Kapolka
f4bd2a8beb I think that basically covers the JSON writing portion. 2014-06-15 16:23:54 -07:00
Kai Ludwig
8c700d43f3 Modified CALLBACK_ACCELERATOR_RATIO for windows because some systems need larger input buffer to work fine. 2014-06-15 21:08:14 +02:00
Kai Ludwig
05900420a5 Replaced windows usleep version with a non busy waiting high accuracy version. This fixes the high CPU load for the windows servers too! 2014-06-15 21:07:03 +02:00
Kai Ludwig
3fbde70f96 Added functions to test usleep, msleep and sleep for accuracy. 2014-06-15 21:05:23 +02:00
Stojce Slavkovski
f1e008853c Merge branch 'master' of https://github.com/highfidelity/hifi into 19755 2014-06-15 12:36:14 +02:00
Andrzej Kapolka
aac7459f42 More work on JSON encoding. 2014-06-13 18:32:57 -07:00
Andrzej Kapolka
7db05f2c8e Working on JSON encoding. 2014-06-13 16:25:38 -07:00
barnold1953
bef625d237 Removed pointless Code 2014-06-13 16:14:03 -07:00
barnold1953
53d4cc795a Removed unused UI types that clutter code 2014-06-13 16:09:45 -07:00
barnold1953
587c0e5a9d Render Oculus pointers separate from texture for better quality 2014-06-13 16:01:59 -07:00
barnold1953
7e4317d5d2 Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay 2014-06-13 15:06:11 -07:00
barnold1953
cb1669653d Mouse reticle bigger in oculus 2014-06-13 15:05:23 -07:00
barnold1953
c593117ac5 New reticle for sixense and oculus mouse movement 2014-06-13 15:03:09 -07:00
Stephen Birarda
3c42e31b4f Merge pull request #3022 from jmgrosen/19780 
Code Review for Job #19780
 2014-06-13 15:02:11 -07:00
John Grosen
1a3de1ef28 Totally removed DataServerAccountInfo's JSON constructor 2014-06-13 15:01:20 -07:00
barnold1953
230af7f5a7 Stopped clamping the magnification 2014-06-13 13:49:35 -07:00
barnold1953
3747a5eeae update hemisphere VBO on ui size change 2014-06-13 13:38:28 -07:00
Andrzej Kapolka
10875c5e61 Fix for setID. 2014-06-13 12:12:17 -07:00
Andrzej Kapolka
8480f08816 Merge branch 'master' of https://github.com/highfidelity/hifi into metavoxels 2014-06-13 12:01:08 -07:00
Andrzej Kapolka
9fc84d6358 Generics up and running. 2014-06-13 12:00:42 -07:00
barnold1953
422db14812 Fixed some improper logic and used better defaults 2014-06-13 11:34:57 -07:00