Zach Fox
f366fdf695
Beginnings of nearby
2018-01-10 09:58:23 -08:00
Zach Fox
5469025113
More more more
2018-01-09 15:53:25 -08:00
Zach Fox
530df5447d
Even more proress
2018-01-09 15:19:50 -08:00
Zach Fox
40a3f8b31b
Progress
2018-01-09 14:13:36 -08:00
Zach Fox
a6259a5ef5
Initial progress
2018-01-09 13:39:28 -08:00
Anthony Thibault
1f1ac71b73
Merge pull request #12111 from hyperlogic/bug-fix/oculus-touch-angular-velocity
...
Oculus Touch: More accurate spin on thrown objects
2018-01-09 10:13:34 -08:00
Thijs Wenker
88d353a642
Merge pull request #12105 from misslivirose/feat/make-zones-lights-not-grabbable
...
Make zones, lights, and particles not grabbable when created in edit.js
2018-01-09 18:26:13 +01:00
Seth Alves
87dfe0efc3
Merge pull request #12097 from vladest/tablet_pagination_magnify
...
Tablet pagination magnify
2018-01-09 08:08:02 -08:00
Sam Gondelman
02100a405d
Merge pull request #12100 from samcake/blue
...
Restore packing of QRC qml and resources to interface.exe in DEV_BUILD
2018-01-08 17:41:34 -08:00
Anthony J. Thibault
dd0e57026e
Oculus Touch: More accurate spin on thrown objects
...
The internal computation of angular velocity was incorrect.
Apparently, the ovrPoseStatef.AngularRotation is not in sensor frame but local to the controller rotation.
2018-01-08 15:28:59 -08:00
Melissa Brown
2fddace71e
Merge pull request #12019 from Delanir/C10594
...
Case 10594 - Fix entity property href not being able to reset (empty) ...
2018-01-08 14:22:28 -08:00
John Conklin II
fab28e7d44
Merge pull request #12106 from SamGondelman/overlayFix
...
Fix avatar texture loading
2018-01-08 14:01:15 -08:00
Anthony Thibault
f4c38b91b3
Merge pull request #12071 from luiscuenca/handTouch
...
Touch feeling for near grab
2018-01-08 12:50:30 -08:00
SamGondelman
97c0b33975
fix avatar texture loading
2018-01-08 12:50:05 -08:00
John Conklin II
1acd3e17e0
Merge pull request #12104 from druiz17/fix-laser-mess
...
fix tablet interaction and far grab functionality
2018-01-08 12:43:36 -08:00
MiladNazeri
56d4429a8b
Merge pull request #12020 from ctrlaltdavid/21646
...
Window JSDoc
2018-01-08 11:53:34 -08:00
Liv Erickson
d1e176ee9d
Update menu to reflect non-grabbable entity types, include particles
2018-01-08 11:31:09 -08:00
Dante Ruiz
fd83e00df4
fix tablet interaction and far grab functionallity
2018-01-08 11:30:21 -08:00
David Rowe
7a971b2d26
Fix typo
2018-01-09 08:17:15 +13:00
Zach Fox
99510f522d
Merge pull request #12095 from ElderOrb/FB10621
...
FB10621 "HIFI-Commerce Login" page title change to "Log in to continue"
2018-01-08 10:05:53 -08:00
Liv Erickson
b166f98702
Merge branch 'master' of https://github.com/highfidelity/hifi into feat/make-zones-lights-not-grabbable
2018-01-08 10:01:40 -08:00
John Conklin II
d660bbf6e5
Merge pull request #12101 from hyperlogic/bug-fix/avatar-sit
...
Bug fix for sit script.
2018-01-08 09:59:17 -08:00
luiscuenca
50f89182d7
Add Utils.jsc
2018-01-07 18:29:13 -07:00
Howard Stearns
724db93389
Merge pull request #12002 from howard-stearns/consistent-goToUser
...
Consistent go to user
2018-01-07 11:07:39 -08:00
luiscuenca
8a7c68829d
Optimizations, cleanings and globals
2018-01-07 11:56:30 -07:00
David Rowe
673bc7de38
Update Window JSDoc
2018-01-06 16:05:55 +13:00
Liv Erickson
4e582975b6
cleanup
2018-01-05 18:03:20 -08:00
Liv Erickson
f563b8ca2e
Make zones and lights not default grabbable
2018-01-05 17:49:43 -08:00
Anthony Thibault
1a97d1de0f
Merge pull request #11953 from hyperlogic/feature/exp-smoothing-input-filter
...
Added exponential smoothing filter for vive pucks.
2018-01-05 16:50:55 -08:00
Anthony J. Thibault
243dcb88ee
Bug fix for sit script.
2018-01-05 16:20:44 -08:00
Zach Fox
0c38a5598f
Merge pull request #12085 from zfox23/commerce_fixHandControllerInspection
...
Fix bugs related to inspecting entities with hand controllers
2018-01-05 15:50:00 -08:00
luiscuenca
4f6a804fd1
Fix magic numbers
2018-01-05 16:27:48 -07:00
Andrew Meadows
4745a0e32d
Merge pull request #12093 from AndrewMeadows/simulation-ownership-004
...
more stable simulation ownership for system of constraints
2018-01-05 14:17:53 -08:00
Andrew Meadows
b28684f15e
Merge pull request #12087 from ctrlaltdavid/21661
...
Laser auto-on with tablet and Web overlays
2018-01-05 14:08:01 -08:00
samcake
5a5d475c6c
Reinstall the packing of the qrc in the executable in DEV_build
2018-01-05 14:03:52 -08:00
Brad Hefta-Gaub
aebd098e6e
Merge pull request #12072 from Triplelexx/21654_assetbrowser_sorting
...
WL#21654: Make the Asset Browser Sort Case Insensitive
2018-01-05 13:34:39 -08:00
Brad Hefta-Gaub
7a3835eb33
Merge pull request #11945 from jherico/android_nov
...
Updating android toolchain for QML
2018-01-05 13:34:03 -08:00
Brad Hefta-Gaub
6a3609093d
Merge pull request #12051 from dback2/polyobjimportfixes
...
Poly obj import fixes
2018-01-05 13:33:29 -08:00
Seth Alves
487dab641f
Merge pull request #12090 from AndrewMeadows/simulation-ownership-003
...
more stable simulation ownership
2018-01-05 12:27:52 -08:00
samcake
4fc8a8ea08
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2018-01-05 12:27:41 -08:00
Sam Gateau
91eb718074
Merge pull request #12091 from SamGondelman/overlayFix
...
Update model render items on texture load and fix no haze issue
2018-01-05 12:26:56 -08:00
samcake
daa9136b34
Merge branch 'master' of https://github.com/highfidelity/hifi into blue
2018-01-05 11:50:35 -08:00
David Back
ac1c398b9d
Merge pull request #11669 from dback2/mergeAccountGlobalServices
...
merge AccountScriptingInterface into GlobalServicesScriptingInterface
2018-01-05 11:34:53 -08:00
David Rowe
5431b7137b
Code review
2018-01-06 08:27:24 +13:00
luiscuenca
d0bc881bb2
Load script manually
2018-01-05 12:20:41 -07:00
David Back
76f278f899
Merge branch 'master' into mergeAccountGlobalServices
2018-01-05 10:56:12 -08:00
David Back
b165eac6a0
Merge branch 'master' into mergeAccountGlobalServices
2018-01-05 10:54:59 -08:00
Melissa Brown
933720fb10
Merge pull request #12012 from Delanir/Case10633
...
Cases 10632 and 10633 Particle Explorer UI
2018-01-05 10:46:41 -08:00
Melissa Brown
eb83c68d46
Merge pull request #12094 from ctrlaltdavid/resolution-removed
...
Delete web3d overlay "resolution" property JSDoc
2018-01-05 10:38:07 -08:00
vladest
02972c92f0
Merge branch 'master' into tablet_pagination_magnify
2018-01-05 19:12:13 +01:00
