Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-05-18 20:00:02 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
73145 commits 25 branches 0 tags 1.1 GiB
Commit graph

5331 commits

Author SHA1 Message Date
David Rowe
496e0a6304 Update teleport FBX models 2018-09-26 17:20:56 +12:00
Wayne Chen
3e5e324c7e parenting text to head 2018-09-25 20:39:22 -07:00
Wayne Chen
54f800fbda including images/parent buttons to text 2018-09-25 20:21:05 -07:00
Kerry Ivan Kurian
28ec98be9e Uninstall marketplace item tester on wallet shutdown 2018-09-25 19:24:46 -07:00
Wayne Chen
42579f3d16 fixing oops dialog text index lookups 2018-09-25 18:21:51 -07:00
Wayne Chen
26b6967ba6 adding overlays to redirect domain 2018-09-25 18:16:18 -07:00
Kerry Ivan Kurian
e6249e690e Remove duplicate line 2018-09-25 15:52:26 -07:00
Kerry Ivan Kurian
ff83713365 Use persistent object id counter 2018-09-25 00:58:01 -07:00
Kerry Ivan Kurian
ca1da9c830 Implement delete-from-list functionality in marketplace item tester 2018-09-25 00:57:59 -07:00
Kerry Ivan Kurian
505e08b841 Resolve merge conflicts 2018-09-25 00:57:43 -07:00
David Rowe
a00cacc03e Fix post-teleport display; hide immediately avatar moves 2018-09-25 16:02:19 +12:00
Zach Fox
1ac2800e18 Fix wallet dot logic 2018-09-24 17:50:37 -07:00
Zach Fox
be304ea975 Small bugfixes again 2018-09-24 17:33:23 -07:00
David Rowe
03f0b95a3f Fix unwanted hexagonal occlusion artefact 2018-09-25 12:03:41 +12:00
David Rowe
7396bf0dbe Immediately hide post-teleport play area if start teleporting again 2018-09-25 11:39:41 +12:00
David Rowe
06b4f51a08 Misc fixes 2018-09-25 11:33:08 +12:00
Kerry Ivan Kurian
697f556a60 Persist list of marketplace items in test 
The list of resources between runs of the marketplace item tester now persist between runs of the tester.
 2018-09-24 16:30:49 -07:00
David Rowe
90ef109476 Remove superseded Pointers API functions 2018-09-25 11:11:53 +12:00
Dante Ruiz
57ae8ff8a1 update interstitial page stability count and loading bar 2018-09-24 16:09:53 -07:00
David Rowe
4927ffece3 Misc fixes 2018-09-25 10:33:49 +12:00
David Rowe
991ceb643c Fix teleport not working after script reload in HMD mode 2018-09-25 10:18:52 +12:00
David Rowe
858abaf6fc Fix sensor overlays not displaying after re-enter HMD mode 2018-09-25 09:49:11 +12:00
Zach Fox
a76c3f028d Small bugfixes 2018-09-24 14:46:00 -07:00
Howard Stearns
71cff45fbb Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-24 14:38:21 -07:00
John Conklin II
55848e6959
Merge pull request #14008 from sethalves/fix-local-angular-velocity 
fix bug that caused localAngularVelocity to get zeroed out
 2018-09-24 14:32:57 -07:00
Howard Stearns
d3391b9273 Merge branch 'master' of github.com:highfidelity/hifi into account-managed-wallet-punchlist2 2018-09-24 13:50:52 -07:00
John Conklin II
1f6f51993d
Merge pull request #14029 from huffman/fix/keyboard-logging-in-edit 
Remove verbose logging of keyboard messages in edit.js and gridTool.js
 2018-09-24 12:54:43 -07:00
John Conklin II
9916496118
Merge pull request #14041 from huffman/fix/entity-list-no-highlight-74 
Fix entity list selection failing when selecting entities not in list
 2018-09-24 11:02:36 -07:00
David Back
df48c60a8f further improvements/fixes 2018-09-24 10:28:37 -07:00
Zach Fox
57c303440b Merge branch 'master' of github.com:highfidelity/hifi into notificationsForFourApps 2018-09-24 09:32:53 -07:00
David Back
074c3f2c7c Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-24 09:23:44 -07:00
Dante Ruiz
5a8ab61426 Merge branch 'master' of github.com:highfidelity/hifi into update-interstitial 2018-09-24 09:21:36 -07:00
David Rowe
5ff2c36917 Get play area displaying and working again 2018-09-24 15:53:47 +12:00
David Rowe
e29b403abc Merge branch 'master' into M18586 
# Conflicts:
#	interface/src/raypick/PointerScriptingInterface.cpp
#	interface/src/raypick/PointerScriptingInterface.h
#	interface/src/raypick/StylusPointer.h
#	libraries/pointers/src/Pointer.h
#	scripts/system/controllers/controllerModules/teleport.js
 2018-09-24 11:44:28 +12:00
