SamGondelman
079d1dcbd6
convert clientOnly to entityHost and add local entities
2018-11-14 11:25:37 -08:00
Ryan Huffman
5e6d0c0f94
Merge pull request #14376 from thoys/feat/create/localGlobalToggle
...
[CreateApp] Local/World toggle
2018-11-12 10:37:55 -08:00
Jeff Clinton
12b833d121
Merge pull request #14167 from ElderOrb/FB18859
...
Make material entities to be presented in avatarapp
2018-11-09 15:32:27 -08:00
Jeff Clinton
ee9154a801
Merge pull request #14341 from sethalves/fix-mouse-equip
...
only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand
2018-11-09 12:54:36 -08:00
Jeff Clinton
3d01949e43
Merge pull request #14305 from AndrewMeadows/zero-vel-neargrab-nondynamic
...
Case 19495: zero velocities of non-dynamic entities on nearGrab release
2018-11-09 10:10:49 -08:00
Thijs Wenker
99fcef105f
spaceMode / desiredSpaceMode explanation
2018-11-09 17:59:00 +01:00
Thijs Wenker
e483b1342c
CR fixes
2018-11-09 01:56:17 +01:00
Thijs Wenker
9005efb639
style fixes
2018-11-09 01:30:05 +01:00
Thijs Wenker
08da8c4190
createApp - world/local switch
2018-11-09 01:28:37 +01:00
John Conklin II
3fabe557c2
Merge pull request #13948 from danteruiz/3d-keyboard
...
3D Keyboard.
2018-11-08 13:35:13 -08:00
Jeff Clinton
d349c1e672
Merge pull request #14336 from huffman/fix/horizontal-vertical-angle-particles
...
Fix horizontal and vertical props in entity properties being swapped
2018-11-08 12:42:48 -08:00
Jeff Clinton
ea8dc8ae68
Merge pull request #14334 from danteruiz/interstitial-bug-fixes
...
Interstitial bug fixes
2018-11-08 11:43:38 -08:00
Jeff Clinton
62e3e87ba6
Merge pull request #14325 from huffman/fix/new-model-dynamic
...
Fix new models not obeying dynamic checkbox
2018-11-08 10:22:12 -08:00
Jeff Clinton
30ff3f676a
Merge pull request #14310 from thoys/fix/create/tooltips-refinement
...
Create APP tooltip / Adressed CR comments / Regression
2018-11-08 10:03:17 -08:00
Dante Ruiz
501746b156
3D Keyboard
2018-11-08 09:58:53 -08:00
Jeff Clinton
49bf01294a
Merge pull request #14320 from huffman/fix/default-collision-values
...
Update the default edit.js collidesWith to include myAvatar
2018-11-08 09:17:40 -08:00
sam gateau
9ada9a7ad3
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-11-07 12:07:15 -08:00
Alexander Ivash
82313f9464
update imports for utilities / all other qml files found
2018-11-06 14:21:14 +05:30
Wayne Chen
2296848fcb
Adding potential fix for showing audio stats - depends on PR#13401
2018-11-06 14:21:14 +05:30
Alexander Ivash
27bb8a0de7
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-11-06 14:21:14 +05:30
Howard Stearns
5e01314d85
Merge pull request #14319 from howard-stearns/tabless
...
Remove tabs from oculus store inventory, and rename to match
2018-11-05 18:05:02 -08:00
Howard Stearns
89656ea3f6
activity notifications also change ASSETS to INVENTORY
2018-11-05 16:43:06 -08:00
Howard Stearns
03ac18ab74
Merge pull request #14299 from davidkelly/dk/19591
...
Don't attempt purchase of sold out items
2018-11-05 16:20:02 -08:00
Zach Fox
f10b9ae30c
Squashed commit of the following:
...
commit 515ff016a4a4d36b38458906b909ebd0181283ddd0181283ddbe17ed0910643026abd6#14308 from sabrina-shanman/fbx2hfm
(case 19302) Re-name FBXGeometry to HFMGeometry and do the same for related classes
commit 643026abd60b7ddca5f6becee7f010
2018-11-05 13:12:43 -08:00
Zach Fox
515ff016a4
Fix seven bugs
2018-11-05 13:03:34 -08:00
howard-stearns
7115f0e688
update notification refs inventory, not assets
2018-11-04 12:17:41 -08:00
howard-stearns
4f713b038e
Merge branch 'oculus-store-commerce' into tabless
2018-11-04 12:17:21 -08:00
howard-stearns
8906b909eb
close wallet app during login so that it doesn't tell to login after
...
login
2018-11-04 12:08:29 -08:00
howard-stearns
100a17a2b9
remove wallet reference in update notification
2018-11-04 11:25:40 -08:00
howard-stearns
8ad8398ef3
remove 'purchase' from login notice.
2018-11-04 11:17:56 -08:00
Seth Alves
a94fd2a1c9
only equip an entity to a hand-controller joint if the hand-controllers are in use, else use avatar hand
2018-11-03 13:14:08 -07:00
Zach Fox
a87142b8b7
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-11-02 16:49:20 -07:00
Ryan Huffman
c22df4dd94
Fix horizontal and vertical props in entity properties being swapped
2018-11-02 16:22:10 -07:00
Zach Fox
402c23e359
Use useragent instead of queryparam to determine limitedCommerce
2018-11-02 16:07:29 -07:00
Dante Ruiz
b33934ec46
fixing Image3DOverlay scaling
2018-11-02 14:24:14 -07:00
Zach Fox
2b50c40224
Minor changes found by Chang
2018-11-02 09:33:06 -07:00
Ryan Huffman
4593b33435
Fix new models not obeying dynamic checkbox
2018-11-01 14:38:55 -07:00
Ryan Huffman
01b29185ca
Update the default edit.js collidesWith to include myAvatar
2018-11-01 12:04:20 -07:00
Howard Stearns
8f2f27f468
Merge branch 'oculus-store-commerce' into tabless
2018-11-01 11:22:28 -07:00
Zach Fox
4a56f769e5
Re-add some code I shouldn't have removed
2018-11-01 11:04:59 -07:00
Zach Fox
d481f081bb
Fix four bugs; truncate some logs
2018-11-01 10:29:38 -07:00
Zach Fox
41a0d09389
First pass
2018-10-31 15:31:51 -07:00
Howard Stearns
ce0ad48a28
tabless wallet
2018-10-31 13:58:26 -07:00
Zach Fox
34fb849536
Cleanup FIXME
2018-10-31 13:53:18 -07:00
Zach Fox
a1276ba899
Don't poll for history notifs if limitedCommerce is true
2018-10-31 13:31:29 -07:00
Zach Fox
448be8847f
Notifications are working!
2018-10-31 13:23:58 -07:00
Dante Ruiz
b3539b101b
faster loading bar interpolation once physics is enabled
2018-10-31 11:33:53 -07:00
Thijs Wenker
92888e9d3e
tooltip CR changes
2018-10-31 18:26:23 +01:00
Andrew Meadows
225e8e0556
always zero velocity on far-grab release of non-dynamic
2018-10-31 10:20:21 -07:00
Dante Ruiz
0279eef3a4
improving interstitial loading bar
2018-10-31 10:13:32 -07:00
