seefo
106b0ad8bb
Added Vive pucks as an input channel
2017-08-02 13:08:43 -07:00
vladest
638eeede43
Merge conflict
2017-08-02 20:07:06 +02:00
Seth Alves
728e7fb253
Merge pull request #11099 from druiz17/bug-blank-tablet-switch
...
fix blank tablet when switching between HMD and Desktop mode quickly
2017-08-02 10:09:56 -07:00
Seth Alves
2319006868
Merge pull request #11100 from hyperlogic/bug-fix/teleport-crash
...
Fix for crash when attempting to teleport while avatar was loading
2017-08-02 10:00:13 -07:00
Dante Ruiz
8d69cd8999
Merge branch 'master' of github.com:highfidelity/hifi into bug-blank-tablet-switch
2017-08-02 16:36:17 +01:00
Dante Ruiz
05f1caab01
better solution to help and blank tablet issues
2017-08-02 16:35:58 +01:00
vladest
2d4396ac8e
Merge branch 'master' into fix_toolbar_apps_switch
2017-08-02 16:34:49 +02:00
vladest
4330e31212
Toolbar mode: 1. Fixed switching between different apps. 2. Fixed switching from Create
2017-08-02 16:32:09 +02:00
Seth Alves
baad9f1af4
Merge pull request #11097 from druiz17/bug-entity-crash2
...
Lock the script engine in EntityEditPacketSender
2017-08-02 06:40:41 -07:00
Anthony J. Thibault
1b6feb63c8
Fix for crash when attempting to teleport while avatar was loading
...
The fix had two parts.
* Make Avatar::getAbsoluteDefaultJointXXXInObjectFrame thread safe
* Make teleport.js handle a zero foot offset more gracefully, to prevent the avatar from teleporting into the floor.
2017-08-01 18:40:43 -07:00
Anthony Thibault
8a87ebd2a8
Merge pull request #11036 from AndrewMeadows/walkabout
...
fix bugs preventing avatar from walking on spherical planet
2017-08-01 16:36:35 -07:00
Dante Ruiz
cca29e849b
fix issue of tablet begin blank when switching between HMD and Desktop mode
2017-08-01 23:18:42 +01:00
Dante Ruiz
c22e08f3e8
loacked script engine in EntityEditPacketSender
2017-08-01 19:58:23 +01:00
anshuman64
97b4fd4032
Merge pull request #11071 from vladest/fix_menu_landscape
...
Fix Landscape mode, when menu pushed in Create mode
2017-08-01 11:29:15 -07:00
Chris Collins
5bdaa4daa1
Merge pull request #11087 from jherico/crash_null_entity_element
...
Fix potential nullptr access in EntityTreeElement
2017-07-31 09:15:52 -07:00
Brad Davis
861b33a845
Fix potential nullptr access in EntityTreeElement
2017-07-29 17:22:25 -07:00
Brad Davis
17b06e8e12
Fix log warnings from non-notifiable properties
2017-07-29 11:54:39 -07:00
vladest
0333849aa8
Merge branch 'master' into fix_menu_landscape
2017-07-29 11:44:58 +02:00
Stephen Birarda
17dd028ec7
make Paths available to desktop and tablet QML context
2017-07-28 14:23:18 -07:00
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
vladest
45934cb53e
Fix Landscape mode, when menu pushed in Create mode. Fix pages gets white in Create mode
2017-07-28 18:04:29 +02: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
Andrew Meadows
8c55476c65
fix motor direction when walking upside down
...
also maintain worldUp and remove unnecessary cruft
2017-07-24 16:00:13 -07:00
Andrew Meadows
4994283247
remove unnecessary state check
2017-07-24 16:00:13 -07:00
Andrew Meadows
29be9aee65
move nextAttitude() from AvatarData to MyAvatar
2017-07-24 16:00:13 -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