Dante Ruiz
d4450ac780 fix equip and keeping new functionallity 2018-09-21 15:59:00 -07:00
David Kelly
fe9b972c80 Do not have active buy button on invalidated items 2018-09-21 15:46:57 -07:00
John Conklin II
ea7bc26ad8
Merge pull request #14038 from wayne-chen/fixInterstitialButton 
Fix Interstitial GoTo button stretch
 2018-09-21 11:44:48 -07:00
Dante Ruiz
d3368146ce saving work 2018-09-21 11:42:26 -07:00
Zach Fox
6284074ff9 Don't show banner when app is open but continue updating data 2018-09-21 10:47:59 -07:00
David Back
506b9d8645 more fixes for deleting/selecting, potential optimizations 2018-09-21 10:02:41 -07:00
David Rowe
b1bbcb9e5e Tidying 2018-09-21 13:48:28 +12:00
David Rowe
9426f72652 Make mini tablet disappear when using grip the same as the trigger 2018-09-21 13:45:10 +12:00
David Rowe
eac1666e01 Disable grabbing the mini tablet with the grip button 2018-09-21 12:44:55 +12:00
David Rowe
0ae7fdc7b1 Remove ability to grab the mini tablet with the other hand 2018-09-21 12:02:46 +12:00
David Rowe
5719b7020d Merge branch 'master' into M17428-f 2018-09-21 10:47:56 +12:00
Zach Fox
33c04631ea Comments on Confluence doc 2018-09-20 14:37:46 -07:00
Kerry Ivan Kurian
ae4352f450 Rez entity in marketplace item tester 2018-09-20 13:55:22 -07:00
Ryan Huffman
1ee655c8f8 Fix sorting of entity list not working as expected 2018-09-20 13:51:00 -07:00
Thijs Wenker
d1f35c8c54 update the entityList update with newly added Entities.getMultipleEntities function 2018-09-20 22:48:56 +02:00
Ryan Huffman
72adfb7ff0 Fix entity list selection failing when selecting entities not in list 2018-09-20 13:46:22 -07:00
Zach Fox
87e91a4401 GOTO doesn't care about SINCE; reduce data for PEOPLE 2018-09-20 13:36:50 -07:00
Wayne Chen
8bd698b143 leaving button in natural dims 2018-09-20 11:13:27 -07:00
David Back
e1758c7974 CR changes 2018-09-20 11:08:01 -07:00
Zach Fox
ed84b49ece Small bugfixes and using original endpoints 2018-09-19 16:15:59 -07:00
Howard Stearns
d644a63990 consistent/usefull checkout flow when you don't have enough money. 2018-09-19 16:00:40 -07:00
Ryan Huffman
8805ce49e3 Remove verbose logging of keyboard messages in edit.js and gridTool.js 2018-09-19 15:06:58 -07:00
Ryan Huffman
431daecd8e Fix shifting of yaw rotation handle 2018-09-19 14:33:51 -07:00
David Back
e701c79984 Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-19 14:06:28 -07:00
David Back
46c8083fb9 only call selectEntity one time per trigger 2018-09-19 10:13:15 -07:00
Zach Fox
f70ecdad16 Small bugfix 2018-09-18 17:00:53 -07:00
Zach Fox
9db11aeda7 Bugfixes and new algo for PAL notifs 2018-09-18 16:35:53 -07:00
Zach Fox
4987164706 Notifications for GOTO (using a cool algorithm) 2018-09-18 15:30:43 -07:00
Zach Fox
55a0f77697 Notifications for MARKET 2018-09-18 14:45:14 -07:00
Zach Fox
a97f9eb79a Logic for Wallet notifications; some bugfixes 2018-09-18 12:28:03 -07:00
Zach Fox
d487914656 Prevent text notification from appearing when not necessary 2018-09-18 11:28:59 -07:00
Kerry Ivan Kurian
f2a046da91 Install marketplace item tester 2018-09-18 00:08:09 -07:00
Zach Fox
c453594eb7 Overhaul notification logic for PAL 2018-09-17 14:41:18 -07:00
Zach Fox
143a059b16 Small changes to AppUI and PAL 2018-09-17 11:11:36 -07:00
Zach Fox
23fab0985b Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-17 11:11:21 -07:00
David Rowe
5b3d92e816 Persist showing mini tablet for a while after it would otherwise hide 2018-09-16 08:09:26 +12:00
Seth Alves
f86075b2dd Revert "Fix for angularVelocity zeroing out on duplication or undo" 
This reverts commit 9c96a10f6c.
 2018-09-15 09:21:12 -07:00
