anshuman64
defc76c9cf
Merge pull request #11075 from jherico/tablet_scripting_crash
...
Fix tablet button crash
2017-07-28 11:57:27 -07:00
Brad Davis
3d0c13915a
Fix tablet button crash
2017-07-28 11:20:57 -07:00
Andrew Meadows
d4e72df928
Merge pull request #10711 from burtsloane/midi
...
Midi support for Entities
2017-07-28 10:51:43 -07:00
Brad Hefta-Gaub
d572510770
Merge pull request #11009 from AndrewMeadows/fix-QueryAACube
...
update EntityItem bounding cube when on changed dimensions
2017-07-27 18:21:06 -07:00
Andrew Meadows
6b386000db
initialize 'success' and use for return value
2017-07-27 17:11:13 -07:00
burtsloane
e557f759b5
Update Midi.cpp
2017-07-27 16:17:23 -07:00
Brad Hefta-Gaub
9b3be6d164
Merge pull request #10808 from humbletim/21400
...
WL 21400 -- Setting that lets you switch from cursor to reticle
2017-07-27 13:16:58 -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
burtsloane
d4ae298a8d
Merge branch 'master' into midi
2017-07-26 13:59:07 -07:00
Burt Sloane
a960ea5ccb
Linux build
2017-07-26 13:32:23 -07:00
Burt Sloane
4f7243e444
Merge branch 'master' of https://github.com/burtsloane/hifi into midi
2017-07-26 13:30:57 -07:00
Burt Sloane
c777384d93
another comment removal
2017-07-26 10:00:19 -07:00
Burt Sloane
215fa7b816
removed extra comments
2017-07-26 09:34:46 -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
Burt Sloane
88838da6e5
cleaning up for mac and linux
2017-07-25 17:46:08 -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
Andrew Meadows
29daac83a4
optimize cube update only for connected things
2017-07-21 10:59:25 -07:00
Andrew Meadows
d86ae98211
always update bounding box on script edit
2017-07-21 10:57:09 -07:00
Andrew Meadows
17323ba42a
always update the bounding box
2017-07-21 10:25:03 -07:00
Andrew Meadows
1e6fc85e3e
fix math for expanded bounding box
2017-07-21 10:17:10 -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
Andrew Meadows
e1eb223616
cleanup bad indentation, cruft, and constants
2017-07-20 16:12:33 -07:00
Andrew Meadows
a8dac0cb79
don't send constant updates for grabbed objects
2017-07-20 15:45:50 -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
Andrew Meadows
0fc0cf736f
fix spelling
2017-07-20 09:34:28 -07: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
Andrew Meadows
fcd3126b85
undo accidental name change
2017-07-20 08:32:48 -07:00
Andrew Meadows
54426a5b81
update queryAACube on server when it probably changed
2017-07-20 08:21:10 -07:00
