Thijs Wenker
2771e2862e
add missing material data json error clear on delete
2018-12-06 23:42:36 +01:00
Thijs Wenker
6d40bc9c2f
userData error message continues popup fix
2018-12-06 23:42:36 +01:00
David Back
6a11766dbf
Merge branch 'master' of https://github.com/highfidelity/hifi into preventDragDrop
2018-12-06 14:02:42 -08:00
David Back
8620a5a4c3
CR changes
2018-12-06 13:07:59 -08:00
David Back
a247e14f3d
Merge branch 'entityListReorderColumns' of github.com:dback2/hifi into entityListReorderColumns
2018-12-06 13:06:49 -08:00
David Back
9fab86d972
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns
2018-12-06 13:05:11 -08:00
David Back
e4efc90605
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns
2018-12-06 13:04:53 -08:00
Sam Gondelman
d21d764131
Merge branch 'master' into NOverlays4
2018-12-06 12:48:05 -08:00
Sam Gondelman
2291c7e5fb
Merge branch 'master' into NOverlays3
2018-12-06 12:37:18 -08:00
Thijs Wenker
d25b5f054b
Merge branch 'master' into fix/create/missingStartMiddleFinishTooltips
2018-12-06 20:48:42 +01:00
Sam Gondelman
b690faeb12
Merge branch 'master' into NOverlays
2018-12-06 11:29:06 -08:00
Sam Gondelman
c38a6966a9
Merge branch 'master' into NOverlays4
2018-12-06 11:25:43 -08:00
Sam Gondelman
d30dd4c26c
Merge branch 'master' into NOverlays3
2018-12-06 11:23:50 -08:00
Adam Smith
08d6e35d4d
Merge pull request #14372 from SamGondelman/decals
...
Case 19798: 3D projected Material Entities and materialRepeat option
2018-12-06 11:13:46 -08:00
Wayne Chen
30f1016f1c
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-06 09:55:00 -08:00
Ryan Huffman
13c3b410d8
Merge pull request #14495 from dback2/draggableNumberFixes76-master
...
Draggable numbers - RC76 fixes to master
2018-12-06 09:47:38 -08:00
Jeff Clinton
e65e8d29a1
Merge pull request #14442 from hyperlogic/bug-fix/hand-grasp-during-desktop-handshake
...
Ensure that hand is in grasp pose during desktop handshake animation
2018-12-06 09:41:29 -08:00
Ryan Huffman
3160339551
Improve Create properties for particles + materials
...
Sizing of input fields is now flexible.
Material scale field labels are no longer obscured.
Material tooltips are corrected.
2018-12-06 09:41:10 -08:00
Jeff Clinton
7f242b8c0e
Merge pull request #14522 from thoys/fix/create/ignoreTextareaShortcuts-master
...
[RC77] MS20114 [CreateApp] ignore createApp shortcut keys while TEXTAREA elements are in focus
2018-12-06 09:11:49 -08:00
David Rowe
aa952e9142
Fix mini tablet visibility angle calculations
2018-12-06 15:24:03 +13:00
David Rowe
363e3ca32d
Merge branch 'master' into mini-tablet-tuning
2018-12-06 13:55:24 +13:00
Sam Gateau
a295c6ffc8
scripts\developer\utilities\lib\jet\qml\TaskListView.qml
2018-12-04 22:41:36 -08:00
Wayne Chen
2d8b638370
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-04 14:19:28 -08:00
Wayne Chen
1375e85f2c
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-12-04 10:21:12 -08:00
Sam Gateau
d2ff4d4674
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-12-03 20:52:43 -08:00
sam gateau
0343983f31
Applying changes done in deferred to forward
2018-12-03 16:58:54 -08:00
SamGondelman
3ce6f7f3d6
real image entities
2018-12-03 11:50:59 -08:00
Thijs Wenker
f38f39c84d
ignore shortcuts in TEXTAREA elements
2018-12-03 19:42:57 +01:00
Zach Fox
2776839dff
Merge pull request #14513 from zfox23/MS20117_rawHtmlRemoval
...
Fix MS20117: Prevent HTML link from appearing in Wallet notification
2018-12-03 10:27:32 -08:00
David Back
a05e831333
Merge branch 'master' into draggableNumberFixes76-master
2018-12-03 09:42:58 -08:00
sam gateau
5af24aa7d9
Merge branch 'master' of github.com:highfidelity/hifi into punk
2018-12-03 08:49:44 -08:00
Wayne Chen
ef12b1128b
Merge branch 'master' of git://github.com/highfidelity/hifi into loginInitiative2
2018-11-30 20:18:04 -08:00
Shannon Romano
3c43f44119
Merge pull request #14462 from huffman/fix/key-light-angle
...
Swap key light directions in Create
2018-11-30 19:28:53 -08:00
Shannon Romano
0d2b0903d8
Merge pull request #14469 from huffman/fix/draggable-input-tabbable
...
Fix draggable inputs not being tabbable
2018-11-30 19:28:11 -08:00
Sam Gateau
80ec393f2e
Merge branch 'master' of github.com:highfidelity/hifi into punk
2018-11-30 19:16:42 -08:00
Shannon Romano
5afff69b78
Merge pull request #14505 from huffman/fix/create-empty-rgb-field
...
Fix empty rgb field in Create going black
2018-11-30 18:19:44 -08:00
Zach Fox
051b7cfbb8
Fix MS20117: Prevent HTML link from appearing in Wallet notification
2018-11-30 16:12:21 -08:00
Wayne Chen
09bc886c20
Merge branch 'master' into loginInitiative2
2018-11-30 13:05:17 -08:00
Ryan Huffman
59b7cdf318
Fix empty rgb field in Create going black
2018-11-29 14:10:22 -08:00
David Rowe
dc05cdee5a
Merge branch 'master' into M17406
...
# Conflicts:
# scripts/system/controllers/controllerModules/nearParentGrabEntity.js
2018-11-30 09:44:09 +13:00
David Back
ec4726ad15
fix subproperty updates
2018-11-29 10:42:26 -08:00
David Back
859c0f3389
Merge branch 'master' of https://github.com/highfidelity/hifi into draggableNumberFixes76-master
2018-11-29 10:41:56 -08:00
David Back
006ba33352
Merge branch 'master' into entityListReorderColumns
2018-11-29 10:29:44 -08:00
Seth Alves
87e4c17194
Merge pull request #14429 from danteruiz/disable-highlighting
...
Remove entity highlighting
2018-11-29 09:04:56 -08:00
Sam Gateau
aa749b0980
adressing review comments
2018-11-28 21:46:13 -08:00
Sam Gateau
9353745054
MErge with master
2018-11-28 21:40:24 -08:00
Sam Gateau
fb47900e2f
Merge branch 'master' of https://github.com/highfidelity/hifi into punk
2018-11-28 19:12:29 -08:00
Wayne Chen
9deb15b9f6
Merge branch 'master' into loginInitiative2
2018-11-28 19:10:20 -08:00
David Back
e5f4f67c10
RC76 draggable number fixes
2018-11-28 17:30:18 -08:00
Sam Gateau
ba4aec2aff
Fixing the issues with thte debug renderdeferredTask and investigating the avatars perf
2018-11-28 01:01:18 -08:00
Ryan Huffman
ec19d2f119
Fix Create tooltips getting pushed down for tall rows
2018-11-27 19:07:04 +01:00
Thijs Wenker
e193dcbc60
- add missing start/middle/finish tooltips
...
- style updates
2018-11-27 19:07:04 +01:00
Zach Fox
31f7d747c8
Bugfixes; enable purchase asset from marketplace screen raise
2018-11-26 15:48:49 -08:00
sam gateau
f348cc35c4
separting debug in its own task
2018-11-26 15:20:45 -08:00
Zach Fox
8df5db4239
Allow scripts to open SendAsset screen with pre-filled info
2018-11-26 13:26:17 -08:00
Ryan Huffman
a6e203e3e5
Fix draggable inputs not being tabbable
2018-11-26 11:12:14 -08:00
Wayne Chen
68834cb29f
Merge branch 'loginInitiative2' of https://github.com/wayne-chen/hifi into loginInitiative2
2018-11-26 10:11:41 -08:00
Wayne Chen
0d52566315
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-26 09:13:35 -08:00
David Rowe
c96cd422e1
Fix near parent grab tear away calc for avatar scale
2018-11-24 11:58:40 +13:00
David Rowe
f2abf8e398
Debounce haptic pulses at start of near parent grab
2018-11-24 11:43:05 +13:00
David Rowe
29c268df5a
Remove extraneous grab entity haptic pulses
2018-11-24 11:38:54 +13:00
David Rowe
f1dad3c465
Add hystersis between near parent grabbing and tearing away
2018-11-24 08:35:02 +13:00
David Rowe
1362e7f361
Fix near parent grab entity tear away distance calc
2018-11-24 08:26:54 +13:00
Ryan Huffman
1e746e1b1c
Swap key light directions in Create
2018-11-21 16:43:54 -08:00
David Rowe
5e51ba051a
Improve code responsibilities
2018-11-22 11:12:22 +13:00
Wayne Chen
51f5942a7f
adding sound to login screen
2018-11-21 13:36:36 -08:00
Sam Gateau
6b1c7bf96e
restoring the engine render views and cleaning up the task / config section of the pr
2018-11-20 23:15:09 -08:00
sam gateau
44b9b92450
Getting ready for merge
2018-11-20 17:32:04 -08:00
David Rowe
c3a0805db1
Make far grab ignore tablet while grabbing an entity
2018-11-21 10:28:46 +13:00
sam gateau
a28b5a8902
Merge branch 'master' of github.com:highfidelity/hifi into one
2018-11-20 12:15:42 -08:00
David Rowe
44efd18882
Make Create and Shapes lasers ignore tablet while editing
2018-11-21 08:38:30 +13:00
John Conklin II
87cac67c75
Merge pull request #14280 from ElderOrb/FB17381
...
FB17381 - Reticle.setVisible isn't working
2018-11-20 09:53:52 -08:00
John Conklin II
04ccf9a257
Merge pull request #14435 from dback2/draggableNumberDelay2
...
Entity list - prevent draggable number updates while dragging
2018-11-20 09:16:14 -08:00
Anthony Thibault
0f7afb133a
Ensure that hand is in grasp pose during desktop handshake animation
2018-11-19 17:59:50 -08:00
David Back
a94fec75b4
prevent drag drop onto edit
2018-11-19 17:59:42 -08:00
sam gateau
3412a4573b
Merge branch 'master' of github.com:highfidelity/hifi into one
2018-11-19 17:40:15 -08:00
David Back
dff4e34e7b
CR changes
2018-11-19 16:59:33 -08:00
David Back
249ebb2389
remove unneeded
2018-11-19 16:21:52 -08:00
Ryan Huffman
b7fe3d47be
Merge pull request #14433 from huffman/fix/entity-properties-styling
...
Fix several entity tool window styling issues
2018-11-19 16:17:50 -08:00
David Back
ff6d43d0e4
block updates during dragging
2018-11-19 16:15:11 -08:00
Ryan Huffman
007396346c
Fix grid tool styling
2018-11-19 14:07:24 -08:00
Ryan Huffman
7694aa8e66
Fix draggable number going into edit too often
2018-11-19 13:51:25 -08:00
Ryan Huffman
193b9752b8
Fix styling of properties window when narrow
2018-11-19 13:50:56 -08:00
Dante Ruiz
d6fbcb1668
remove entity highlighting
2018-11-19 11:04:09 -08:00
Wayne Chen
b8d8710604
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-19 09:02:16 -08:00
David Rowe
eb8c6c8974
Merge branch 'master' into M19345
2018-11-19 09:47:05 +13:00
Sam Gateau
5f062bbcf5
Merge branch 'master' of https://github.com/highfidelity/hifi into one
2018-11-16 20:05:08 -08:00
Ryan Huffman
7701be0742
Merge pull request #14410 from thoys/fix/create/entityListDoubleClick
...
CreateApp Fix entity list double click rename / highlight and virtual keyboard issue
2018-11-16 18:41:47 -08:00
unknown
20cb64ead2
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns
2018-11-16 17:14:42 -08:00
unknown
a0f79f9881
entity list reordering columns
2018-11-16 17:14:30 -08:00
Thijs Wenker
ba790ae470
fix behavior after merge.
2018-11-17 01:20:36 +01:00
Shannon Romano
6425a474ac
Merge pull request #14378 from danteruiz/fix-case-of-infinate-loading
...
Fixing case of interstitial not finishing loading
2018-11-16 14:53:01 -08:00
unknown
e9fb9b1f4d
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListReorderColumns
2018-11-16 14:51:48 -08:00
Thijs Wenker
7b3d2bed15
CR fixes
2018-11-16 22:10:15 +01:00
Thijs Wenker
e89346c146
making rename functionality list refresh proof
2018-11-16 22:10:14 +01:00
Thijs Wenker
31d37e7e75
Fix entity list double click rename / highlight issue
2018-11-16 22:08:58 +01:00
Sam Gateau
0166d7748a
Merging with master around rc76 cut time
2018-11-15 22:52:37 -08:00
David Rowe
b24c482743
Terminate Create far grab etc. upon laser intersecting tablet
2018-11-16 16:29:57 +13:00
David Back
17404863e7
entity list reordering WIP
2018-11-15 17:42:51 -08:00
Ryan Huffman
556aec9412
Fix hiding of properties in Create
2018-11-15 15:27:30 -08:00
David Back
de7f4a4a4d
fix entity list resizing
2018-11-15 15:23:18 -08:00
John Conklin II
83660ab8e1
Merge pull request #14128 from Zvork/ao
...
Improved Ambient Occlusion
2018-11-15 13:57:13 -08:00
David Rowe
f2868fec3f
Merge branch 'master' into M19345
2018-11-16 09:11:11 +13:00
Brad Hefta-Gaub
20766da624
Merge pull request #14382 from dback2/newPropertySliders
...
Entity properties - new draggable numbers
2018-11-15 10:01:07 -08:00
Olivier Prat
ed42c94772
Merge branch 'master' of http://github.com/highfidelity/hifi into ao
2018-11-15 17:55:29 +01:00
David Back
dfed797682
set more min/max/steps
2018-11-14 15:44:30 -08:00
Wayne Chen
c85b840db0
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-14 14:47:56 -08:00
David Back
76d2519205
Merge pull request #14400 from dback2/missingTypeFilters
...
Add PolyLine/PolyVox to entity list/properties types
2018-11-14 14:39:26 -08:00
David Back
d8f5e0f708
add min/max/step for some properties, remove duplicate createProperty, improve switch between states
2018-11-14 14:32:17 -08:00
David Back
70493e3f29
add polyline/polyvox to entity list/properties types
2018-11-14 12:23:16 -08:00
SamGondelman
079d1dcbd6
convert clientOnly to entityHost and add local entities
2018-11-14 11:25:37 -08:00
Thijs Wenker
cd12dd8f6d
fix OSX shortcut inconsistencies
2018-11-14 19:28:57 +01:00
Olivier Prat
85a3938cbe
Switch to app for ambient occlusion debug script
2018-11-14 11:55:11 +01:00
Olivier Prat
45e0f65972
Merge branch 'ao' of http://github.com/Zvork/hifi into ao
2018-11-14 09:48:24 +01:00
David Back
1aa048f4d6
style and decimal fixes
2018-11-13 17:56:31 -08:00
David Back
a349bac01c
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
2018-11-13 16:32:15 -08:00
Thijs Wenker
2c715bf592
make window shortcuts work on OSX
2018-11-14 01:05:39 +01:00
Thijs Wenker
afd69d04dd
Make ctrl+shift shortcuts work for create app
2018-11-14 01:05:37 +01:00
Thijs Wenker
e890228fc7
Make shortcuts work in edit windows
2018-11-14 01:05:36 +01:00
David Back
8db81d9ce6
restructure draggable numbers to be more like blender
2018-11-13 16:04:08 -08:00
John Conklin II
d7dd593a97
Merge pull request #14369 from dback2/entityListColumns
...
Entity list - dynamic columns
2018-11-13 16:01:06 -08:00
David Back
91db81cd94
merge fix
2018-11-13 15:10:53 -08:00
David Back
c73e737552
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
2018-11-13 15:04:12 -08:00
David Back
e88e131dca
Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders
2018-11-13 15:04:02 -08:00
Sam Gondelman
13f650d514
Merge pull request #14093 from SamGondelman/police
...
Case 19409, Case 19468: Fading fixes and shader cleanup
2018-11-13 15:00:23 -08:00
Jamil Akram
d65a79e815
Merge pull request #14377 from huffman/feat/ui-updates
...
Update the styling for the Entity Properties window
2018-11-13 14:39:57 -08:00
Jeff Clinton
18bf6bf975
Merge pull request #14143 from ElderOrb/FB18673
...
FB18673 - Last line of GOTO desktop notification text cropped off on …
2018-11-13 14:05:21 -08:00
Ryan Huffman
aecbccc058
Remove dead code and cleanup JS styling for entity properties redesign
2018-11-13 13:45:27 -08:00
Ryan Huffman
8c9015b224
Remove redundant dimensions in default entity properties
2018-11-13 13:45:27 -08:00
Ryan Huffman
536ba645b1
Update the styling for the Entity Properties window
2018-11-13 13:45:27 -08:00
Brad Hefta-Gaub
bb2239c0bd
Merge pull request #14359 from howard-stearns/no-url-logging
...
remove urls from logs in Interface
2018-11-13 13:19:30 -08:00
Brad Hefta-Gaub
07f94030ce
Merge pull request #14357 from ctrlaltdavid/M19761
...
Fix mini tablet JavaScript crash
2018-11-13 12:15:56 -08:00
Brad Hefta-Gaub
41d8220cbd
Merge pull request #14362 from ctrlaltdavid/M19768
...
Add option to enable/disable the mini tablet
2018-11-13 11:59:24 -08:00
David Back
0b0614c84a
CR fixes
2018-11-13 11:13:00 -08:00
Dante Ruiz
812373cdab
fixing loading bar visual
2018-11-13 11:11:18 -08:00
Dante Ruiz
1a95ee2b31
making requested changes
2018-11-13 11:11:18 -08:00
Dante Ruiz
10d045b11b
fix infinate loading if entity server is not running
2018-11-13 11:07:26 -08:00
Brad Hefta-Gaub
63e52ba8bd
Merge pull request #14284 from ctrlaltdavid/M19404
...
Fix interstitial page not displaying at Interface start-up
2018-11-13 10:38:38 -08:00
David Back
b5ec04a534
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListColumns
2018-11-13 10:35:57 -08:00
David Back
047708bedb
Merge branch 'master' of github.com:dback2/hifi into entityListColumns
2018-11-13 10:24:02 -08:00
Howard Stearns
545b85bc9d
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-13 09:55:54 -08:00
Seth Alves
7ffba9d987
Merge pull request #14204 from ctrlaltdavid/M12661
...
Fixes for collisionless entities
2018-11-13 09:42:07 -08:00
David Back
b3ccce9a3f
merge follow-up
2018-11-12 17:30:21 -08:00
David Back
c5023b1086
Merge branch 'feat/ui-updates' of github.com:huffman/hifi into newPropertySliders
2018-11-12 17:03:07 -08:00
Ryan Huffman
a787f55506
Remove dead code and cleanup JS styling for entity properties redesign
2018-11-12 16:50:45 -08:00
Ryan Huffman
a020a09e8c
Remove redundant dimensions in default entity properties
2018-11-12 16:50:45 -08:00
Ryan Huffman
25df605459
Update the styling for the Entity Properties window
2018-11-12 16:50:45 -08:00
John Conklin II
0370c60398
Merge pull request #14358 from AndrewMeadows/fix-capsuleY
...
Case 18436: consistent handling of CapsuleShape dimensions
2018-11-12 15:25:42 -08:00
Howard Stearns
66ae01e0c3
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-12 12:55:20 -08:00
David Back
0781171912
Merge branch 'newPropertySliders' of github.com:dback2/hifi into newPropertySliders
2018-11-12 12:20:05 -08:00
David Back
a0d5b1117a
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
2018-11-12 11:41:00 -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
Wayne Chen
ea325acef9
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-12 10:28:03 -08:00
David Back
eeb8ede8ff
Merge branch 'master' of https://github.com/highfidelity/hifi into newPropertySliders
2018-11-12 10:10:38 -08:00
unknown
4eab623fd8
remove debugPrint function
2018-11-09 17:25:48 -08:00
unknown
0160ab23ab
fix color pickers
2018-11-09 17:23:51 -08:00
unknown
08d9eda7d7
fix property bugs / style issues
2018-11-09 17:08:10 -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
SamGondelman
1d1510e18e
Merge remote-tracking branch 'upstream/master' into police
2018-11-09 13:32:41 -08:00
David Back
615ffebb2c
new draggable numbers WIP
2018-11-09 13:14:05 -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
SamGondelman
b3abd97707
projected materials and repeat property
2018-11-09 10:47:07 -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
David Rowe
a34e1f69e0
Merge branch 'master' into M19345
...
# Conflicts:
# scripts/system/controllers/controllerModules/nearParentGrabOverlay.js
2018-11-09 14:26:29 +13:00
David Rowe
c9b3fda724
Merge branch 'master' into M19768
...
# Conflicts:
# interface/src/scripting/HMDScriptingInterface.h
2018-11-09 13:56:44 +13:00
Thijs Wenker
e483b1342c
CR fixes
2018-11-09 01:56:17 +01:00
David Rowe
aca7143449
Fix interstitial music not playing at Interface start-up
2018-11-09 13:41:07 +13:00
Ryan Huffman
3b57e45fdd
Remove redundant dimensions in default entity properties
2018-11-08 16:36:55 -08:00
Ryan Huffman
44d0a7254c
Update the styling for the Entity Properties window
2018-11-08 16:36:55 -08:00
David Rowe
5c97954e66
Merge branch 'master' into M19404
...
# Conflicts:
# scripts/system/interstitialPage.js
2018-11-09 13:35:11 +13: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
Wayne Chen
f66326fc4d
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-08 15:51:24 -08:00
David Rowe
cdae5cd03d
Front-load interstitial scripts and resources
2018-11-09 10:53:34 +13: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
Wayne Chen
e266532888
Merge branch 'master' into loginInitiative2
2018-11-08 11:17:24 -08:00
Zach Fox
811b01816b
CR round 3
2018-11-08 10:41:31 -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
Zach Fox
e0ca535853
CR round 2
2018-11-08 10:08:42 -08:00
Zach Fox
142dfab9ac
CR round 1
2018-11-08 10:05:57 -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
Zach Fox
1ab1cb95d8
Merge branch 'master' of github.com:highfidelity/hifi into no-url-logging
2018-11-08 09:57:10 -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
Olivier Prat
9d5dcec0a0
Merge from master
2018-11-08 09:14:42 +01:00
David Rowe
371919b923
Fix mini tablet always displaying if start up in HMD mode
2018-11-08 17:47:02 +13:00
David Rowe
e5fe2622ae
Merge branch 'master' into M19768
2018-11-08 17:13:02 +13:00
David Back
0597d15771
tabs
2018-11-07 16:06:18 -08:00
David Back
708f6a9402
Merge branch 'master' of https://github.com/highfidelity/hifi into entityListColumns
2018-11-07 16:02:33 -08:00
David Back
f0c2ec1fa4
entity list data-driven resizable addable/removable columns
2018-11-07 16:02:15 -08:00
sam gateau
9ada9a7ad3
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-11-07 12:07:15 -08:00
Wayne Chen
51586625e7
Merge branch 'master' of https://github.com/highfidelity/hifi into loginInitiative2
2018-11-07 12:02:38 -08:00
Wayne Chen
bd11825f3d
removing debug print statement
2018-11-07 09:40:01 -08:00
Wayne Chen
fc32ba9ce3
fixing create app window on desktop
2018-11-07 09:26:34 -08:00
David Rowe
28097933ed
Add setting to enable/disable the mini tablet
2018-11-07 14:39:06 +13:00
Zach Fox
e80468e423
Remove URL logging from JS and QML
2018-11-06 15:09:24 -08:00
Andrew Meadows
b38c263e60
use correct capsule dimensions in teleport.js
2018-11-06 12:44:14 -08:00
David Rowe
629559e78c
Add extra ()s
2018-11-07 09:20:54 +13:00
David Rowe
f47f77b181
Fix mini tablet JavaScript crash
2018-11-07 09:11:43 +13: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
David Rowe
55d0822b1a
Delay showing mini tablet
2018-11-02 18:18:41 +13:00
David Rowe
8924f0832a
Use half angles relative to palm normal for mini tablet visibility
2018-11-02 18:06:00 +13:00
Ryan Huffman
4593b33435
Fix new models not obeying dynamic checkbox
2018-11-01 14:38:55 -07:00
David Rowe
1e3549d263
Increase delay in shrinking the mini tablet after start of trigger
2018-11-02 08:33:14 +13: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
Alexander Ivash
dcf20d2a15
FB17381 - Reticle.setVisible isn't working
2018-11-01 22:39:02 +05:30
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
Andrew Meadows
90e944f130
always zero velocity on near-grab release of non-dynamic
2018-10-30 16:20:33 -07:00
Zach Fox
b6344acc1d
Big checkpoint. be aware - things may be broken
2018-10-30 15:08:13 -07:00
sam gateau
592c2b267d
Merge branch 'master' of github.com:highfidelity/hifi into black-bis
2018-10-30 15:07:20 -07:00
David Kelly
015b5fa681
Don't attempt purchase of sold out items
2018-10-30 08:01:22 -07:00
David Rowe
791ee04aea
Merge branch 'master' into M12661
2018-10-30 13:33:53 +13:00
Zach Fox
d47fd44a47
Merge branch 'master' of github.com:highfidelity/hifi into oculus-store-commerce
2018-10-29 14:57:23 -07:00
Ryan Huffman
c6403a44cb
Merge pull request #14281 from dback2/collidesPropertyFix
...
Fix Collides With subproperties
2018-10-26 13:46:52 -07:00
John Conklin II
fa2fb3a87a
Merge pull request #14246 from sethalves/sync-grab-props
...
keep userData and new grab properties in sync
2018-10-26 11:52:47 -07:00
David Rowe
2fdb114e4b
Fix interstitial page not displaying at Interface start-up
2018-10-26 19:21:37 +13:00
David Back
13acfb325a
fix collides with properties, fix ordering for start/finish/spread properties
2018-10-25 15:06:15 -07:00
John Conklin II
2dfd63f4e7
Merge pull request #14229 from thoys/feat/create/tooltips
...
MS19052 [CreateApp]: Tooltips
2018-10-25 14:52:16 -07:00