David Rowe
9d051b71bb Fix mini tablet sometimes flipping when grabbed by other hand 2018-09-15 10:14:22 +12:00
John Conklin II
65ef04ae75
Merge pull request #13937 from luiscuenca/stt_teleport_wip 
Safe Teleport Target
 2018-09-14 15:11:18 -07:00
Zach Fox
9c5544af39 Merge in big work from appui_notifications branch 2018-09-14 14:37:04 -07:00
Zach Fox
9e50904376 Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-14 14:36:22 -07:00
luiscuenca
04e6225a95 Threshold back 2018-09-14 11:22:47 -07:00
luiscuenca
8c9173b639 Safe landing for discrepancies 2018-09-14 11:06:30 -07:00
David Back
86972cf4fb
Merge pull request #13992 from dback2/entityListSearchCase 
Fix entity list search case-sensitivity and allow id search
 2018-09-14 10:58:44 -07:00
Howard Stearns
4378f5bf1c
Merge pull request #13996 from howard-stearns/text-tuning-for-wallet-setup-cta 
Text tuning for wallet setup call to action
 2018-09-14 10:17:22 -07:00
David Back
296e2ba488 lowercase search term at start 2018-09-14 09:57:27 -07:00
Gabriel Calero
cb49635627 Fix switch from Top View to My View 2018-09-14 13:34:04 -03:00
howard-stearns
685b2978ce Text tuning for wallet setup call to action 2018-09-14 08:26:25 -07:00
David Rowe
45281960af Don't display mini tablet if user is away 2018-09-14 20:30:17 +12:00
David Rowe
80aa74600f Fix mini tablet sometimes remaining parented when it shouldn't be 2018-09-14 20:15:08 +12:00
David Rowe
ba56457663 Smooth the transition between expanded mini tablet and tablet proper 2018-09-14 20:14:54 +12:00
David Rowe
f01ebe57ea Trial hiding the UI when it's expanding to become the tablet proper 2018-09-14 18:55:29 +12:00
unknown
f9480c24a5 store search term lower 2018-09-13 20:07:49 -07:00
unknown
ae2005b8c4 Merge branch 'master' of https://github.com/highfidelity/hifi into entityListSearchCase 2018-09-13 19:37:16 -07:00
luiscuenca
fb37e13aae fix hat stand fail 2018-09-13 18:21:22 -07:00
David Back
b65bd6736f also allow search using entity id 2018-09-13 18:20:11 -07:00
Wayne Chen
53582bddcd pushing more changes 2018-09-13 17:26:08 -07:00
Wayne Chen
bf7dd94db7 button was clipped; adding higher res img 2018-09-13 17:25:33 -07:00
Wayne Chen
2b8aebdb6b Revert "Merge branch 'master' into fixGoToButtonInterstitial" 
This reverts commit b4b0c519f3, reversing
changes made to aef3ed3e01.
 2018-09-13 17:21:29 -07:00
Wayne Chen
40451a1fc1 Revert "Revert "Merge branch 'master' into fixGoToButtonInterstitial"" 
This reverts commit c5468fd8e9.
 2018-09-13 17:21:07 -07:00
Wayne Chen
c5468fd8e9 Revert "Merge branch 'master' into fixGoToButtonInterstitial" 
This reverts commit b4b0c519f3, reversing
changes made to 77d5ebf34f.
 2018-09-13 17:18:49 -07:00
Wayne Chen
b4b0c519f3
Merge branch 'master' into fixGoToButtonInterstitial 2018-09-13 17:11:34 -07:00
David Rowe
fe8c237d64 Don't display mini tablet in peripheral vision 2018-09-14 11:22:31 +12:00
David Rowe
c27bb04596 Display mini tablet when it or palm is facing the camera 2018-09-14 11:10:26 +12:00
Wayne Chen
77d5ebf34f
changing button URL - typo 2018-09-13 15:47:25 -07:00
Wayne Chen
db1acb87b8 button was clipped; adding higher res img 2018-09-13 15:38:24 -07:00
David Rowe
bbfb2b1374 Merge branch 'master' into M17428-f 2018-09-14 10:36:49 +12:00
David Back
4bc046187a fix searching case-sensitivity 2018-09-13 15:06:14 -07:00
David Back
34afe7a69a remove fixing search cases (for separate PR) 2018-09-13 15:01:49 -07:00
David Back
56ddafed26 fix deleting scroll-away items, fix searching case sensitivity, comments 2018-09-13 14:56:12 -07:00
luiscuenca
b517808bc2 Fix smaller size avatar capsule and land on detailed mesh 2018-09-12 21:24:19 -07:00
David Rowe
4978f80f43 Don't turn on laser when mini tablet is expanding 2018-09-13 12:27:30 +12:00
David Rowe
0437c50c06 Fix mini tablet not reliably being grabbed 2018-09-13 12:20:00 +12:00
David Rowe
54dd868b3c Rotate mini tablet to keep it "vertical" 2018-09-13 11:54:59 +12:00
David Back
430ad87c20 Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-12 16:17:41 -07:00
David Back
7768e08510 rename func 2018-09-12 16:06:14 -07:00
Zach Fox
5a1d074e2f Goto now uses AppUi; lint 2018-09-12 16:04:37 -07:00
David Back
06504ade88 Merge branch 'master' of https://github.com/highfidelity/hifi into centerScaleCubeHMD 2018-09-12 16:04:22 -07:00
David Back
1b8e9ed906 get controller position from avatar frame 2018-09-12 16:02:43 -07:00
Zach Fox
01073ca18d Lots of changes; marketplaces.js working now 2018-09-12 15:46:17 -07:00
David Back
55a4c55f78 remove unused and rename var 2018-09-12 14:48:27 -07:00
David Back
3da442a8f9 allow highlights in hmd, fix center scale hmd math 2018-09-12 14:44:04 -07:00
John Conklin II
e243792cac
Merge pull request #13623 from wayne-chen/fixGrabWebSurface-case-16192 
MS16192: Fix Near Grabbing After Using Web Entity
 2018-09-12 12:50:44 -07:00
