rabelaiis
1f6b92a519
Vibrate only the controller that hits the key and decrease timeout so that the xylophone can be played faster
2017-07-31 17:27:49 +07:00
rabelaiis
119b10886f
Merge branch 'master' of git://github.com/highfidelity/hifi into 21479
2017-07-28 06:29:10 +07:00
rabelaiis
8b7a29c3f3
remove putils reference
2017-07-28 06:22:29 +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
Brad Hefta-Gaub
3aca1e1d84
Merge pull request #11004 from highfidelity/express_custom_install
...
Added a page in installer for express/custom installation
2017-07-27 13:14:56 -07:00
anshuman64
bcb819206b
Merge pull request #11037 from sethalves/bug-camera-mode-mods
...
use Qt menu hotkeys to drive camera-mode changes
2017-07-27 09:44:53 -07:00
rabelaiis
dd76c30de5
Make Xylophone mallets equipable, make the mallets provide haptic feedback, fix a closing bracket bug stopping the xylophone from working and clean up code according to coding standards
2017-07-27 17:31:30 +07:00
Chris Collins
ef67029837
Merge pull request #10912 from amvmoody/21374
...
WL 21374: Allow lights/particles to be dragged by icon
2017-07-26 22:07:36 -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
anshuman64
2e7f62cbb3
Merge pull request #11058 from nimisha20/patch-1
...
Update BUILD_WIN.md
2017-07-26 17:50:33 -07:00
anshuman64
560cccb0df
Remove nmake troubleshooting step
2017-07-26 17:01:45 -07:00
anshuman64
081d8fbec4
More changes
2017-07-26 17:00:48 -07:00
nimisha20
c57660c82d
Update BUILD_WIN.md
2017-07-26 16:52:00 -07:00
Stephen Birarda
c6e640eba8
Merge pull request #11052 from highfidelity/bug/2157
...
added additional collision types to asset browser and new model dialog
2017-07-26 16:51:52 -07:00
Seth Alves
9c9cfad4c4
use ctrl rather than alt to activate camera-mode shortcuts
2017-07-26 15:56:08 -07:00
Seth Alves
71023bcb1b
Merge branch 'master' of github.com:highfidelity/hifi into bug-camera-mode-mods
2017-07-26 15:54:57 -07:00
Melissa Brown
e50422d5b9
Merge pull request #11034 from MrRoboman/21342-dart
...
added dart scripts
2017-07-26 15:10:58 -07:00
utkarshgautamnyu
68770a9204
Removed conflicts
2017-07-26 10:23:37 -07:00
utkarshgautamnyu
71ddf1e7c1
Removed Compound Collision type
2017-07-26 10:20:17 -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
utkarshgautamnyu
29e778323d
Update AssetServer.qml
2017-07-25 17:24:06 -07:00
utkarshgautamnyu
24f4468fd5
added additional collision types to asset browser in tablet mode
2017-07-25 17:12:13 -07:00
utkarshgautamnyu
65192aa620
added additional collision types to asset browser and new model dialog
2017-07-25 17:12:13 -07:00
utkarshgautamnyu
e5ddded464
Moved Express/Custom install window just after EULA window
2017-07-25 16:16:15 -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
Stephen Birarda
dd3755596c
fix typo in comment in DomainGatekeeper header
2017-07-25 15:43:34 -07:00
Stephen Birarda
e9845784d5
don't return error decrypting for optimistic public keys
2017-07-25 15:28:05 -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
Brad Davis
030b54542c
Merge pull request #11049 from jherico/qt59_temp
...
Move hosting for quazip back to hifi S3
2017-07-25 13:43:57 -07:00
Brad Davis
b1aa6e1962
Move hosting for quazip back to hifi S3
2017-07-25 13:43:10 -07:00
Zach Fox
30a571cc48
Merge pull request #11041 from amvmoody/wl_21472
...
WL 21472: restore snails ability to eat sprouts
2017-07-25 13:07:58 -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
2446fcde8e
Merge pull request #11039 from amvmoody/21477
...
WL 21477 Gravity Script
2017-07-25 08:59:22 -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
Cain Kilgore
f9204a7034
Now it should appear..
2017-07-25 09:03:47 +01:00
Mike Moody
34594b914d
Added and removed different normalizations.
2017-07-24 23:55:44 -07:00
Mike Moody
dc53017dd4
Created script to let Snails eat brussel sprouts.
2017-07-24 23:17:13 -07:00
Andrew Meadows
a21da8613c
Merge pull request #11028 from sethalves/script-getmeshes-for-models
...
Script getmeshes for models
2017-07-24 23:01:53 -07:00
Andrew Meadows
942a231a70
Merge pull request #11035 from highfidelity/bug/6740
...
Fixed bug: Disconnected domain (no access token present) is unnecessarily hitting /api/v1/user/friends
2017-07-24 22:43:37 -07:00
Cain Kilgore
2f857a6d1a
Forgot a file
2017-07-25 06:05:06 +01:00
Seth Alves
a3f4aeb182
code review
2017-07-24 19:41:30 -07:00
Seth Alves
c4d909927a
make atp-client work again
2017-07-24 19:23:39 -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
Mike Moody
1bf2855e9b
Created script for spherical gravity.
2017-07-24 18:47:24 -07:00
Mike Moody
62efb32671
Created script for spherical gravity.
2017-07-24 18:39:09 -07:00
Mike Moody
e900dae708
Created script for spherical gravity.
2017-07-24 18:34:58 -07:00
Cain Kilgore
280a7a7e42
Fixing Styling, added Preference to Tablet, Moved Location to Avatar Tuning
2017-07-25 01:48:55 +01:00
