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
Anthony Thibault
51d767ac2b
Reasonable defaults for position and rotation filtering for vive tracked joints.
2018-10-18 17:46:32 -07:00
Ryan Huffman
a4adf2c716
Fix name of Particles to ParticleEffect for default properties in edit.js
2018-10-18 17:39:24 -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
Anthony Thibault
3e68a1d5a5
Merge branch 'master' into feature/acceleration-limit-filter
2018-10-18 16:51:57 -07:00
NissimHadar
702e09b4bc
Added no login option.
2018-10-18 16:43:50 -07:00
NissimHadar
fb0a7274bf
Initially disable Installer URL
2018-10-18 16:41:48 -07:00
amantley
b9a2f19d30
made all the suggested corrections except the dropdown qml.
2018-10-18 16:39:50 -07:00
Kerry Ivan Kurian
d7d49ed84e
Remove cruft
2018-10-18 16:25:26 -07:00
Kerry Ivan Kurian
4d7bc3094a
Fix regression
2018-10-18 16:14:53 -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
Zach Fox
9f91238945
UX/UI improvements
2018-10-18 15:27:16 -07:00
David Back
45a92fd537
style tweaks
2018-10-18 15:12:38 -07:00
David Back
11add70ef2
style tweaks
2018-10-18 14:58:51 -07:00
Simon Walton
0b2ee35907
Merge branch 'master' into avatar-mixer-improvements
2018-10-18 14:13:39 -07:00
Gabriel Calero
a9b9f48335
Setup a higher memory limit for android build
2018-10-18 17:20:30 -03:00
Wayne Chen
6cf9608c97
adding fade in and fade outt in interstitial for progress
2018-10-18 13:12:04 -07: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
Kerry Ivan Kurian
4b12c5c79c
Merge branch 'log-resource-requests-2' of https://github.com/kkurian/hifi into log-resource-requests-2
2018-10-18 12:39:11 -07:00
Kerry Ivan Kurian
77b6389671
Correct location of dependency
2018-10-18 12:38:18 -07:00
David Rowe
9b4c5e1685
Fix OSX/Linux warnings
2018-10-19 08:20:21 +13:00
Alexander Ivash
64f67d5eb7
update imports for utilities / all other qml files found
2018-10-18 22:03:50 +03:00
NissimHadar
4c6185d139
Set the "--no-updater" flag so that the "Update Available" pop-up won't...
2018-10-18 11:51:04 -07:00
Zach Fox
2f37a2b1a1
Merge branch 'master' of github.com:highfidelity/hifi into log-resource-requests-2
2018-10-18 11:12:26 -07:00
NissimHadar
206c14b938
Merge branch 'master' of https://github.com/highfidelity/hifi into addDailyTests
2018-10-18 11:11:21 -07:00
SamGondelman
47c6825aea
CR
2018-10-18 11:08:53 -07:00
Kerry Ivan Kurian
8b922ad7cc
Add missing dependency
2018-10-18 11:07:45 -07:00
Alexander Ivash
a4987e494a
update imports
2018-10-18 21:05:20 +03:00
Wayne Chen
aa8da5ade8
Adding potential fix for showing audio stats - depends on PR#13401
2018-10-18 21:05:20 +03:00
Alexander Ivash
d4286636c8
repurpose qmlscratch into 'controls gallery' launcher
2018-10-18 21:05:20 +03:00
Alexander Ivash
740123b853
rename stylues-uit => stylesUit & controls-uit => controlsUit
...
note:
the idea is to make imports like 'import controlsUit 1.0' to work
with 'styles-uit'/'controls-uit' it is not possible because of two reasons:
1. import controls-uit 1.0 is invalid syntax
2. qmldir inside controls-uit is 'module controlsUit'
2018-10-18 21:05:20 +03: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
r3tk0n
90bf723317
Fix unsubscribing from message channel in teardown()
2018-10-18 10:31:39 -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
David Back
abb166486a
Merge branch 'master' of https://github.com/highfidelity/hifi into entityPropertiesRefactor
2018-10-18 10:17:33 -07:00
Seth Alves
7f150e6ed3
Move grab pseudo-properties (userData) into first-class EntityItemProperties.
2018-10-18 09:53:18 -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
Kerry Ivan Kurian
89a5da80e0
Do not display incomplete metadata
2018-10-18 01:39:20 -07:00
Kerry Ivan Kurian
3b15548ea3
Display resource-access events in marketplace item tester
...
Includes refactoring marketplace item tester into a single-page app.
2018-10-18 01:04:47 -07:00