David Back
cf1c1296a7 fix center scale cube in hmd 2018-09-12 11:44:26 -07:00
Wayne Chen
521361293a
moving comment locations inside conditionals 2018-09-12 11:03:00 -07:00
Wayne Chen
acf34dcfdf
one more unused variable 2018-09-12 10:58:05 -07:00
Wayne Chen
8bef0d0de4
removing unused variables 2018-09-12 10:55:40 -07:00
Wayne Chen
a96e78c72d
removing debug 2018-09-12 10:54:38 -07:00
Wayne Chen
b9f0af63e1 changing check for near grabbing modules - fixes grabbing for dynamic 2018-09-12 10:38:21 -07:00
David Back
70d427f852 more fixes for resizing, deleting, selecting etc 2018-09-12 09:43:14 -07:00
Zach Fox
de2548d926 Merge branch 'master' of github.com:highfidelity/hifi into discovery_appUi 2018-09-12 09:30:00 -07:00
David Back
e191fe53ba Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-12 08:58:02 -07:00
Zach Fox
6d345e506b Marketplaces.js WIP 2018-09-11 19:42:12 -07:00
Wayne Chen
045ac4cb0d allowing grip button for interrupting web scroll 2018-09-11 17:43:03 -07:00
Wayne Chen
63ad85215b
Merge branch 'master' into interstitalMerged 2018-09-11 17:17:33 -07:00
David Back
ac04c501cb Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-11 17:13:02 -07:00
David Back
7eb05a3cc8 merge changes, fix various issues 2018-09-11 16:34:21 -07:00
David Rowe
a1c49bd2b6 Hide mini tablet if lasering or grabbing something else 2018-09-12 11:18:26 +12:00
Wayne Chen
b6c5ae2a68 staging changes 2018-09-11 15:23:40 -07:00
David Rowe
de95ee0a18 Merge branch 'master' into M17428-f 2018-09-12 09:49:29 +12:00
Dante Ruiz
b665dbe13e finished requested changes 2018-09-11 14:18:12 -07:00
Ryan Huffman
530fa5aee9
Merge pull request #13865 from dback2/editHandleScaleImprovements 
Edit handle scale improvements
 2018-09-11 12:57:47 -07:00
Zach Fox
ea04ee6d35 Wallet now uses AppUi 2018-09-11 12:37:53 -07:00
luiscuenca
fedea6e84d Comply with review comments 2018-09-11 12:23:25 -07:00
Zach Fox
3dabd392ef HELP app now uses AppUi 2018-09-11 12:21:02 -07:00
Zach Fox
1aaa90675c Snapshot.js now uses AppUi 2018-09-11 12:04:39 -07:00
Wayne Chen
0a145fbe2e Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-09-11 11:47:23 -07:00
Wayne Chen
d9e0352028 removing debug comments 2018-09-11 11:44:32 -07:00
Wayne Chen
7aae536624 adding fix to allow web scroll 2018-09-11 11:41:24 -07:00
David Back
50fed873d1 Merge branch 'master' of https://github.com/highfidelity/hifi into newEntityListView 2018-09-11 09:52:25 -07:00
luiscuenca
82b662d08e Add pick offset 2018-09-11 09:34:36 -07:00
Ryan Huffman
c7f6bf181b
Merge pull request #13943 from huffman/perf/create-profile-no-listjs 
Improvements to entity list loading times
 2018-09-11 09:33:28 -07:00
