Elisa Lupin-Jimenez
1c640cf37b
Merge branch 'master' of https://github.com/highfidelity/hifi into blocks
2017-07-27 10:00:17 -07:00
Chris Collins
853101fcbc
Merge pull request #10928 from 1P-Cusack/21362
...
Add point and thumb up gestures to the Vive.
2017-07-26 22:07:14 -07:00
Elisa Lupin-Jimenez
acb088b263
Blocks drag does not work yet
2017-07-26 16:58:23 -07:00
Elisa Lupin-Jimenez
9cfc4dc91b
Can drag blocks zip folder into hifi and upload the .obj
2017-07-26 15:21:39 -07:00
Brad Hefta-Gaub
4a3e3cf777
Merge pull request #11045 from huffman/fix/skybox-not-loading
...
Fix bug where skybox doesn't load and physics takes a long time to engage
2017-07-26 08:58:28 -07:00
Seth Alves
2f004abd81
Merge pull request #11050 from birarda/bug/error-decrypting
...
Reduce erroneous messages about username signature decryption
2017-07-25 16:10:02 -07:00
Brad Davis
8d37e54a4e
Merge pull request #11051 from highfidelity/qt59
...
Changes for Qt 5.9 warnings and build issues
2017-07-25 15:05:28 -07:00
1P-Cusack
9e25c3b7d8
Renaming 'not' route to 'logicalNot'.
...
Build was failing on non-windows platforms because 'not' is a reserved
word in C++ (which Visual Studio happily ignores).
2017-07-25 14:47:34 -04:00
Stephen Birarda
2d0c5ff37a
remove preloading of allowed user keys since it happens on connect
2017-07-25 11:41:34 -07:00
Ryan Huffman
6817cf9db4
Fix entity properties sometimes being resent
...
When writing entity properties to a packet, we start off with a list of
requested properties (`requestedProperties`) and keep track of which properties
didn't fit (`propertiesDidntFit`) the packet, which is intialized to
requestedProperties. As we pack the properties, we remove them from
propertiesDidntFit if they didn't need to be written or were able to be
packed. At the end we store propertiesDidntFit, and use it in the future
as our requestedProperties when we try to pack more data into a packet.
The bug: because of the order in which propertiesDidntFit is
initialized, it ended up always being the list of all properties for
that entity. This typically wasn't an issue because we usually go
through and try to append all of the properties, and if we don't need to
append them (because they aren't in requestedProperties)
we remove them from our propertiesDidntFit list. When we
don't have enough remaining space in the current packet for even the
entity header, which is fairly small, we don't bother trying to append
any of the properties. When this happens, propertiesDidntFit contains
the full list of properties, which we save for the next pass through the
entity, and use as our requestedProperties, causing us to resend entity
data again. In the worst case we never end up sending all of the
entity's data.
2017-07-25 10:59:03 -07:00
Andrew Meadows
9d1fba3a3b
Merge pull request #10821 from ctrlaltdavid/21418
...
Don't execute body of controllers' plugin update methods if not enabled
2017-07-25 08:51:17 -07:00
Ryan Huffman
9421e6ebb6
Merge pull request #11029 from cain-kilgore/dominant-hands
...
WL 21453 - Add a "Dominant Hand" setting
2017-07-25 08:01:31 -07:00
Seth Alves
a3f4aeb182
code review
2017-07-24 19:41:30 -07:00
Seth Alves
d1037a49ae
Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models
2017-07-24 19:23:30 -07:00
Cain Kilgore
42742ba1f9
Changed the Return to a String "left/right" instead.
2017-07-24 18:31:16 +01:00
Stephen Birarda
26be7e1a01
Merge pull request #10999 from birarda/bug/html-path-on-mac-build
...
fix create tab load on OS X
2017-07-24 10:12:40 -07:00
Cain Kilgore
630922dd95
Dominant Hands Branch Initial Commit
...
Adds a new option in the Avatar Basics section of the Avatar Settings.
API Accessible Functions:
MyAvatar.getUseAlternativeHand()
MyAvatar.setUseAlternativeHand()
Defaults to false (Right Hand). Will return True if set to Left Hand.
2017-07-24 06:18:24 +01:00
Brad Davis
de9f620121
Merge remote-tracking branch 'upstream/master' into qt59
2017-07-23 14:07:19 -07:00
Seth Alves
a1107deef1
cleanups
2017-07-23 08:21:50 -07:00
Seth Alves
47ea32f4d3
vertex color support in ModelScriptingInterface
2017-07-23 08:06:26 -07:00
Seth Alves
6e0394865e
fix bug in getNumElements that kept it from working on buffer-views with a non-zero offset
2017-07-23 08:05:09 -07:00
Seth Alves
6f86b266cb
support writing of vertex colors
2017-07-23 08:04:34 -07:00
Seth Alves
5e04e84953
make OBJ reader able to handle files where some vertices have colors and others don't
2017-07-22 11:57:51 -07:00
Seth Alves
c2667fc89b
Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models
2017-07-20 16:34:38 -07:00
Seth Alves
72e5fecb4e
do Model::getMeshes on the correct thread. added ModelScriptingInterface::getVertexCount and ModelScriptingInterface::getVertex
2017-07-20 16:34:34 -07:00
Clément Brisset
c128a3ff86
Merge pull request #11001 from Atlante45/fix/debug-builds
...
Fix debug builds startup crash
2017-07-20 13:31:55 -07:00
Seth Alves
8a0b43981c
Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models
2017-07-20 12:28:58 -07:00
Brad Davis
3a31805dff
Fix warnings in Qt 59 / VS 2017 build
2017-07-20 11:57:12 -07:00
trent
559e2e0ebb
Fixing formatting issues; renamed ::getVec3Vec3 to ::getVertex.
2017-07-20 13:09:17 -04:00
trent
ff3e9263ef
Stupid tabs.
2017-07-20 11:40:42 -04:00
trent
d71b0802a7
Added vertex color support to OBJReader.h|cpp.
2017-07-20 11:38:42 -04:00
Stephen Birarda
3936ee93f0
use default scripts path in EditTabView to fix load on OS X
2017-07-19 16:34:04 -07:00
Atlante45
70a5916ef3
Fix debug builds startup crash
2017-07-19 16:18:01 -07:00
Seth Alves
be48268be8
getMeshes handles registration point
2017-07-19 15:02:40 -07:00
Seth Alves
8a732e7d4b
Merge branch 'master' of github.com:highfidelity/hifi into script-getmeshes-for-models
2017-07-19 13:58:07 -07:00
Seth Alves
750b7192af
trying to get the resulting model to line up with the originals
2017-07-19 13:58:03 -07:00
Clément Brisset
d76039387a
Merge pull request #10992 from Atlante45/fix/heap-use-after-free
...
Fix potential data corruption in the FileCache
2017-07-19 10:44:02 -07:00
Seth Alves
a8698c2fbc
EntityScriptingInterface::getMeshes support for Model entities
2017-07-19 08:59:09 -07:00
Andrew Meadows
d48f45f7e6
Merge pull request #10990 from druiz17/bug-help-issue
...
fixed another instance of the tablet getting stuck on the help screen
2017-07-19 08:37:56 -07:00
Andrew Meadows
a069620013
Merge pull request #10970 from Atlante45/feat/ac-shutdown-info
...
AC shutdown info + PPID watcher on Unix
2017-07-19 08:34:45 -07:00
Dante Ruiz
fdfeab77eb
made requested changes
2017-07-19 16:28:16 +01:00
Andrew Meadows
8dafc30bf9
fix debug build: stub pure virtual function
2017-07-18 15:57:00 -07:00
David Kelly
4d4d9421d3
Merge pull request #10983 from davidkelly/dk/marketplaceIDHack
...
Get marketplaceID into imported entities
2017-07-18 15:25:49 -07:00
Atlante45
497fd7f714
Pin File pointer during eject
2017-07-18 13:45:46 -07:00
Chris Collins
e99683fdcf
Merge pull request #10985 from jherico/audio_deadlock
...
Trying to resolve QML / Audio deadlocks
2017-07-18 12:40:03 -07:00
Dante Ruiz
06a69c8bd7
fixed another tablet stuck on help screen
2017-07-18 20:27:55 +01:00
David Kelly
c4d5d16eb3
cr feedback
2017-07-18 11:12:06 -07:00
Andrew Meadows
888f2f64a5
Merge pull request #10981 from druiz17/bug/delete-avatar-entity
...
Fixed not being able to delete avatar entities when switching domains
2017-07-18 10:09:34 -07:00
Clément Brisset
bcc9cf7c60
Merge pull request #10947 from Atlante45/fix/ignore-ac-crash
...
Fix Avatar/Audio Mixer crash
2017-07-18 09:59:30 -07:00
Brad Davis
9f13533560
Ensure input and output device containers are protected by mutex
2017-07-18 08:58:17 -07:00
