AndrewMeadows
c5bd3df046
Merge pull request #3033 from ZappoMan/raypickbug
...
add support for inside out ray intersection on AACube and AABox
2014-06-17 12:48:44 -07:00
barnold1953
bee84a064c
Dont render red border for mouse magnifier
2014-06-17 12:41:53 -07:00
Andrew Meadows
f18864bd72
Moved findRayIntersection() to the Shape classes
2014-06-17 12:36:36 -07:00
Andrzej Kapolka
7931173671
Working on tools to convert bitstreams to/from json.
2014-06-17 12:33:31 -07:00
barnold1953
2eda35ff1d
Merge branch 'master' of https://github.com/highfidelity/hifi into OculusOverlay
...
Conflicts:
interface/src/ui/ApplicationOverlay.cpp
2014-06-17 12:25:09 -07:00
barnold1953
e775d645a7
Fixed NAN error with magnification windows
2014-06-17 12:19:15 -07:00
Brad Hefta-Gaub
7362404aa2
Merge pull request #3032 from AndrewMeadows/say-no-to-warnings
...
remove build warnings
2014-06-17 12:17:44 -07:00
Brad Hefta-Gaub
9c27554f8a
Merge pull request #3028 from Atlante45/detached_mode_in_inspect_js
...
Added a detached mode by default in inpect.js
2014-06-17 12:15:00 -07:00
wangyix
5f62b43ba6
added edit nack types to non-verified list
2014-06-17 12:14:44 -07:00
ZappoMan
9a3f8508cf
add support for inside out ray intersection on AACube and AABox
2014-06-17 12:12:53 -07:00
Andrew Meadows
3f36325642
remove warnings about signed/unsigned comparison
2014-06-17 11:59:37 -07:00
Andrew Meadows
b37b9fb097
remove warnings about unused variables
2014-06-17 11:59:26 -07:00
wangyix
011e7c2de2
removed debug code
2014-06-17 11:53:09 -07:00
wangyix
8187912384
added qDebug() check in SentPacketHistory for seq numbers
...
used (unsigned short int)1 instead of 1 when calculating
expectedSequence
2014-06-17 11:34:35 -07:00
barnold1953
7bb8e4d571
Animated magnification opening and closing
2014-06-17 11:20:02 -07:00
wangyix
6e71523346
added OctreeEditPacketSender::nodeKilled(), no locks yet
...
also added nodeKilled() calls to the 3 editsenders in
Application::nodeKilled()
2014-06-17 10:58:44 -07:00
Andrew Meadows
018ba52b1c
merge upstream/master with andrew/inertia
2014-06-17 10:50:49 -07:00
Andrew Meadows
fa6aed3e01
Add unit tests for ray intersections with shapes.
2014-06-17 10:49:53 -07:00
Thijs Wenker
1e200c3b9c
The balance display didn't get over ~21.1 because the parsed json object int32 is maximal 2147483647, fixed this by parsing it from json to double.
2014-06-17 19:49:35 +02:00
Andrew Meadows
ab3d582d79
Add ray intersection tests against most shapes.
2014-06-17 10:49:14 -07:00
Andrew Meadows
e75340f8ce
Add PlaneShape::getNormal() method.
2014-06-17 10:48:29 -07:00
barnold1953
dc663dedf8
Fixed compiler warnings
2014-06-17 10:45:59 -07:00
wangyix
dc71f87ea4
edit nacks seem to be working;
...
added mutex for releaseQueuedPacket() to prevent duplicate packets being
queued up due to the steps of queueing the packet and clearing it not
being atomic.
2014-06-17 10:42:56 -07:00
Atlante45
f367e1840d
Added a detached mode by default in inpect.js
2014-06-17 10:37:35 -07:00
barnold1953
3052996a9e
Pressing trigger and bumper at same time toggles UI
2014-06-17 10:37:15 -07:00
Ryan Huffman
5843425db9
Fix scripts being loaded on start even if they don't exist
...
Application::loadScript should not store a reference to a script until
it has been successfully loaded. Previously if a script didn't exist it
would be "loaded" and show up in the running scripts window, but
wouldn't have been successfully loaded, and wouldn't be running anything
at all.
2014-06-17 09:18:58 -07:00
Andrzej Kapolka
37c977af02
Tests working for reading JSON.
2014-06-16 19:12:21 -07:00
Brad Hefta-Gaub
5b62733a36
Merge pull request #3025 from talentraspel/19753
...
replaced usleep for windows
2014-06-16 17:40:01 -07:00
barnold1953
b0e89c5810
Made magnification use only button 3
2014-06-16 17:34:18 -07:00
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
Andrew Meadows
118717d96a
Shapes moved from Model into PhysicalEntity
2014-06-16 14:51:58 -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
Andrew Meadows
1496e6c8b2
add VirletSphereShape and VirletCapsuleShape
2014-06-16 12:29:41 -07:00
Andrew Meadows
3a2f322ca3
SphereShape, CapsuleShape support derived classes
2014-06-16 12:23:18 -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