luiscuenca
13de22adb3 Fix radius scale 2018-09-11 07:22:59 -07:00
Ryan Huffman
4b8f5ea6b9 Fix syntax and duplicate event handlers in entityList.js 2018-09-10 16:44:13 -07:00
unknown
1ad3a09984 CR changes 2018-09-10 16:09:21 -07:00
unknown
17c3163264 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements 2018-09-10 15:31:58 -07:00
Wayne Chen
1aa8b7c81b Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-09-10 15:07:12 -07:00
John Conklin II
5a1485a4f5
Merge pull request #13968 from thoys/fix/create/reloadCrash 
MS18269: Fix Reloading Scripts with Create open crashes system
 2018-09-10 15:01:43 -07:00
David Rowe
992b9f847c Reduce near grab distance of tablet so that stylus works on tablet 2018-09-11 09:58:19 +12:00
David Rowe
16a94f827d Fix tablet highlight not working with stylus 2018-09-11 09:51:28 +12:00
John Conklin II
29c80fc075
Merge pull request #13959 from thoys/bug/create/createPosNewEntities 
MS17841: CreateApp - Adjust default position of new entities
 2018-09-10 14:45:56 -07:00
Ryan Huffman
5aa5552727 Fix PROFILE not forwarding calls when disabled 2018-09-10 14:07:25 -07:00
Ryan Huffman
0fadfd2f4c Remove list.js in entityList.html 2018-09-10 12:14:07 -07:00
Thijs Wenker
2000954ad2 Temporary fix for reload crash MS18269 2018-09-10 20:13:06 +02:00
luiscuenca
a9f676354b Only invisible pointers and scale fix 2018-09-10 08:54:53 -07:00
David Rowe
1faef9db8c Fix tablet ending upside down if it expands into other grabbing hand 2018-09-09 12:07:33 +12:00
David Rowe
baf1e80445 Code tidying 2018-09-09 11:37:05 +12:00
David Rowe
5fd3f563d6 Move mini tablet down in the palm a little. 2018-09-09 10:55:05 +12:00
David Rowe
66f75e856e Fix goto and expand displaying as hovered when redisplay mini tablet 2018-09-08 16:41:36 +12:00
David Rowe
5fcb69c724 Remove extraneous CSS 2018-09-08 16:13:36 +12:00
David Rowe
7dba2e6a2e Merge branch 'master' into M17428-f 2018-09-08 12:45:11 +12:00
David Rowe
8eeed772eb Update button layout 2018-09-08 12:40:36 +12:00
David Rowe
c0a153482a Update mini tablet model 2018-09-08 11:55:47 +12:00
luiscuenca
d09391faa5 Fix invisible error 2018-09-07 12:17:40 -07:00
Ryan Huffman
3cc90d3c80 Disable profiling in entityList.js 2018-09-07 12:07:19 -07:00
Ryan Huffman
9b9785d250 Fix entity list not handling deleted entities 2018-09-07 12:04:14 -07:00
Thijs Wenker
dd6801219b Create entities from avatar a bit lower to be able to transform them away from the user easier 2018-09-07 19:54:26 +02:00
Wayne Chen
fc4c728181 Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-09-07 10:11:34 -07:00
David Rowe
f206a8f158 Display mini tablet on hand being gazed at if there is a choice 2018-09-07 19:43:51 +12:00
David Rowe
12454d7ec7 Increase mini tablet grow/shrink time 2018-09-07 16:48:36 +12:00
David Rowe
f3cbca6cee Change "bubble" button to "goto" 2018-09-07 16:43:21 +12:00
David Rowe
d0e73b00f7 Restructure mini tablet code 2018-09-07 15:41:30 +12:00
Dante Ruiz
45a99a9244 fixing some bugs 2018-09-06 17:55:10 -07:00
Dante Ruiz
2f9119529a editing the interstitial page 2018-09-06 17:06:17 -07:00
David Back
b82f6d0bad lines/spacing 2018-09-06 16:54:58 -07:00
David Back
14a3eb4c97 lines/spacing 2018-09-06 16:52:58 -07:00
David Back
0a67c49ef9 remove separate new entity list with option, fix row clicking 2018-09-06 16:50:36 -07:00
David Back
3d75d4726a scale invertly once passing minimum 2018-09-06 16:04:59 -07:00
Dante Ruiz
98dafa3b67 fix overlayParentID 2018-09-06 14:31:49 -07:00
David Back
6ac38190c1 tweak scaling multiple 2018-09-06 12:23:38 -07:00
David Back
92ff522862 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements 2018-09-06 11:54:05 -07:00
Dante Ruiz
ec2d89fd25 fixing toolbar disappering 2018-09-06 11:16:58 -07:00
Roxanne Skelly
8a20969103 Fix typo 2018-09-06 10:38:10 -07:00
Dante Ruiz
200f6d540a Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-09-06 09:59:51 -07:00
luiscuenca
01424b8179 Head Collision Pick added 2018-09-06 09:39:33 -07:00
David Back
82ed57e41f triple list structure, added columns, sorting 2018-09-05 17:59:03 -07:00
luiscuenca
abb632afda Update capsule when scale/load and teleport without safe landing 2018-09-05 16:51:34 -07:00
Roxanne Skelly
bb8d9c5cf0 For stories, base the notification popups off of the action_string instead of a hard-coded value. 2018-09-05 16:50:08 -07:00
Ryan Huffman
335f66d165 Add filtering support to entity list 2018-09-05 14:30:48 -07:00
Ryan Huffman
739530cb85 Limit Entity List to only getting the properties it needs 2018-09-05 14:30:36 -07:00
Ryan Huffman
a9a5bf1e97 Replace entity list UI with custom, brute-force solution 2018-09-05 14:30:19 -07:00
Ryan Huffman
f2cc2f1485 Update entity list UI to be updated in a single batch 2018-09-05 14:30:19 -07:00
Ryan Huffman
f6ac755bae Add profiling to edit.js fof the entity list 2018-09-05 14:30:19 -07:00
Ryan Huffman
133ac0662a Move entity list qml to scripts dir 2018-09-05 14:30:19 -07:00
David Rowe
f23d93add3 Fix grabbing tablet with grip not working 2018-09-06 09:17:00 +12:00
David Rowe
daae3f50c8 Increase tablet highlight outline width 2018-09-06 09:09:30 +12:00
David Back
40d4f581f5 working scrolling 2018-09-05 13:16:23 -07:00
unknown
f941026a62 new entity list view wip 2018-09-04 19:11:09 -07:00
luiscuenca
99e6e3d112 Collision Pick added to teleport.js 2018-09-04 17:18:26 -07:00
David Rowe
c41d74621e Merge branch 'master' into M17217-b 
# Conflicts:
#	interface/src/raypick/PathPointer.cpp
 2018-08-31 14:26:24 +12:00
