Brad Hefta-Gaub
|
cd4e9a3e08
|
Merge pull request #13889 from alexiamandeville/controllerModelUpdates
Updating highlight textures on Rift Controller
|
2018-10-19 16:39:17 -07:00 |
|
Brad Hefta-Gaub
|
1ff69844f2
|
Merge pull request #14225 from wayne-chen/interstitialHideProgressJS-RC75
hide progress overlays if interstitial mode
|
2018-10-19 16:35:42 -07:00 |
|
Brad Hefta-Gaub
|
c6fff83805
|
Merge pull request #14145 from ctrlaltdavid/M17223
JSDoc fixes
|
2018-10-19 16:16:19 -07:00 |
|
Brad Hefta-Gaub
|
acc6d3e45c
|
Merge pull request #14144 from ctrlaltdavid/M17222
Fix and fill in JSDoc for MyAvatar flying-related functions
|
2018-10-19 15:57:04 -07:00 |
|
Anthony Thibault
|
6cc7c861d1
|
Merge pull request #14221 from hyperlogic/feature/disable-hands-if-too-far-or-at-rest
Disable user hand controllers if they are too far away or not moving.
|
2018-10-19 14:02:32 -07:00 |
|
Brad Hefta-Gaub
|
b281c090e3
|
Merge pull request #14012 from alexiamandeville/controlImageUpdate
Adding handshake control to image in Controls Reference
|
2018-10-19 11:15:11 -07:00 |
|
John Conklin II
|
81fbb5a332
|
Merge pull request #14140 from AndrewMeadows/dps-setPos-vs-grab
Make EntityScriptingInterface aware of distributed physics simulation (DPS) rules
|
2018-10-19 10:33:14 -07:00 |
|
John Conklin II
|
4dec304d66
|
Merge pull request #14162 from luiscuenca/cleanElbowPoleVectorSmooth
Clean up elbow smoothing code
|
2018-10-18 19:16:32 -07:00 |
|
John Conklin II
|
7c4733a31d
|
Merge pull request #14053 from ElderOrb/FB17835
make extracted from resources avatarbookmarks.json writable
|
2018-10-18 18:29:02 -07:00 |
|
John Conklin II
|
3210a4ec39
|
Merge pull request #14109 from zfox23/purchasesNoSnap
Fix MS18154: Don't snap to cards in My Purchases
|
2018-10-18 18:24:23 -07:00 |
|
John Conklin II
|
86cc612d73
|
Merge pull request #14185 from howard-stearns/keyboard-vs-submit
make room for keyboard and help in SendAsset
|
2018-10-18 17:53:52 -07:00 |
|
John Conklin II
|
b2e84a8f3b
|
Merge pull request #14191 from howard-stearns/new-rez-images
new images for My Purchases rez tutorial
|
2018-10-18 17:50:30 -07:00 |
|
John Conklin II
|
18df79a8a6
|
Merge pull request #14211 from amantley/crazylegs
Bug Fix for Crazy Legs when you sit on the floor (Manuscript 17045).
|
2018-10-18 17:48:26 -07:00 |
|
John Conklin II
|
40a48777dc
|
Merge pull request #14231 from ctrlaltdavid/M16205a
Fix lasers going through tablet to drawInFrontOverlays
|
2018-10-18 15:36:29 -07:00 |
|
David Rowe
|
9b4c5e1685
|
Fix OSX/Linux warnings
|
2018-10-19 08:20:21 +13:00 |
|
Andrew Meadows
|
1a685d2409
|
set script-triggerd sim ownership priority correctly
|
2018-10-18 10:33:02 -07:00 |
|
John Conklin II
|
1cc2569bd8
|
Merge pull request #13596 from SamGondelman/scriptvec3
Replace vec2, vec3, and xColor properties with JS prototypes
|
2018-10-18 09:47:56 -07:00 |
|
David Rowe
|
e339f966d9
|
Remove reference to a function no longer in the API
Noticed in passing.
|
2018-10-18 17:11:48 +13:00 |
|
David Rowe
|
1610d79023
|
Remove now redundant mouse pointer code that tried to do the same thing
|
2018-10-18 17:11:26 +13:00 |
|
David Rowe
|
c41ce5d484
|
Make tablet have priority over drawInFront overlays rendered behind it
|
2018-10-18 17:10:48 +13:00 |
|
John Conklin II
|
8e5bc1678f
|
Merge pull request #14219 from SamGondelman/materialCull
QueryAACube fixes and materials expand to include their parent
|
2018-10-17 15:15:23 -07:00 |
|
Wayne Chen
|
fd3c0d2f76
|
pushing with new fix
|
2018-10-17 15:03:09 -07:00 |
|
Sam Gondelman
|
e3543cf098
|
Merge branch 'master' into scriptvec3
|
2018-10-17 13:10:29 -07:00 |
|
John Conklin II
|
e59e3720fe
|
Merge pull request #14139 from SamGondelman/animation
Fix various ResourceCache bugs
|
2018-10-17 11:13:35 -07:00 |
|
John Conklin II
|
9f0b4fb437
|
Merge pull request #14122 from SamGondelman/skybox
Rebake default skybox for all platforms
|
2018-10-17 09:50:00 -07:00 |
|
Anthony Thibault
|
27c495406e
|
Disable user hand controllers if they are too far away or not moving.
|
2018-10-16 17:24:47 -07:00 |
|
SamGondelman
|
49b496046b
|
queryAACube fixes
|
2018-10-16 14:35:39 -07:00 |
|
David Rowe
|
353938193e
|
Add return value
|
2018-10-17 08:03:56 +13:00 |
|
SamGondelman
|
ded8d4b547
|
variant conversions
|
2018-10-16 11:55:28 -07:00 |
|
Sam Gondelman
|
121fc7205c
|
Delete Default-Sky-9-cubemap.texmeta
|
2018-10-14 22:36:22 -07:00 |
|
amantley
|
05d3becd40
|
changed cg hips computation so that it is not computed when hmdleanrecenter is turned off
|
2018-10-12 17:03:34 -07:00 |
|
Howard Stearns
|
6c6d29152f
|
new images for My Purchases rez tutorial
|
2018-10-11 12:36:43 -07:00 |
|
Howard Stearns
|
30971cd766
|
make room for keyboard and help in SendAsset
|
2018-10-10 15:43:20 -07:00 |
|
unknown
|
3c25e6d5a8
|
Increase the linear velocity step when the avatar is small to avoid freezing
|
2018-10-08 14:40:54 -07:00 |
|
unknown
|
1172e29d95
|
Clean up elbow smoothing code
|
2018-10-08 13:21:47 -07:00 |
|
Sam Gondelman
|
67662df760
|
Merge branch 'master' into scriptvec3
|
2018-10-08 12:59:34 -07:00 |
|
divya
|
91df342ae9
|
Merge pull request #14094 from wayne-chen/interstitialMerged
Merged interstitial page/redirect domain improvements
|
2018-10-08 10:32:29 -07:00 |
|
Wayne Chen
|
f758438dcc
|
Merge pull request #9 from danteruiz/interstitialMerged
fix for failing to enter domain
|
2018-10-05 16:19:25 -07:00 |
|
Dante Ruiz
|
36c2cceb57
|
fix for failing to enter domain
|
2018-10-05 15:39:51 -07:00 |
|
Andrew Meadows
|
c3478dc018
|
remove expired avatarEntities from their avatars
|
2018-10-05 13:48:35 -07:00 |
|
Wayne Chen
|
8abbd51bb1
|
removing unused variable
|
2018-10-04 23:11:27 -07:00 |
|
David Rowe
|
2ba8dc37d0
|
Miscellanous JSDoc fixes for issues noticed in passing
|
2018-10-05 16:57:29 +13:00 |
|
David Rowe
|
539c280281
|
Fill in missing JSDoc stubs in AvatarList and AvatarManager
|
2018-10-05 15:13:13 +13:00 |
|
danteruiz
|
d285080197
|
remmoving some debug statements
|
2018-10-04 18:38:25 -07:00 |
|
David Rowe
|
ea8e02a84a
|
Fix and fill in JSDoc for MyAvatar flying-related functions
|
2018-10-05 14:05:33 +13:00 |
|
Dante Ruiz
|
5d011bafb2
|
small tweaks
|
2018-10-04 17:02:44 -07:00 |
|
Dante Ruiz
|
2a3b4a85c7
|
debugging
|
2018-10-04 15:57:05 -07:00 |
|
Dante Ruiz
|
651f37aceb
|
Merge branch 'interstitialMerged' of github.com:wayne-chen/hifi into interstitialMerged
|
2018-10-04 15:01:39 -07:00 |
|
Dante Ruiz
|
bda9735b5d
|
fix loading progress
|
2018-10-04 15:01:16 -07:00 |
|
John Conklin II
|
afe6d97b00
|
Merge pull request #14100 from danteruiz/soft-entities-updates
update soft entities and fix deadlock from qml.
|
2018-10-04 13:33:34 -07:00 |
|