David Rowe
|
71ec5f3612
|
Fix tablet highlighting when using the Create and Shapes apps
|
2018-10-20 11:57:46 +13:00 |
|
David Rowe
|
eb179363f6
|
Merge branch 'master' into M17853
# Conflicts:
# scripts/system/controllers/controllerDispatcher.js
|
2018-10-20 11:19:26 +13:00 |
|
Sam Gateau
|
388b31acf7
|
Merge pull request #14169 from SamGondelman/highlight
Fix highlight not working after HMD switch
|
2018-10-19 11:58:25 -07:00 |
|
John Conklin II
|
9c841db9fb
|
Merge pull request #14184 from SamGondelman/blendshape
Move blendshape buffers to render thread
|
2018-10-19 11:55:44 -07:00 |
|
Brad Hefta-Gaub
|
7d69951a83
|
Merge pull request #14241 from gcalero/gradle_memory_properties
Setup a higher memory limit for android build
|
2018-10-19 11:19:05 -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
|
9750cc2416
|
Merge pull request #14173 from sethalves/fix-linux-build
fix build on clang 7
|
2018-10-19 11:13:43 -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
|
37dce01dcb
|
Merge pull request #14099 from humbletim/fb18305-grabbable-menu-fix
More reliable "Create Entities as Grabbable" settings persistence.
|
2018-10-18 18:26:48 -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
|
bbccd0ff73
|
Merge pull request #14120 from zfox23/MS18609_snapShareBugs
Fix MS18609: Various Snapshot sharing bugs
|
2018-10-18 18:21:23 -07:00 |
|
John Conklin II
|
9ccdf74235
|
Merge pull request #14179 from roxanneskelly/sysTraySubmenus
Sys tray submenus
|
2018-10-18 17:56:48 -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
|
5095a4e0eb
|
Merge pull request #14196 from sethalves/interstitial-domain-full
go to error-room when failing to connect to a full domain
|
2018-10-18 17:49:35 -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
|
addae51976
|
Merge pull request #14215 from ctrlaltdavid/M19308
Hide mini tablet immediately upon near grabbing an entity
|
2018-10-18 17:47:17 -07:00 |
|
John Conklin II
|
3916b8e9d2
|
Merge pull request #14224 from roxanneskelly/Case19395Master
Fix for Case 19395
|
2018-10-18 17:24:40 -07:00 |
|
John Conklin II
|
1f06c87580
|
Merge pull request #14096 from Zvork/mipgen
Added generateTextureMipsWithPipeline function in gpu::Batch
|
2018-10-18 16:06:28 -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 |
|
John Conklin II
|
0e6f4f3a60
|
Merge pull request #14142 from ctrlaltdavid/M16440
Fix audio overlay not working while in edit apps
|
2018-10-18 15:32:41 -07:00 |
|
Gabriel Calero
|
a9b9f48335
|
Setup a higher memory limit for android build
|
2018-10-18 17:20:30 -03:00 |
|
David Rowe
|
490c085eb8
|
Merge branch 'master' into M16440
# Conflicts:
# scripts/system/controllers/controllerModules/hudOverlayPointer.js
# scripts/system/controllers/controllerModules/inVREditMode.js
|
2018-10-19 09:06:33 +13:00 |
|
David Rowe
|
9b4c5e1685
|
Fix OSX/Linux warnings
|
2018-10-19 08:20:21 +13:00 |
|
SamGondelman
|
47c6825aea
|
CR
|
2018-10-18 11:08:53 -07:00 |
|
Andrew Meadows
|
6558d539e4
|
adjust simulation bid priority by props changed
|
2018-10-18 10:33:02 -07:00 |
|
Andrew Meadows
|
9bfa4a5267
|
remove unhelpful/wrong TODO comment
|
2018-10-18 10:33:02 -07:00 |
|
Andrew Meadows
|
1a685d2409
|
set script-triggerd sim ownership priority correctly
|
2018-10-18 10:33:02 -07:00 |
|
Andrew Meadows
|
ce81ab1f9d
|
don't edit restricted properties unless sim ownership possible
|
2018-10-18 10:33:02 -07:00 |
|
Andrew Meadows
|
bb51079284
|
move some bid-prep logic from EntityMotionState to EntityItem
|
2018-10-18 10:33:02 -07:00 |
|
Andrew Meadows
|
0b34524ba0
|
minimimze time holding locks on tree in editEntity()
|
2018-10-18 10:31:27 -07:00 |
|
Andrew Meadows
|
21654ba77c
|
cleanup access to sessionID
|
2018-10-18 10:31:27 -07:00 |
|
Andrew Meadows
|
f63610af2b
|
namechange: TerseUpdate --> TransformAndVelocities
|
2018-10-18 10:31:27 -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 |
|
Zach Fox
|
72b3777953
|
Merge branch 'master' of github.com:highfidelity/hifi into MS18609_snapShareBugs
|
2018-10-18 09:39:34 -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 |
|
SamGondelman
|
de4dff5202
|
fix highlight weirdness
|
2018-10-17 16:18:55 -07: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 |
|
Roxanne Skelly
|
d4bc192be2
|
Fix for Case 19395
High Fidelity Console in client only install downloads default content assets for non-existent sandbox.
|
2018-10-17 14:09:55 -07:00 |
|
Sam Gondelman
|
3f117cd3e0
|
Merge branch 'master' into scriptvec3
|
2018-10-17 13:57:21 -07:00 |
|
Brad Hefta-Gaub
|
0e0542ec6e
|
Merge pull request #13890 from sethalves/grab-properties-1
move grab pseudo-properties (userData) into first-class EntityItemProperties
|
2018-10-17 13:29:20 -07:00 |
|
Sam Gondelman
|
e3543cf098
|
Merge branch 'master' into scriptvec3
|
2018-10-17 13:10:29 -07:00 |
|
John Conklin II
|
7b226aa559
|
Merge pull request #14124 from SamGondelman/particle
Don't render particles without textures
|
2018-10-17 11:17:23 -07:00 |
|
John Conklin II
|
72c9f697ab
|
Merge pull request #14119 from SamGondelman/varying
Move stage frames to Varyings
|
2018-10-17 11:16:28 -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
|
eb088772d0
|
Merge pull request #14156 from sabrina-shanman/bug_dynamic-hulls
Fix "Good" collision not honoring mesh groups in OBJ files
|
2018-10-17 11:12:21 -07:00 |
|