David Rowe
9203bbc5d8 Don't highlight tablet when it is grabbed 2018-08-31 11:02:36 +12:00
David Rowe
f84f3b20cd Disable near and far lasers when tablet is grabbable 2018-08-31 10:25:12 +12:00
David Rowe
ecb58a9629 Merge branch 'master' into M17853 2018-08-31 08:36:54 +12:00
Dante Ruiz
93b0f15116 addressing some feedback 2018-08-30 13:22:17 -07:00
John Conklin II
f5ebdfa233
Merge pull request #13905 from zfox23/fixPr13870 
Fixup PR13870: Make the feature work in Master
 2018-08-30 11:08:23 -07:00
Dante Ruiz
8c77820e30 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-30 09:45:41 -07:00
David Rowe
73253977fe Merge branch 'M17428-c' into M17428-d 
# Conflicts:
#	scripts/system/miniTablet.js
 2018-08-30 16:21:31 +12:00
David Rowe
ec20fb7edb Reorient and reposition mini tablet 2018-08-30 16:16:49 +12:00
David Rowe
a01a5e3b39 Merge branch 'M17428-c' into M17428-d 2018-08-30 13:44:02 +12:00
David Rowe
a5c3450bfc Tweak mini tablet UI layout 2018-08-30 13:43:31 +12:00
Zach Fox
b8cd5dd8b9 Fixup PR13870: Make the feature work in Master 2018-08-29 16:58:19 -07:00
John Conklin II
7298cb4654
Merge pull request #13888 from dback2/editControllerMapping 
Edit mode controller mapping using new platform state variables
 2018-08-29 16:06:47 -07:00
John Conklin II
47ce8be526
Merge pull request #13854 from wayne-chen/fixTabletButton-case-16847 
MS16847: Tablet button doesn't load in HMD mode
 2018-08-29 13:20:04 -07:00
David Back
96d2ba660c Merge branch 'master' of https://github.com/highfidelity/hifi into editControllerMapping 2018-08-29 12:05:51 -07:00
David Back
0e53fa3f8b only focus with selection 2018-08-29 12:05:46 -07:00
David Back
dcf2074d7e remove [ camera key, allow F to enter camera without selection 2018-08-29 11:56:37 -07:00
David Rowe
c6d0ad39c0 Merge branch 'M17428-c' into M17428-d 2018-08-29 22:13:43 +12:00
David Rowe
15fcafa2f5 Use SVGs for buttons 2018-08-29 22:13:09 +12:00
David Rowe
b338c9f6fa Updated tiny table model and layout 2018-08-29 22:10:24 +12:00
David Rowe
91c1e1b276 Different expansion points and delta rotations if grabbed by other hand 2018-08-29 09:59:04 +12:00
David Rowe
f5c49026ab Expand tablet after it's been released from grab by other hand 2018-08-29 09:49:42 +12:00
David Rowe
49f5d5f2b7 Display mini tablet rotated in palm 2018-08-29 08:55:46 +12:00
David Rowe
e5c733e7f2 Merge branch 'master' into M17428-c 2018-08-29 08:20:00 +12:00
David Back
511478a563 use not Mac instead of Windows 2018-08-27 18:11:19 -07:00
David Back
f81fe6b29f add more inputs to controller mapping 2018-08-27 16:35:36 -07:00
Seth Alves
52bbb4d2ab fix ray-pick results on entities with non-default registration point. clean up grab scripts to correctly use this fix. 2018-08-27 16:21:01 -07:00
David Rowe
4830ba24ae Highlight tablet when it is near-grabbable 2018-08-28 09:53:54 +12:00
David Back
b6edb2c9d6 platform states, edit controller mapping, separate mac/win delete 2018-08-27 14:53:13 -07:00
danteruiz
e4293d9ad5 fixing some entity visual problems 2018-08-26 21:50:01 -07:00
Dante Ruiz
af19849a75 fixing merge conflict 2018-08-24 15:48:42 -07:00
Dante Ruiz
3796675123 script update and visuallyReady entities 2018-08-24 15:46:39 -07:00
John Conklin II
fcdbc6c6d2
Merge pull request #13778 from SamGondelman/bloom 
Enable bloom in zone properties
 2018-08-24 14:46:31 -07:00
David Back
30c6975198 maintain stretch cube position vs mouse when stretching 2018-08-24 11:53:03 -07:00
David Back
5e4e255e94 Merge branch 'master' of https://github.com/highfidelity/hifi into editHandleScaleImprovements 2018-08-24 10:15:17 -07:00
Howard Stearns
9a472fa388
Merge pull request #13870 from zfox23/wallet_autologout 
Implement Wallet Security feature - Auto Logout checkbox
 2018-08-23 18:04:38 -07:00
Zach Fox
dddb2141f0 Implement Wallet Security feature - Auto Logout checkbox 2018-08-23 15:45:29 -07:00
Zach Fox
e3d03cd321 Fix MS17738: Fix a case where the BLAST icon didn't show up in Snapshot Review 2018-08-23 13:16:02 -07:00
David Rowe
b6e4a22db7 Rotate the mini tablet as it expands 2018-08-23 13:06:28 +12:00
David Back
8eddb36c82 resize scale cube 2018-08-22 17:29:40 -07:00
David Back
8c422cb0eb change corner cubes to center cube, replace spheres with cubes 2018-08-22 16:54:59 -07:00
Dante Ruiz
bb83a2f620 interstitial script ending cleanup fixes 2018-08-22 16:48:10 -07:00
David Rowe
335eb98bb7 Increase size of the "..." button 2018-08-23 11:14:21 +12:00
David Rowe
6dcce0e953 Revert display test to depending just on hand to camera angle for now 2018-08-23 10:59:23 +12:00
David Rowe
883479d654 Merge branch 'master' into M17428-c 2018-08-23 10:43:44 +12:00
Dante Ruiz
f5441b2721 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-22 15:28:42 -07:00
Dante Ruiz
78458d62de revert some changes and fix toolbar issue 2018-08-22 15:20:56 -07:00
Dante Ruiz
535fdf32cf saving changes 2018-08-22 13:13:00 -07:00
John Conklin II
32562511e8
Merge pull request #13782 from ElderOrb/FB17184 
Add Support for Managing Avatar Entities to the Avatar App
 2018-08-22 10:20:04 -07:00
Dante Ruiz
26a30edec9 trying to fix loading bar 2018-08-21 18:27:21 -07:00
Dante Ruiz
71e8ccd190 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-21 16:20:16 -07:00
Wayne Chen
4e9a544618 redoing newline 2018-08-21 16:01:24 -07:00
Wayne Chen
bb176eb228 trailing debug statements 2018-08-21 16:00:01 -07:00
Wayne Chen
7360629d31 modifying variable naming to fit convention 2018-08-21 14:13:55 -07:00
Wayne Chen
5b4eb92281 adding fix 2018-08-21 14:04:29 -07:00
John Conklin II
1b4314ae45
Merge pull request #13846 from ctrlaltdavid/M17652-b 
Reduce strength of teleport parabola
 2018-08-21 11:32:40 -07:00
Wayne Chen
222391532a Merge branch 'master' of https://github.com/highfidelity/hifi into fixGrabWebSurface-case-16192 2018-08-21 11:18:17 -07:00
Wayne Chen
bfb9b67968 more debug statements 2018-08-21 11:17:33 -07:00
Dante Ruiz
db3d3d3d93 Merge branch 'master' of github.com:highfidelity/hifi into interstitial-final-page 2018-08-21 09:56:59 -07:00
David Rowe
4b12e18c27 Merge branch 'master' into M17428-c 2018-08-21 16:52:30 +12:00
David Rowe
536db64123 Mitigate against UI overlay possibly getting rotated 2018-08-21 16:48:35 +12:00
David Rowe
e25b2f6e0f Support stylus input on the mini tablet 2018-08-21 16:47:40 +12:00
David Rowe
f6a607efcc Expand / shrink mini-tablet when showing / hiding 2018-08-21 15:43:37 +12:00
David Rowe
5e7f68d4b7 Use a smaller near grab radius for tablet and mini-tablet 2018-08-21 14:00:20 +12:00
David Rowe
e24d920bdd Tune teleport and play area 2018-08-21 11:45:01 +12:00
David Rowe
0a82f8adc9 Merge branch 'master' into M17217-b 2018-08-21 11:25:58 +12:00
David Rowe
67eb03ba7d Reduce strength of teleport parabola 2018-08-21 11:18:00 +12:00
David Rowe
69e5eb9b1c Move tablet towards fingertips as it expands 2018-08-21 10:46:48 +12:00
David Rowe
dc86230e40 Make "..." expand tablet per display hand rather than centered 2018-08-21 10:33:13 +12:00
David Rowe
f4a8dc49e9 Add button sounds 2018-08-21 10:28:23 +12:00
David Rowe
4268297769 Mini tablet button actions 2018-08-21 09:17:53 +12:00
Seth Alves
c876cda89d
Merge pull request #13826 from ctrlaltdavid/M17615 
Disable Vive teleport button if transitioning from direction button
 2018-08-20 14:05:45 -07:00
David Rowe
6791d3f1b6 Mini tablet button icons and states 2018-08-21 08:36:04 +12:00
Dante Ruiz
2261ad2bcb clean up the interstitial page 2018-08-20 11:14:48 -07:00
Ryan Huffman
ead0126365
Merge pull request #13815 from thoys/fix/create/createZeroRotationEntities 
MS17562: CreateApp - newly created Entity rotation should be zero
 2018-08-20 09:07:38 -07:00
David Rowe
4e23caf46d Fix tablet proper not being grabbed once mini tablet has expanded 2018-08-20 17:57:59 +12:00
David Rowe
ff54516790 Maintain overlays ready for display in HMD mode 2018-08-20 17:46:07 +12:00
David Rowe
aca343330f Base UI elements 2018-08-20 16:00:02 +12:00
David Rowe
94041291d5 Add web3d overlay for UI surface 2018-08-20 10:58:01 +12:00
Alexander Ivash
9f92ff5de9 fix for duplicating wearables on saving 
note: the issue was caused by newly-introduced code converting between attachments & entities
fix removes attachments-related code because attachments are deprecated and converted into entities on the fly
 2018-08-18 16:38:35 +03:00
David Rowe
fce45339a2 Shorter teleport parabola 2018-08-18 12:39:34 +12:00
David Rowe
26576fa760 Fix Vive left/right buttons not disabling teleport 2018-08-18 09:34:16 +12:00
David Rowe
2c389af751 Display mini tablet only if camera is also looking at the hand 2018-08-17 16:18:22 +12:00
David Rowe
846f38584f Merge branch 'master' into M17428 2018-08-17 15:01:35 +12:00
David Rowe
7e46a99400 Merge branch 'master' into M17217-b 2018-08-17 10:35:52 +12:00
David Rowe
5328b48acc Make Vive snap turn buttons lock teleport, also 2018-08-17 09:09:11 +12:00
David Rowe
bf733ded0f Handle Vive controller not being available at start-up 2018-08-17 09:08:28 +12:00
John Conklin II
96fd4704ac
Merge pull request #13829 from huffman/fix/edit-zoom-stuck 
Fix edit orbit camera getting stuck zooming
 2018-08-16 08:21:31 -07:00
David Rowe
40f7914aae Expand from lower left/right of proxy tablet 2018-08-16 19:11:03 +12:00
David Rowe
7a1a86f182 Expand proxy tablet immediately it is grabbed; grab with either hand 2018-08-16 16:20:28 +12:00
David Rowe
cb9b7f567a Move update functions into state machine 2018-08-16 16:08:36 +12:00
David Rowe
8d1b947bbd Fix variable names 2018-08-16 13:35:36 +12:00
elderorb
ea22fdb400
Merge branch 'master' into FB17184 2018-08-16 02:08:47 +03:00
David Rowe
a86fdeafc0 Merge branch 'master' into M17248-a 2018-08-16 10:38:30 +12:00
Ryan Huffman
2f833f16d8 Force entity list tool to refresh when opened 2018-08-15 14:19:20 -07:00
Ryan Huffman
24af22a52f Fix edit orbit camera getting stuck zooming 2018-08-15 13:56:44 -07:00
Seth Alves
83718ca06d
Merge pull request #13746 from alexiamandeville/emoteIcon 
updating emote app icon
 2018-08-15 08:29:48 -07:00